Index: applications/editors/josm/i18n/po/eu.po
===================================================================
--- applications/editors/josm/i18n/po/eu.po	(revision 22713)
+++ applications/editors/josm/i18n/po/eu.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-07-06 17:47+0000\n"
 "Last-Translator: Mikel Lizarralde <mlizarralde@tagzania.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Kontuz"
@@ -122,9 +122,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editorea"
@@ -132,5 +132,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -256,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -281,5 +281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -304,5 +304,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -413,4 +413,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -428,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1065,5 +1066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1076,5 +1077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1490,13 +1491,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1505,5 +1506,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1511,9 +1512,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1521,5 +1522,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1553,8 +1554,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1563,9 +1564,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1581,6 +1582,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1590,5 +1591,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1613,6 +1614,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Errorea"
@@ -1775,5 +1776,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Ez, bertan behera utzi"
@@ -2063,5 +2064,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2555,5 +2556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2597,9 +2598,9 @@
 "Benetan denak mugitu nahi dituzu?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Askatu saguaren botoia errektanguluko objektuak hautatzeko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2608,9 +2609,9 @@
 "egiteko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Askatu saguaren botoia errotazioa gelditzeko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2902,5 +2903,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Bilatu"
@@ -3110,7 +3111,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3381,5 +3382,5 @@
 msgstr[1] "Mugitu {0} nodoak"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3537,31 +3538,31 @@
 msgstr "Etiketen konponketa automatikoa"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3580,15 +3581,15 @@
 msgstr "Longitudearen ''{0}'' balio ilegalak"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Kontuz: huts egin du hobespenak ''{0}'' gordetzean"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Konfigurazio fitxategian malformazioa {0} lerroetan"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3599,5 +3600,5 @@
 "ez da direktorio bat."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3608,5 +3609,5 @@
 "direktorioa ez da direktorio bat.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3617,5 +3618,5 @@
 "hobespen direktorioa sortzean: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3626,5 +3627,5 @@
 "hobespenen direktorioa sortzean: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3634,5 +3635,5 @@
 "fitxategi bat sortzen."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3643,5 +3644,5 @@
 "fitxategiagatik."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3652,5 +3653,5 @@
 "fitxategia jatorrizkora berrezartzeak: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3661,5 +3662,5 @@
 "da <br>{0}<br>n eta lehenetsitako hobespen fitxategia sortzen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3670,10 +3671,10 @@
 "fitxategia berrabiaraztean huts egin du: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Errorea: Espero ez zen ''{0}'' lerroa laster-marka honetan ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3803,5 +3804,5 @@
 "Ezin izan da jatorrizko {0}-a gehitu datu-multzora beronen barne delako jada"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3878,9 +3879,9 @@
 "balioa {0} da"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "ID = 0 den jatorrizko bat ezin da ikusezina izan"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3890,5 +3891,5 @@
 "bestea ez"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4085,15 +4086,34 @@
 msgstr "PUWG 2000 Zonaldea {0} (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suitza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zonaldea"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "Ordenatu"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Jauzi hara"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4117,9 +4137,9 @@
 msgstr "Frantziar Guyana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM Frantzia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "UTM Sistema-geodesikoa"
@@ -4164,5 +4184,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "trenbidea"
@@ -4183,5 +4203,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4437,29 +4457,29 @@
 msgstr "Pasahitza"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "erabilera"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "aukerak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Erakutsi laguntza hau"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Unixeko geometria argumento estandarra"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Deskargatu inguru-koadroa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Deskargatu URL-ean zehaztutako tokia (lat=x&lon=y&zoom=z erabiliz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4467,9 +4487,9 @@
 "Ireki aukerarekin)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Deskargatu inguru-koadroa gps datu gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4477,33 +4497,33 @@
 "gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Aukeratu emandako bilaketarekin"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Abiarazi modu maximizatuan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Preferentziak jatorrizkora berrezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Hizkuntza ezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "aukera hauek Java-ren sistema propietate moduan ematen dira"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/JOSM/KARPETARA/BIDEA/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Erabiltzailearen hobespen guztientzat karpeta aldatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4517,9 +4537,9 @@
 "megabytetan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "adibideak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4529,58 +4549,67 @@
 "prozesatzen dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "--selection erabiltzen baduzu, ziurtatu zenbait datu kargatzen dituzula."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Hasieratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Pluginak eguneratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Eguneratutako pluginak instalatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Hasierako pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Hobespen orijinalak ezartzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "GUI nagusia sortzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debitu-txartelak"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "{0} hobespena ezabatu dugu ez bait da jadanik erabiltzen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4590,9 +4619,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4606,9 +4635,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4732,23 +4762,23 @@
 msgstr "Erabiltzailea:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "Geruza hau ez dago zerrendan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "\"{0}\" geruzak, geruzen zerrendan egon behar du"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4845,5 +4875,5 @@
 msgstr "Klik egin dialogoa itxi eta objektuak ezabatzeari uzteko"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4853,17 +4883,17 @@
 "jakin batean.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Zoom maila:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "koadrotik"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "koadrora"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4877,25 +4907,25 @@
 "ere..</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Koadro helbidea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Erabili koadro helbidea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Mesedez, eman tile helbidea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Oraingo balorea ez da koadro helbide zuzena"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Mesedez, sartu koadroaren indizea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "Oraingo balioa ez da koadro helbide zuzena zoom maila honetarako"
@@ -5314,4 +5344,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5395,4 +5426,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5409,4 +5441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5480,5 +5513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5490,10 +5523,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "ezer ere ez"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "denak"
@@ -5575,5 +5608,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5585,5 +5618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5618,17 +5651,17 @@
 msgstr "Oraindik erabaki gabe"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Rola:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5636,15 +5669,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Gakoa:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5652,10 +5685,10 @@
 msgstr "Balioa:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5667,5 +5700,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5677,5 +5710,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5818,5 +5851,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5929,5 +5962,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5935,5 +5968,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5941,5 +5974,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5947,5 +5980,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5953,5 +5986,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5960,5 +5993,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5966,5 +5999,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5972,5 +6005,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5978,24 +6011,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Iragazkia aktibatuta dago</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektuak ezkutaturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<p><b>{0}</b> objektuak desgaiturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6018,5 +6051,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6041,37 +6074,37 @@
 msgstr "Objektuen informazio aurreratua"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Sartu nodo berriarentzako koordenatuak."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Erabili gradu hamartarrak"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Balio negatiboek Mendebaldeko/Hegoaldeko hemisferioa adierazten dute."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Mesedez, sar ezazu baliogarria den latitude bat -90..90 tartean"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Mesedez, sar ezazu -90..90 tartean dagoen latitude bat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Mesedez, sar ezazu baliogarria den longitude bat -180..180 tartean"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Mesedez, sar ezazu -180..180 tartean dagoen longitude bat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Itxi elkarrizketa-leihoa eta sortu nodo berria"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Itxi elkarrizketa-leihoa, ez sortu nodo berririk"
@@ -6127,9 +6160,9 @@
 msgstr "Geruzari buruzko informazioa"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Erlazioak"
@@ -6177,10 +6210,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6200,37 +6233,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6239,32 +6272,32 @@
 msgstr "Aukeraketa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Aukeraketa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6542,13 +6575,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Orain jaitsi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr ""
@@ -6660,4 +6693,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6676,6 +6713,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6693,8 +6728,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6705,4 +6747,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6717,33 +6765,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6767,12 +6804,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6844,10 +6891,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6877,8 +6928,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6941,6 +6988,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6993,4 +7038,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7055,32 +7112,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. 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/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7089,6 +7154,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7097,24 +7164,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7129,82 +7186,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/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"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7285,155 +7342,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2865 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Izena"
@@ -7857,4 +7919,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<ezberdina>"
@@ -8359,17 +8422,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8644,4 +8707,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8649,15 +8713,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr ""
@@ -8676,16 +8740,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr ""
@@ -9252,5 +9316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9473,20 +9537,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr ""
@@ -9933,11 +9997,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9945,5 +10004,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9951,5 +10011,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -9959,23 +10019,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Menua: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -9984,5 +10047,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -9991,10 +10055,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "Etiketa {0}"
+msgstr[1] "{0} etiketa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10002,10 +10079,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10016,7 +10093,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10024,10 +10101,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10035,10 +10112,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10046,21 +10123,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10070,9 +10147,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10080,5 +10157,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10086,30 +10163,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10117,5 +10194,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10124,5 +10201,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10131,18 +10208,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10152,23 +10229,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10601,15 +10678,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11540,4 +11617,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "{0} bidea ezabatu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11620,5 +11740,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr ""
@@ -11637,16 +11757,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr ""
@@ -11680,12 +11800,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr ""
@@ -11931,18 +12051,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12257,26 +12377,18 @@
 msgstr "{0} proiekzioa ezin izan da aktibatu. Mercator erabiltzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12392,6 +12504,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "txandakatu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12608,12 +12729,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12793,5 +12906,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12800,49 +12913,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12852,15 +12965,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12870,17 +12983,17 @@
 msgstr[1] "Aldatu {0} objektuak"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13484,5 +13597,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13580,5 +13693,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13587,5 +13700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13654,5 +13767,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13662,10 +13775,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13673,5 +13786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13679,5 +13792,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13685,10 +13798,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13696,5 +13809,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13702,5 +13815,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13708,5 +13821,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13715,10 +13828,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13726,9 +13839,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13736,11 +13849,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13752,8 +13865,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13767,5 +13880,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13773,5 +13886,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13780,6 +13893,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13791,6 +13904,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13799,5 +13912,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13805,5 +13918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13811,12 +13924,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13824,5 +13937,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13832,5 +13945,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13840,5 +13953,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13846,17 +13959,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14352,11 +14465,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14365,16 +14478,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14383,5 +14496,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14402,13 +14515,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14417,9 +14530,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14427,5 +14540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14433,5 +14546,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14440,5 +14553,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14446,9 +14559,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14642,5 +14755,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14693,5 +14806,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14701,5 +14814,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14707,5 +14820,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14714,5 +14827,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -14813,5 +14926,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14897,10 +15010,61 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Irekiera-ordutegia"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Aldatu propietateak"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Aukeratu balio bat"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Mapa: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Tresna: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "ireki"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr ""
@@ -15072,51 +15236,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Ezin da nodorik gehitu mundutik kanpo."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "''{0}'' parametroa ezin da nulua izan"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "''{0}'' parametroa ezin da nulua izan"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15215,16 +15381,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15238,5 +15396,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15349,5 +15507,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Eraikinak"
@@ -15584,5 +15742,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15997,8 +16155,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16112,6 +16266,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Geruza garbia"
@@ -17463,5 +17617,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr ""
@@ -17505,48 +17659,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "objektu berriak sortu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17555,34 +17713,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17805,58 +17963,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Mapa irristakorra"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -18140,11 +18298,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Hodiak editatu"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19221,5 +19378,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipoligonoa"
@@ -19339,59 +19496,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "Gehigarri honek erlazioetako arazoak egiaztatzen ditu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19882,144 +20039,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "GPS arrastoaren % {0} {1}tik"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Bideoan egungo kokapena erakusten du"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "Bideoa inportatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "Sinkronizatu bideo bat GPS arrastoarekin"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "Bideoa ezabatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "bideoa ezabatzen du geruzatik"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "erreproduzitu/pausatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "hasi/pausatu bideoaren play-back-a"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "atzerantz"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "salto"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Mesedez, sartu koadroaren indizea"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "aurrerantz"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "azkarrago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "play-back-a azkarrago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "polikiago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "play-back-a polikiago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "begizta"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "Zentratuta mantendu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "bideoaren ikonoa jarraitzen du automatikoki"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Eskailera (hesi edo langa gainetik pasatzeko)"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "Bideoan egungo kokapena erakusten du"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Jauziaren luzera"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr "Jauziaren luzera ezarri"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr "X ms-etarako bideo-jauzia"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Begizta-luzera"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "Begizta-puntuaren inguruko luzera ezarri"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20039,7 +20192,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "multi"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20141,7 +20293,6 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Aukeratu emandako bilaketarekin"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20162,9 +20313,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Salbuespena gertatu da"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Ez dago aurrememorian"
@@ -20223,21 +20374,21 @@
 msgstr "Aukeratutako WMS geruzaren kokapena doitu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Mesedez, aukeratu doitu beharreko WMS geruza."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "WMS geruza aukeratu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Doiketa hasi"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Uneotan ez dago doitzeko WMS geruzarik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Ez dago doitzeko geruzarik"
@@ -20248,5 +20399,5 @@
 msgstr "Jaitsi WMS \"tile\"a {0}tik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20256,5 +20407,5 @@
 "Kontuz: WMS zerbitzuaren \"{0}\" URLa ez da '&' edota '?'rekin bukatzen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20264,10 +20415,10 @@
 "zure hobespenen konfigurazioa."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Kontuz: URL osoa \"{0}\" da."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20278,5 +20429,5 @@
 "Koordenatu okerretara eraman gaitzake honek."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20284,19 +20435,19 @@
 "Kontuz: WMS geruza desaktibatu egin da \"{0}\" URLaren malformazioagatik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(desaktibatua)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "({0}) WMS geruza, automatikoki jaisten {1} zoom mailan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "({0}) WMS geruza, {1} zoom mailan jaisten"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20311,17 +20462,17 @@
 "jaitsi nahi dituzu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Bai, jaitsi irudiak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "URL desegokia?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Jaitsi ikusgai dauden \"tile\"ak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20330,33 +20481,33 @@
 "bereizmena"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Bereizmena aldatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "\"Tile\" okerrak berriz kargatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alpha kanala"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Gorde WMS geruza fitxategian"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Gorde WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Kargatu WMS geruza fitxategitik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Kargatu WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -20364,25 +20515,49 @@
 "Sustengurik gabeko WMS fitxategi-bertsioa; {0} aurkitu da eta {1} espero zen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Fitxategiaren formatuan errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Fitxategia kargatzean errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "WMS laster-marka ezarri"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Jaitsiera automatikoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ireki WMS geruza-zuri bat fitxategi batetik datuak kargatzeko"
@@ -20957,16 +21132,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers-eko irudi bat erakusten du hondoan"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "OpenStreetBugs-etik akatsak jaisten ditu"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20976,5 +21156,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20984,5 +21164,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20993,5 +21173,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21002,10 +21182,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic handiaren \"Look and Feel\"-a."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21014,15 +21194,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Utzi beste aplikazioei JOSMra komandoak bidaltzen."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Aldaketa-multzoak"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21032,5 +21212,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21042,10 +21222,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Bideratzaile-gaitasunak ematen ditu"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21057,5 +21237,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21066,10 +21246,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Egungo GPS kokapenean markak/nodoak gehitzeko aukera ematen digu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -21078,5 +21258,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21090,15 +21270,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu"
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21109,5 +21289,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21118,5 +21298,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21127,5 +21307,5 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
@@ -21134,5 +21314,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21144,5 +21324,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21155,5 +21335,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21165,20 +21345,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Elkar-konektaturiko bide luzeen deskarga erraza"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Aukeratu adarkadura ez dute konektaturiko bideak"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21189,5 +21369,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21231,4 +21411,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21261,10 +21442,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Bideak"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Kaleak"
@@ -21275,5 +21456,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autobide"
@@ -21282,5 +21463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Autobidea editatu"
@@ -21317,10 +21498,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Erreferentzia"
@@ -21334,8 +21515,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Erreiak"
@@ -21354,13 +21535,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Gehienezko abiadura (km/o)"
@@ -21394,17 +21575,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Norabide bakarra"
@@ -21441,17 +21622,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21485,17 +21666,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunela"
@@ -21526,17 +21707,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Mozketa"
@@ -21567,17 +21748,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Lubeta"
@@ -21585,5 +21766,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Autobide-lotura"
@@ -21592,5 +21773,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Autobide-lotura editatu"
@@ -21598,5 +21779,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Errepide nagusia"
@@ -21605,5 +21786,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Errepide nagusia editatu"
@@ -21613,6 +21794,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Autobidea"
@@ -21620,5 +21801,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Errepide nagusiaren lotura"
@@ -21627,5 +21808,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Errepide nagusi-lotura"
@@ -21638,5 +21819,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Lehen mailako errepidea"
@@ -21645,5 +21826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Lehen mailako errepidea editatu"
@@ -21651,10 +21832,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Lehen mailako errepidearen lotura"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Lehen mailako errepidearen lotura editatu"
@@ -21666,5 +21847,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Bigarren mailako errepidea"
@@ -21674,5 +21855,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Bigarren mailako errepidea editatu"
@@ -21680,5 +21861,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Hirugarren mailako errepidea"
@@ -21688,5 +21869,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Hirugarren mailako errepidea editatu"
@@ -21698,5 +21879,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Sailkatu gabeko errepidea"
@@ -21706,5 +21887,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Sailkatu gabeko errepidea editatu"
@@ -21714,6 +21895,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Aurreratze-lekua"
@@ -21736,15 +21917,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Zabalera (metroak)"
@@ -21756,5 +21937,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Kalea"
@@ -21763,5 +21944,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Hiriko-kalea"
@@ -21781,12 +21962,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Gainazala"
@@ -21808,166 +21989,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "zolatua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "zolatu-gabea"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfaltua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "hormigoi"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metala"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "egurra"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "galtzada-arri zola"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "galtzada-arria"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "hartxintxar"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "trinkotua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "landare-zolua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "belarra"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "hondarra"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "lursaila"
@@ -21975,5 +22156,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Bizitegi-kalea"
@@ -21982,5 +22163,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Bizitegi-kalea editatu"
@@ -21988,5 +22169,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Oinezkoen kalea"
@@ -21995,5 +22176,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Oinezkoen kalea editatu"
@@ -22001,5 +22182,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Zerbitzu-bidea"
@@ -22008,5 +22189,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Zerbitzu-bidea editatu"
@@ -22016,18 +22197,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Zerbitzu-bide mota"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "kalezuloa"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "sarrera-bidea (etxe, baserri eta abarrerantz)"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "aparkalekuetako-bidea"
@@ -22035,5 +22216,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Aparkalekuetako-bidea"
@@ -22043,10 +22224,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Aparkalekuetako-bidea editatu"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Errepidea (mota ezezaguna)"
@@ -22055,5 +22236,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Errepidea (mota ezezaguna) editatu"
@@ -22061,14 +22242,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Eraikuntza"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Eraikuntzan dagoen bidea editatu"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Elkargunea"
@@ -22084,5 +22265,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "errotonda"
@@ -22091,5 +22272,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Trafikoaren murrizketak"
@@ -22098,15 +22279,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Bidearen murrizketak editatu"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Ordainsaria"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Irteera gabea (cul-de-sac)"
@@ -22114,5 +22295,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Sarbidea"
@@ -22138,4 +22319,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22143,4 +22325,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22216,236 +22404,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+msgid "yes"
+msgstr "bai"
+
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "pribatua"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:219
+msgid "destination"
+msgstr "norakoa"
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "baimendua"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "nekazal"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "baso"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "banaketa"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "ez"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Nekazaritza"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "bai"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "baimendua"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "pribatua"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "norakoa"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "baimendua"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "nekazal"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "baso"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "banaketa"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "ez"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Nekazaritza"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "baimendua"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "ofiziala"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Merkantziak"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Ibilgailu pisutxuak (6 t. baino gehiago)"
@@ -22460,10 +22655,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Zaldia"
@@ -22479,10 +22674,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motozikleta"
@@ -22497,19 +22693,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Automobil"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Zerbitzu-publikoko ibigailuak (ZPI)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Gutxieneko abiadura (km/o)"
@@ -22517,20 +22713,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Gehienezko pixua (t)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Gehienezko garaiera (metrotan)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Gehienezko zabalera (metrotan)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Gehienezko luzeera (metrotan)"
@@ -22538,5 +22734,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Errotonda"
@@ -22547,5 +22743,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Elkargunea editatu"
@@ -22565,10 +22761,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autobidea"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "Autobidearen lotura"
@@ -22590,10 +22786,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "errepide nagusia"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "errepide nagusiaren lotura"
@@ -22615,10 +22811,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "lehenengo mailakoa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "lehenengo mailako errepidearen lotura"
@@ -22640,5 +22836,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22653,9 +22849,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "hirugarren mailakoa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "sailkapenik gabeko errepidea"
@@ -22669,9 +22865,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "kalea"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "bizitegi-kalea"
@@ -22715,10 +22911,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "zerbitzu-bidea"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "gidatutako autobus-bidea"
@@ -22748,5 +22944,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22758,10 +22954,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Zubia editatu"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Tunela editatu"
@@ -22769,10 +22965,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Bideak"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Pista"
@@ -22781,35 +22977,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Pista editatu"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Pista-mota"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "1. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "2. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "3. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "4. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "5. gradukoa"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB eskala"
@@ -22817,5 +23013,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Ibilbidea"
@@ -22824,76 +23020,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Ibilbidea editatu"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC eskala"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "xenda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "mendi-xenda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "mendi-xenda zaila"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "alpinismo-xenda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "alpinismo-xenda nekeza"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "alpinismo-xenda zaila"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "bikaina"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "ona"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "ertaina"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "txarra"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "oso txarra"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Gurpil-aulkiak"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Eskia"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Elur-lera"
@@ -22902,5 +23098,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Dedikatutako ferra-bidea"
@@ -22908,5 +23104,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Dedikatutako ferra-bidea editatu"
@@ -22914,5 +23110,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Dedikatutako bizikleta-bidea"
@@ -22930,11 +23126,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Bizikleta-bidea editatu"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Oinezkoak"
@@ -22942,5 +23138,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Bizikleta-bidea eta oinezkoena bananduta"
@@ -22948,5 +23144,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Bizikleta-bidea eta oinezkoena batuta"
@@ -22954,5 +23150,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Dedikatutako oinezko-bidea"
@@ -22961,5 +23157,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Oinezko-bidea editatu"
@@ -22967,5 +23163,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Eskailerak"
@@ -22975,10 +23171,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Eskailera-bidea editatu"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Jarleku kopurua"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Autobideko irteera"
@@ -22986,15 +23188,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Autobideko irteera editatu"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Zenbakia"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Zerbitzuak"
@@ -23002,5 +23204,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Zerbitzu-gunea editatu"
@@ -23008,10 +23210,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23040,36 +23243,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operadorea"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "erreka"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Jatetxea editatu"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Larrialdietako telefonoa"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semaforoa"
@@ -23079,5 +23303,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Oinezkoen bidegurutze mota"
@@ -23086,27 +23310,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "kontrolik gabea"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "semaforoa"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "irla"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "markatugabea"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Zaldien bidegurutzea"
@@ -23114,6 +23338,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Bizikleten bidegurutzea"
@@ -23122,11 +23346,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Bidegurutze-zaintzailea"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Bidegurutze motaren izena (Erresuma Batua)"
@@ -23134,30 +23358,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelikanoa"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "tukana"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tigrea"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Gelditu"
@@ -23165,67 +23389,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Oinezkoen pasabidea"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Pasabidea editatu"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Izen-mota (Erresuma batua)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Trafikoaren arinketa"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Trafikoaren arinketa editatu"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "salto"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "estugune"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "taula"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Aurreratze-lekua"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Aurreratze-lekua editatu"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Errotonda txikia"
@@ -23236,14 +23398,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Norabidea"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "erlojuaren norabidea"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Oinezkoen pasabidea"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Pasabidea editatu"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Izen-mota (Erresuma batua)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Trafikoaren arinketa"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Trafikoaren arinketa editatu"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "salto"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "estugune"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "taula"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Aurreratze-lekua"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Aurreratze-lekua editatu"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Biraketa-zirkulua"
@@ -23253,5 +23477,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Hiriaren muga"
@@ -23259,15 +23483,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Hiriaren muga-seinalea editatu"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Bigarren izena"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Abiadura radarra"
@@ -23276,11 +23500,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Larrialdietako telefonoa"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Penditza"
@@ -23288,5 +23507,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Penditza handia"
@@ -23294,5 +23513,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Hartxintxar edukiontzia"
@@ -23302,10 +23521,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Ibia"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Ibia editatu"
@@ -23313,5 +23532,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Mendatea"
@@ -23319,5 +23538,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Mendatea editatu"
@@ -23326,10 +23545,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Garaiera"
@@ -23337,5 +23556,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Oztopoak"
@@ -23343,5 +23562,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Bolardoa"
@@ -23349,5 +23568,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Bolardoa editatu"
@@ -23392,16 +23611,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Baimendutako trafikoa"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Bizikletentzako oztopoa"
@@ -23410,5 +23629,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Blokea"
@@ -23416,5 +23635,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena)"
@@ -23422,10 +23641,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena) editatu"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Autobusentzako tranpa"
@@ -23433,15 +23652,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Arantzak"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Arantzak editatu"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Ordainlekua"
@@ -23449,5 +23668,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Ordainlekua editatu"
@@ -23455,10 +23674,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Muga-kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Muga-kontrola editatu"
@@ -23467,5 +23686,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Heskai"
@@ -23476,22 +23695,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Hesia"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "hesia"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "egurrezko hesia"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "alanbrezko hesia"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Horma"
@@ -23499,5 +23718,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Harresia"
@@ -23506,5 +23725,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Euste-horma"
@@ -23515,10 +23734,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Sarrera"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Sarrera editatu"
@@ -23526,5 +23745,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Atea"
@@ -23532,50 +23751,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Atea editatu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Hesia"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Hesia editatu"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Sare-metalikodun atea"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Sare-metalikodun atea editatu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Kolpe-atea (kolpe batekin irekitzen diren ateak)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Kolpe-atea (kolpe batekin irekitzen diren ateak) editatu"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Ate-birakorra"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Ate-birakorra editatu"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Eskailera (hesi edo langa gainetik pasatzeko)"
@@ -23583,25 +23802,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Eskailera (hesi edo langa gainetik pasatzeko)  editatu"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Tornua"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Tornua editatu"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Ate-bikoitza"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Ate-bikoitza editatu"
@@ -23609,25 +23828,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Ura"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Iturburua"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Iturbura editatu"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Isurbidea"
@@ -23635,10 +23843,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Isurbidea editatu"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Erretena"
@@ -23646,10 +23854,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Erretena editatu"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Errekastoa"
@@ -23657,10 +23865,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Errekastoa editatu"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanala"
@@ -23668,10 +23876,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Kanala editatu"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Ibaia"
@@ -23681,59 +23889,113 @@
 #. 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:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Ibaia editatu"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Iturburua"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Iturbura editatu"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Ur-jauzia"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Ur-jauzia editatu"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena)"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena) editatu"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Presa"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Presa editatu"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Arroa"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Arroa editatu"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Urtegia"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Urtegia editatu"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Estalitako urtegia"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Estalitako urtegia editatu"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Urazala editatu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Lurrazala"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Lurrazala editatu"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Arroa"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Arroa editatu"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Urtegia"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Urtegia editatu"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Estalitako urtegia"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Estalitako urtegia editatu"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Kostaldea"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Kostaldea editatu"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Ibaiertza"
@@ -23742,10 +24004,11 @@
 #. <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:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Ibaiertza editatu"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Hezegunea"
@@ -23756,14 +24019,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Hezegunea editatu"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "zingira"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "zingira"
@@ -23777,35 +24040,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "padura"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "ihitoki"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "gatz-lurra"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "marea-gunea"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangladia"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Lokatza"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Lokatza editatu"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Hondartza"
@@ -23813,20 +24076,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Hondartza editatu"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Badia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Badia editatu"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Itsaslabarrak"
@@ -23834,145 +24097,214 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Itsaslabarrak editatu"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Kostaldea"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Kostaldea editatu"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Erosketak"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Ferry terminala"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Ferry terminala editatu"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+msgid "Cargo"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "hasiberria"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bizikleta"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Ferry-bidea"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Ferrya editatu"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Ontziola"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Ontziola editatu"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Moila"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Moila editatu"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Presa"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Presa editatu"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Ibaiko bidearen nodoa"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Kirol-portua"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Kirol-portua editatu"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Ontziralekua"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Ontzilarekua editatu"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Esklusa"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena)"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena) editatu"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Ur-jauzia"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Ur-jauzia editatu"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Biratze-puntua"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Kirol-portua"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Kirol-portua editatu"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Ontziralekua"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Ontzilarekua editatu"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Ferry terminala"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Ferry terminala editatu"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Arrapala"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23982,16 +24314,38 @@
 msgstr "Arrapala editatu"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Ontziola"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Ontziola editatu"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Moila"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Moila editatu"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Garraioa"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Trenbidea"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Trena"
@@ -23999,5 +24353,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Trena editatu"
@@ -24027,7 +24381,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Zabalera (mm)"
@@ -24043,8 +24397,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Motak"
@@ -24058,29 +24412,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "hildako-bidea"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "Adarra"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Elektrifikatua"
@@ -24093,8 +24447,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "kontaktu-bidea"
@@ -24165,8 +24519,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24178,8 +24532,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Tentsioa"
@@ -24192,8 +24546,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frekuentzia (Hz)"
@@ -24206,23 +24560,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Trenbide estua"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Trenbide estua editatu"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monoraila"
@@ -24230,50 +24584,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Monoraila editatu"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Mantenduta"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Trenbide historikoa editatu"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Tren-arina"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Tren-arina editatu"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metroa"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Metroa editatu"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tranbia"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Tranbia editatu"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Autobusarentzako bidea"
@@ -24281,5 +24635,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Autobusarentzako bidea editatu"
@@ -24288,10 +24642,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Erabilpenik gabeko trenbidea"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Erabilpenik gabeko trenbidea editatu"
@@ -24300,9 +24654,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Aukerako motak"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Utzitako trenbidea"
@@ -24311,5 +24665,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Trenbide-pasagunea"
@@ -24318,5 +24672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Pasagunea"
@@ -24326,5 +24680,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Pasabide mota"
@@ -24332,5 +24686,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Biraketa-plataforma"
@@ -24339,5 +24693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Bidearen topea"
@@ -24346,10 +24700,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Erremonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Teleaulkia"
@@ -24357,10 +24711,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Teleaulkia editatu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Teleskia"
@@ -24368,10 +24722,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Teleskia editatu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Telekabina"
@@ -24379,10 +24733,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Telekabina editatu"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondola"
@@ -24390,10 +24744,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Gondola editatu"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24402,5 +24757,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24408,5 +24763,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24415,5 +24770,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24421,5 +24776,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Erregaia"
@@ -24429,69 +24784,92 @@
 #. 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:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Erregaia editatu"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "hondarra"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shel"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Independientea"
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24508,34 +24886,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24543,37 +24922,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Irekiera-ordutegia"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24594,33 +24984,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24629,170 +25021,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Astelehenetik ostiralera 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "Kioskoarekin"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Janari-denda"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kioskoa"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Erregai motak"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesela"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Biodiesela"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Kamioi handientzako diesela"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "91 oktano"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "95 oktano"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "98 oktano"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 oktano"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (%10eko etanol nahastea)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (%85eko etanol nahastea)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPF (Petroliotik likidotutako gasa)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Konprimitutako Gas Naturala)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24800,4 +25214,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24809,6 +25224,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Aparkalekua"
@@ -24817,5 +25232,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Aparkalekua editatu"
@@ -24826,25 +25241,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Erreferentzia zenbakia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "hainbat solairuduna"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "kanpoan"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "lurrazpian"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Aparkatu eta gidatu"
@@ -24853,54 +25270,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Ordainpekoa"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Gaitasuna (orotara)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Gutxituentzako lekuak"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Emakumeentzako lekuak"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Gurasoentzako lekuak"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Beste edukiera batzuentzako Wikia ikusi: [types]=*"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Garbiketa"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Autoen garbiketa editatu"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Auto kontzesionarioa"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Auto kontzesionarioa editatu"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Konponketa"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Autoen konponketa editatu"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Motak"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Zuhaitza editatu"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Edukia"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefono Zenbakia"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Alokairua"
@@ -24909,10 +25470,9 @@
 #. <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:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Alokairuko autoa editatu"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Partekatzea"
@@ -24920,28 +25480,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Auto-partekatzea editatu"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Bizikleten aparkalekua editatu"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Edukiera"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motozikleta"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Autobidea editatu"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Zerbitzuak"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Gorde"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "txarra"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Aurrezarpenak"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Arropak"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Bizikleten aparkalekua editatu"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Edukiera"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Bizikleta-denda"
+
+#. item "Bicycle/Bike Dealer"
+#. <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:1491
+msgid "Edit Bicycle Shop"
+msgstr "Bizikleta-denda editatu"
 
 #. item "Bicycle/Rental"
 #. <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:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Bizikleten alokairua editatu"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24951,5 +25570,5 @@
 #. <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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24957,5 +25576,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Erreferentzia"
@@ -24963,5 +25582,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Trenaren geralekua"
@@ -24969,5 +25588,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Geralekua editatu"
@@ -24975,5 +25594,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Tranbiaren-geralekua"
@@ -24982,5 +25601,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Tranbia-geralekua editatu"
@@ -24988,5 +25607,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Trenbideko nasa"
@@ -24995,5 +25614,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Trenbideko nasa editatu"
@@ -25005,5 +25624,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Erreferentzia (pista zenbakia)"
@@ -25011,10 +25630,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Azalera"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Metro-sarrera"
@@ -25023,10 +25642,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Metroaren sarrera editatu"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Gurpildun aulkia"
@@ -25035,5 +25654,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Autobus-estazioa"
@@ -25042,5 +25661,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Autobus-estazioa editatu"
@@ -25048,5 +25667,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Autobus-gelakua"
@@ -25056,13 +25675,12 @@
 #. 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:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Autobus-geralekua editatu"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Babeslekua"
@@ -25070,19 +25688,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Jarlekua"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Ukimen-zola"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Autobusaren plataforma"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Autobusaren plataforma editatu"
@@ -25090,5 +25708,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxia"
@@ -25096,5 +25714,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Taxi-geltokia editatu"
@@ -25102,10 +25720,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Aireportua"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Aireportu-eremua"
@@ -25113,5 +25731,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Aireportu-eremua editatu"
@@ -25119,10 +25737,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25131,5 +25749,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Pista"
@@ -25137,5 +25755,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Pista editatu"
@@ -25143,5 +25761,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Errodaje-pista"
@@ -25149,5 +25767,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Errodaje-pista editatu"
@@ -25155,5 +25773,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Heliportua"
@@ -25161,5 +25779,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Heliportua editatu"
@@ -25169,5 +25787,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Gelditzeko-plataforma"
@@ -25177,5 +25795,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -25186,6 +25804,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Baliza"
@@ -25195,5 +25813,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Haize-mahuka"
@@ -25202,5 +25820,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminala"
@@ -25208,5 +25826,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Terminala editatu"
@@ -25214,15 +25832,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Terminaleko atea editatu"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Bidaiak"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Ostatuak"
@@ -25234,5 +25852,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25241,5 +25859,5 @@
 #. <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:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Hotela editatu"
@@ -25252,8 +25870,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Izarrak"
@@ -25277,34 +25895,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25318,168 +25936,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminala"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefono Zenbakia"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motela"
@@ -25487,20 +26010,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Motela editatu"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Pentsioa"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Pentsioa editatu"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Bungalowa"
@@ -25508,10 +26031,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Bungalowa editatu"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Aterpetxea"
@@ -25519,30 +26042,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Aterpetxea editatu"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Mediko aterpea"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Mendiko aterpea editatu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Karabanentzako kanpalekua"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Karabanentzako kanpalekua editatu"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Kanpalekua"
@@ -25550,10 +26074,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Kanpalekua editatu"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Janaria+Edariak"
@@ -25564,5 +26088,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Jatetxea"
@@ -25570,5 +26094,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Jatetxea editatu"
@@ -25576,5 +26100,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Sukaldaritza"
@@ -25582,79 +26108,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "txinatarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizzeria"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hanburgesategia"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "greziarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "alemaniarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "bertakoa"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turkiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thailandiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexikarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japoniarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "frantsesa"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sandwich-a"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi-a"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Otordu lasterreko jatetxea"
@@ -25662,18 +26188,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Otordu lasterreko jatetxea editatu"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "fish and chips (arraina eta pataten jatetxea)"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "oilaskoa"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25681,10 +26207,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kafetegia"
@@ -25692,10 +26218,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Kafetegia editatu"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -25703,20 +26234,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Pub-a editatu"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Biergarten-a editatu"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Taberna"
@@ -25724,10 +26255,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Taberna editatu"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Diskoteka"
@@ -25735,25 +26266,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Diskoteka editatu"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turismoa"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Erakarpena"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Erakarpena editatu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museoa"
@@ -25761,9 +26292,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Museoa editatu"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -25772,9 +26303,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Zooa editatu"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Jolas-parkea"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Jolas-parkea editatu"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Artelana"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Artelana editatu"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Ikuspegi-gunea"
@@ -25782,50 +26334,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Ikuspegi-gunea editatu"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Zelata-dorrea"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Jolas-parkea"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Jolas-parkea editatu"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Artelana"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Artelana editatu"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Aterpea editatu"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Barbakoa"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Piknik-gunea"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Piknik-gunea editatu"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Informazio bulegoa"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Xehetasun-maila"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topografiko"
@@ -25863,5 +26416,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25869,28 +26422,28 @@
 msgstr "kalea"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "eskema"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Erakutsitako ingurua"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "gunea"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "hiria"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "erregioa"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Deskribapen zehatzagoa"
@@ -25900,5 +26453,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Erakutsitako bideak:"
@@ -25906,5 +26459,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Mendi-ibiliak"
@@ -25912,6 +26465,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Txirrindularitza"
@@ -25919,5 +26472,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mendi-bizikleta"
@@ -25925,6 +26478,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Eskia"
@@ -25932,5 +26485,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Zaldiketa"
@@ -25938,46 +26491,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... beste garraio mota batzuk aukeran"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Informazio-panela"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Iragarki-taula"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "oharra"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "basa-bizitza"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "landareak"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Informazio-zutoina"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25986,5 +26539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Informazio-gunea"
@@ -25992,55 +26545,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Deskribapen zehatza"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audiogida"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Telefono mugikor bidezko audiogida?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Telefono zenbakia"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Beste informazio gune batzuk"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Aterpea editatu"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Barbakoa"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Piknik-gunea"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Piknik-gunea editatu"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Gune historikoak"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Gaztelua"
@@ -26049,19 +26581,19 @@
 #. <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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Gaztelua editatu"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Hondakinak"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Hondakinak editatu"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Gune-arkeologikoa"
@@ -26070,9 +26602,9 @@
 #. <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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Gune-arkeologikoa editatu"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Gudu-zelaia"
@@ -26080,10 +26612,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Gudu-zelaia editatu"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Gune-paleontologikoa"
@@ -26091,5 +26623,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Gune-paleontologikoa editatu"
@@ -26097,15 +26629,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monumentua"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Monumentua editatu"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Oroitarria"
@@ -26113,55 +26645,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Oroitarria editatu"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Gurutzadura"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Gurutzadura editatu"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Santutxoa"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Santutxoa editatu"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Mugarria"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Mugarria editatu"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Aisia"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Ur-jolasen parkea"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Ur-jolasen parkea editatu"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Jolastokia"
@@ -26169,35 +26701,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Jolastokia editatu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Arrantza"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Arrantza editatu"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Kirolak"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Kirol-instalazioak"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Estadioa"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Estadioa editatu"
@@ -26211,6 +26743,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "aukeratu kirola:"
@@ -26626,6 +27158,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26660,240 +27192,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "arku-tiroa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletismoa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "futbol australiarra"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "beisbola"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "saskibaloia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "bola-jokoa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "alpinismoa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "Saredun-cricketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croqueta"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "txirrindularitza"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "txakur-lasterketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "hipika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golfa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockeya"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "zaldi-lasterketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motorra"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "euskal pilota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "erraketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skate-a"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "patinajea"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "eskia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "futbola"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "igeriketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "ping-pong-a"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenisa"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Kiroldegia"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Kiroldegia editatu"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Kirol-zelaia"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Kirol-zelaia editatu"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Lasterketa-pista"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Lasterketa-pista editatu"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golf-zelaia"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Golf-zelaia editatu"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolfa"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Minigolfa editatu"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Kirola"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Multi"
@@ -26910,5 +27442,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26935,23 +27466,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "mota"
@@ -26968,5 +27507,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26993,211 +27531,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "zelaia"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "kiroldegia"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "estadioa"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bola-jokoa"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletismoa"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Atletismoa editatu"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Arku-tiroa"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Arku-tiroa editatu"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Alpinismoa"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Alpinismoa editatu"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Piraguismoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Piraguismoa editatu"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Txirrindularitza editatu"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Txakur-lasterketak"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Txakur-lasterketak editatu"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Hipika"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Hipika editatu"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Zaldi-lasterketak"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Zaldi-lasterketak editatu"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Gimnasia editatu"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motor-kirolak"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Motor-kirolak"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Patinajea"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Patinajea editatu"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skate-a"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Skate-parkea editatu"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Igeriketa"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Igeriketa editatu"
@@ -27205,52 +27746,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Eskia editatu"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Eski-pista mota"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "jaitsiera"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "nordikoa"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snowboard parkea"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Zailtasuna"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "hasiberria"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "erraza"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "aurreratua"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "aditua"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "pistatik kanpo"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Tiro"
@@ -27258,204 +27799,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Tiro-a editatu"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Kirolak (pilota-kirolak)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Futbola"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Futbola editatu"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Futbol australiarra"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Futbol australiarra editatu"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Beisbola"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Beisbola editatu"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Saskibaloia"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Saskibaloia editatu"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golfa"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Golfa editatu"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf-zelaia"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boulea"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Boulea editatu"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bola-jokoa"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket-a"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Cricket-a editatu"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Saredun-cricket-a"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Saredun-cricket-a editatu"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet-a"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Croquet-a editatu"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey-a"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Hockey-a editatu"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Frontoia (Euskal pilota)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Frontoia (Euskal pilota) editatu"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Erraketa"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Erraketa editatu"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Ping-pong-a editatu"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Tenisa editatu"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motor-kirolak"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Motor-kirolak"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Kontuz"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Aparkalekua editatu"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Automobil"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Motor-kirolak"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Patinajea editatu"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Muga-kontrola editatu"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Telekabina"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Telekabina editatu"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Gizakiak-eraikia"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Eraikina"
@@ -27463,5 +28070,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Eraikin-publikoa"
@@ -27469,10 +28076,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Eraikin-publikoa editatu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Udaletxea"
@@ -27480,10 +28087,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Udaletxea editatu"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Enbaxada"
@@ -27491,10 +28098,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Enbaxada editatu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Epaitegia"
@@ -27503,10 +28110,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Epaitegia editatu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Gartzela"
@@ -27515,10 +28122,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Gartzela editatu"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polizia"
@@ -27528,10 +28135,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Polizia editatu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Suhiltzaile-etxea"
@@ -27540,10 +28147,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Suhiltzaile-etxea editatu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postetxea"
@@ -27551,5 +28158,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Postetxea-editatu"
@@ -27557,15 +28164,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Haurreskola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Haurreskola editatu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Eskola"
@@ -27573,10 +28180,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Eskola editatu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Unibertsitatea"
@@ -27584,10 +28191,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Unibertsitatea editatu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Batxilergo-eskola"
@@ -27595,5 +28202,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Batxilergo-eskola editatu"
@@ -27601,5 +28208,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Zinema"
@@ -27608,10 +28215,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Zinema editatu"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Liburutegia"
@@ -27620,9 +28227,9 @@
 #. <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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Liburutegia editatu"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Arte zentrua"
@@ -27630,10 +28237,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Arte zentrua editatu"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Antzokia"
@@ -27642,10 +28249,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Antzokia editatu"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Gurtze-lekua"
@@ -27655,5 +28262,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Gurtze-lekua editatu"
@@ -27662,6 +28269,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Erlijioa"
@@ -27670,66 +28277,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahaista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "kristaua"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindua"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judu"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "musulman"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sij"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrika"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Sinesmena"
@@ -27738,189 +28345,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katoliko"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "ebanjeliko"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Jehovaren lekukoak"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormoi"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentekostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "kuakero"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "xii"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "suni"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Helbideak"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <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:2499
-msgid "Edit Address Information"
-msgstr "Helbideak editatu"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Eraikinaren atari zenbakia"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Eraikinaren izena"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Kale-izena"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Hiriaren izena"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Posta-kodea"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Estatuaren kodea"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <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:2513
-msgid "Edit Address Interpolation"
-msgstr "Helbideen Interpolazioa editatu"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Zenbakien-eskema"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "bakoitia"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "bikoitia"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabetiko"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Gizakiak eraikia"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Lantokia"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Lantokia editatu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Dorrea"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Dorrea editatu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Dorre mota"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "komunikazioa"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "behaketa"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Altuera (metrotan)"
@@ -27928,25 +28465,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Ur-dorrea"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Ur-dorrea editatu"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Itsasargia"
@@ -27954,10 +28491,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Itsasargia editatu"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Haize-errota"
@@ -27965,10 +28502,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Haize-errota editatu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Hodiak"
@@ -27977,41 +28514,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Hodiak editatu"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gasa"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "termikoa"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "olioa"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "hondakin-ura"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "edozein substantzia"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Kokapena"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "urperatua"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "lurrazalean"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
@@ -28021,10 +28558,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Garabia"
@@ -28032,5 +28569,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Garabia editatu"
@@ -28038,10 +28575,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Baliza editatu"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Erpin geodesikoa"
@@ -28049,10 +28586,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Erpin geodesikoa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Zaintza-kamera"
@@ -28060,23 +28597,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Zaintza-kamera editatu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "barruko"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "kanpoko"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "publikoa"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Energia-sorgailua"
@@ -28086,35 +28623,35 @@
 #. 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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Energia sorgailua editatu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "haizea"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hidrauliko"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nuklear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "ikatza"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotovoltaiko"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Zentral elektrikoa"
@@ -28123,10 +28660,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Zentral elektrikoa editatu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Azpiestazio elektrikoa"
@@ -28135,5 +28672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Azpiestazio elektrikoa editatu"
@@ -28141,10 +28678,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Linearen erreferentzia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Elektrizitate-dorrea"
@@ -28155,23 +28692,23 @@
 #. 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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Elektrizitate-dorrea editatu"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "dorrea"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "postea"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Dorrearen erreferentzia"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Linea elektrikoa"
@@ -28180,20 +28717,20 @@
 #. <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:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Linea elektrikoa editatu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Linea mota"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28201,55 +28738,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Kable kopurua"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Alanbre kopurua (eroale hobea) kable elektriko bakoitzeko"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "bakuna"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "bikoitza"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "hirukoitza"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Zerbitzuak"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Komunak"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "mugatua"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Oharra"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Gutunontzia"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefonoa"
@@ -28258,5 +28795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Telefonoa editatu"
@@ -28264,5 +28801,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Txanponak"
@@ -28270,5 +28807,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Oharrak"
@@ -28276,5 +28813,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Errekarga-txartelak eta diru-zorro elektronikoak"
@@ -28282,5 +28819,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debitu-txartelak"
@@ -28288,15 +28825,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditu-txartelak"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefono-txartelak"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Birziklapena"
@@ -28305,5 +28842,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Birziklatze-gunea editatu"
@@ -28311,35 +28848,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Bateria"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Ontziak"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Arropak"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Beira"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papera"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Txatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Paperontzia"
@@ -28347,5 +28879,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Paperontzia editatu"
@@ -28354,31 +28886,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Aulkiaren bizkarraldea"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materiala"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "harria"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastikoa"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Kolorea"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "beltza"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "marroia"
@@ -28457,5 +28989,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28465,31 +28997,31 @@
 msgstr "berdea"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "gorria"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "urdina"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "grisa"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "zuria"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Jarleku kopurua"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Ehiza-postua"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Ehiza-postua editatu"
@@ -28497,31 +29029,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Garaiera"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "baxua"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "erdia"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "beteta"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Esklusa"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Iturria"
@@ -28530,10 +29062,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Iturria editatu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Iturria (edateko ona)"
@@ -28542,10 +29074,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Iturria (edateko ona) editatu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Suteentzako hidrantea"
@@ -28554,5 +29086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Suteentzako hidrantea editatu"
@@ -28560,314 +29092,305 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "egurra"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermerkatua"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Supermerkatua editatu"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Janari-denda"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Janari-denda editatu"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kioskoa"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Kioskoa editatu"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Harategia"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Harategia editatu"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Okindegia"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Okindegia editatu"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Produktu organikoen denda"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Produktu organikoen denda"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alkohola"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Alkoholdun edarien denda editatu"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Edariak"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Edari-denda editatu"
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "Dendak"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Auto kontzesionarioa"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Auto kontzesionarioa editatu"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Bizikleta-denda"
-
-#. item "Shops/Bike Dealer"
-#. <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:2748
-msgid "Edit Bicycle Shop"
-msgstr "Bizikleta-denda editatu"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermerkatua"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Supermerkatua editatu"
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr "Botika"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr "Botika editatu"
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Janari-denda"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Janari-denda editatu"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kioskoa"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Kioskoa editatu"
-
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Ileapaindegia"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Ileapaindegia editatu"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optika"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Optika editatu"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Ordenagailu-denda editatu"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Zapatak"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Zapata-denda editatu"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Kanpoko aktibitateen denda"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Kanpoko aktibitateen denda editatu"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Kiroldenda editatu"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Tindategia"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Tindategia editatu"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Garbitegia"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Garbitegia editatu"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "trenbide bat baino gehiago gurutzatzen diren lekua"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Trena editatu"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Ordenagailua"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Ordenagailu-denda editatu"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Elektronika-denda editatu"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "HI-FI"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "HI-FI denda editatu"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Bideoa"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Bideo-denda editatu"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Loradenda"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Loradenda editatu"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Lorezaintza zentrua"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Lorezaintza zentrua editatu"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Burdindegia"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Burdindegia editatu"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Brikolaje-denda"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Brikolaje denda editatu"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Altzariak"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Altzari-denda editatu"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Paper-denda"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Paper-denda editatu"
+
+#: build/trans_presets.java:3010
 msgid "Book Store"
 msgstr "Liburudenda"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:3011
 msgid "Edit Book Store"
 msgstr "Liburudenda editatu"
 
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:3016
 msgid "Travel Agency"
 msgstr "Bidaia-agentzia"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:3017
 msgid "Edit Travel Agency"
 msgstr "Bidaia-agentzia editatu"
 
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Harategia"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Harategia editatu"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Okindegia"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Okindegia editatu"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Loradenda"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Loradenda editatu"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Produktu organikoen denda"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Produktu organikoen denda"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alkohola"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Alkoholdun edarien denda editatu"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Edariak"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Edari-denda editatu"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Ordenagailua"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Ordenagailu-denda editatu"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Elektronika-denda editatu"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "HI-FI"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "HI-FI denda editatu"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Altzariak"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Altzari-denda editatu"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Lorezaintza zentrua"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Lorezaintza zentrua editatu"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Burdindegia"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Burdindegia editatu"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Brikolaje-denda"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Brikolaje denda editatu"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Paper-denda"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Paper-denda editatu"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Ileapaindegia"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Ileapaindegia editatu"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Zapatak"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Zapata-denda editatu"
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr "Jostailuak"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr "Jostailu-denda editatu"
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Bideoa"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Bideo-denda editatu"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Tindategia"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Tindategia editatu"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Garbitegia"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Garbitegia editatu"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Kanpoko aktibitateen denda"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Kanpoko aktibitateen denda editatu"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Kiroldenda editatu"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optika"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Optika editatu"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "Makina-saltzailea"
@@ -28875,5 +29398,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "Makina-saltzailea editatu"
@@ -28881,97 +29404,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "Produktuen makina-saltzailea"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "garraio publikoko txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr "garraio publikoaren mapak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr "aparkalekuko txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr "Elikadura"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "edariak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr "gozokiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr "zigarretak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr "argazkiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr "animalientzako janaria"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr "egunkariak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr "jostailuak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr "seiluak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "SIM txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr "Telefono-txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr "Bonuak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr "kondoiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr "tanpoiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr "gorotz-poltsa"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr "Fideltasun edo deskontu txartelak"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "Dirua"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "Banku"
@@ -28979,14 +29502,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "Bankua editatu"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "Kutxazain automatikoa"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "Diru-trukea"
@@ -28994,5 +29517,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "Diru-trukea editatu"
@@ -29000,15 +29523,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "Kutxazain automatikoa editatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "Osasuna"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "Medikuak"
@@ -29016,18 +29539,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "Medikuak editatu"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "Dentista editatu"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "Botika"
@@ -29035,5 +29558,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "Botika editatu"
@@ -29041,9 +29564,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr "Medikuaren errezetarekin saltzen dute"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "Ospitalea"
@@ -29051,10 +29574,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "Ospitalea editatu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua"
@@ -29063,5 +29597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua editatu"
@@ -29070,15 +29604,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Puntu-zenbakia"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Puntuaren izena"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Erabili nazioarteko kodea, hala nola +12-345-67890)"
@@ -29086,5 +29620,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Albaitaria"
@@ -29093,368 +29627,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Albaitaria editatu"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Mugak"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nazionala"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Muga nazionala editatu"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administratiboa"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Muga administratiboa editatu"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Zibila"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Muga zibila editatu"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politikoa"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Muga politikoa editatu"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Parke nazionala"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Parke nazionala editatu"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Lekuak"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinentea"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Kontinentea editatu"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Herrialdea"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Herrialdea editatu"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Estatua"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Estatua editatu"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Erregioa"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Erregioa editatu"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Eskualdea"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Eskualdea editatu"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Hiria (100.000 biztanle baino gehiago)"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Hiria (100.000 biztanle baino gehiago) editatu"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Herria (10.000 - 100.000 biztanle)"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Herria (10.000 - 100.000 biztanle) editatu"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Auzoa"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Auzoa editatu"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Herria (10.000 biztale baino gutxiago)"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Herria (10.000 biztale baino gutxiago) editatu"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak)"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak) editatu"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Ingurua (leku geografikoa)"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Ingurua (leku geografikoa) editatu"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Mendi-tontorra"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Mendi-tontorra editatu"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glaziarra"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Glaziarra editatu"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Sumendia"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Sumendia editatu"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Kobazuloaren sarrera"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Kobazuloaren sarrera editatu"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Irla"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Irla editatu"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Irlatxoa"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Irlatxoa editatu"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "natura"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Zuhaitza"
+
+#. item "Nature/Tree"
+#. <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:3281
+msgid "Edit Tree"
+msgstr "Zuhaitza editatu"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Izen-botanikoa"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Basoa"
+
+#. item "Nature/Wood"
+#. <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:3291
+msgid "Edit Wood"
+msgstr "Basoa editatu"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "konifero"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "hostoerorkorra"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "misto"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Basoa"
+
+#. item "Nature/Forest"
+#. <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:3299
+msgid "Edit Forest Landuse"
+msgstr "Basoa editatu"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Natura-erreserba"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Natura-erreserba editatu"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Kobazuloaren sarrera"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Kobazuloaren sarrera editatu"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Mendi-tontorra"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Mendi-tontorra editatu"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glaziarra"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Glaziarra editatu"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Sumendia"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Sumendia editatu"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Mugak"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nazionala"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Muga nazionala editatu"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administratiboa"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Muga administratiboa editatu"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Zibila"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Muga zibila editatu"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politikoa"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Muga politikoa editatu"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Parke nazionala"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Parke nazionala editatu"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Harritza"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Harritza editatu"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Sastraka"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Sastraka editatu"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Txilardi"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Txilardia editatu"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Lurzorua"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Zuhaitza"
-
-#. item "Land use/Tree"
-#. <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:3182
-msgid "Edit Tree"
-msgstr "Zuhaitza editatu"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Izen-botanikoa"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Basoa"
-
-#. item "Land use/Wood"
-#. <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:3192
-msgid "Edit Wood"
-msgstr "Basoa editatu"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "konifero"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "hostoerorkorra"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "misto"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Basoa"
-
-#. item "Land use/Forest"
-#. <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:3200
-msgid "Edit Forest Landuse"
-msgstr "Basoa editatu"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Natura-erreserba"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Natura-erreserba editatu"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Harritza"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Harritza editatu"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Sastraka"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Sastraka editatu"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Txilardi"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Txilardia editatu"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Etxaldea"
@@ -29463,45 +30003,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Etxalde-gunea editatu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Nekazaritza-lurra"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Nekazaritza-lurrak editatu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Belardia"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Mahastia"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Mahastia editatu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Soroak"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Soroak editatu"
@@ -29509,25 +30049,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Lorategia"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Lorategia editatu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Belarra"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Udal-parkea"
@@ -29535,10 +30075,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Udal-parkea editatu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Amankomuna"
@@ -29546,20 +30086,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Amankomuna editatu"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Parkea"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Parkea editatu"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Aisialdi-gunea"
@@ -29567,5 +30107,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Aisialdi-gunea editatu"
@@ -29573,15 +30113,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Bizitegi-gunea"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Bizitegi-gunea editatu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Hilerria (txikia)"
@@ -29589,9 +30129,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Hilerria (txikia) editatu"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Hilerria"
@@ -29599,39 +30139,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Hilerria editatu"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Merkataritza"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Merkataritza-gunea editatu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Bulegoak"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Bulego-eremua editatu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industriala"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Industrialdea editatu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Trenbide-eremua"
@@ -29639,15 +30179,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Trenbide-eremua editatu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militarra"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Eremu militarra editatu"
@@ -29655,52 +30195,186 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Eraikitze-eremua"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Eraikitze-eremua editatu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Lugorria"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Lugorria editatu"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Eraikitzeko lurzorua"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Eraikitzeko lurzorua editatu"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Zabortegia"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Editatu zabortegia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Harrobia"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Harrobia editatu"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Estazioa"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Helbideak"
+
+#. item "Annotation/Addresses"
+#. <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:3496
+msgid "Edit Address Information"
+msgstr "Helbideak editatu"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Eraikinaren atari zenbakia"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Eraikinaren izena"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Kale-izena"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Hiriaren izena"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Posta-kodea"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Estatuaren kodea"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "H"
+
+#. item "Annotation/Address Interpolation"
+#. <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:3510
+msgid "Edit Address Interpolation"
+msgstr "Helbideen Interpolazioa editatu"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Zenbakien-eskema"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "bakoitia"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "bikoitia"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabetiko"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Edukia"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Egileari buruzko informazioa gehitu"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "Hasiera orria"
 
 #. item "Relations/Multipolygon"
@@ -29708,5 +30382,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Multipoligonoa editatu"
@@ -29718,5 +30392,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "kanpoko segmentua"
@@ -29724,5 +30398,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "barruko segmentua"
@@ -29730,5 +30404,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Muga"
@@ -29739,5 +30413,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Muga editatu"
@@ -29745,36 +30419,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Muga mota"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administratiboa"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "nazionala"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "zibila"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "politikoa"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Maila administratiboa"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Azpi-area"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Administrazio gunea"
@@ -29782,5 +30456,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Biraketa debekua"
@@ -29789,5 +30463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Biraketa debekua editatu"
@@ -29795,34 +30469,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Debekua"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "ezkerrera biratzea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "eskuinera biratzea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "zuzen jarraitzea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "U biraketa egitea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "soilik eskuinera biratzea"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "soilik ezkerrera biratzea"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "aurrerantz soilik"
@@ -29831,15 +30505,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "norabide honetatik"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "nodo edo bide honetan zehar"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "bide honetara"
@@ -29847,5 +30521,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Bidea"
@@ -29854,5 +30528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Bidea editatu"
@@ -29860,132 +30534,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Bide mota"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bizikleta"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "autobusa"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "errepidea"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -30053,5 +30616,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30061,9 +30624,9 @@
 msgstr "oinezkoa"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tranbia"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "desbideratzea"
@@ -30077,10 +30640,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metroa"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Sinboloaren deskribapena"
@@ -30088,31 +30651,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Sarea"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Estatuko bidea"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "proposatutako"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "txandakatu"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "behin-behineko"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "lotura"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Kolorea (hex)"
@@ -30121,30 +30684,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "ibilbidearen segmentua"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "hurrengo segmentua"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "aurreko segmentua"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "geldialdi puntua"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "hurrengo geldialdi puntua"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "aurreko geldialdi puntua"
@@ -34122,7 +34685,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34244,8 +34806,11 @@
 msgstr "Sizilia - Italia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Waterway Point"
+#~ msgstr "Ibaiko bidearen nodoa"
 
 #~ msgid "The selected way does not contain the selected node."
