Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 23004)
+++ applications/editors/josm/i18n/po/it.po	(revision 23107)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 22:59+0200\n"
-"PO-Revision-Date: 2010-09-05 15:15+0000\n"
-"Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
+"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"PO-Revision-Date: 2010-09-10 13:41+0000\n"
+"Last-Translator: Andrea Amoroso <andrea.amoroso@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-05 20:38+0000\n"
+"X-Launchpad-Export-Date: 2010-09-10 20:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -51,11 +51,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:444
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -67,7 +67,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:698
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
@@ -151,8 +151,8 @@
 msgstr "Segnalazione errori"
 
-#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
+#. <button label="Info" hotkey="I">
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
@@ -228,4 +228,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -253,6 +254,6 @@
 #: ../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:1000
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
@@ -276,9 +277,10 @@
 #: ../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:946
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:27
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Annulla"
@@ -388,4 +390,5 @@
 msgstr "Sposta i nodi selezionati disponendoli su un cerchio."
 
+#. $NON-NLS-1$
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
@@ -409,5 +412,5 @@
 #: ../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
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57
@@ -423,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -669,6 +672,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -813,5 +816,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
 msgid "Duplicate"
 msgstr "Duplica"
@@ -847,8 +850,8 @@
 msgstr "Copia {1} di {0}"
 
-#. <button label="Info" hotkey="I">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
+#. <button label="Exit" hotkey="E">
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:24
@@ -1585,6 +1588,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:820
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1595,9 +1598,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
 #: ../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
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1098
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:685
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:698
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1104
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1112
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1357
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -1648,4 +1651,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1760,4 +1764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
 msgid "Close"
 msgstr "Chiudi"
@@ -1809,4 +1814,5 @@
 msgstr "Selezionare almeno un percorso da semplificare."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1814,4 +1820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
+#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Si"
@@ -1870,5 +1877,5 @@
 msgstr "I nodi selezionati non condividono il medesimo percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:131
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1876,5 +1883,5 @@
 msgstr[1] "I nodi selezionati non sono parte di alcun percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1890,10 +1897,10 @@
 "il percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:247
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:262
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Seleziona due o più nodi per dividere un percorso circolare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1903,5 +1910,5 @@
 "(Suggerimento: seleziona i nodi in mezzo al percorso)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:448
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:443
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1912,5 +1919,5 @@
 "necessario.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1920,5 +1927,5 @@
 "strade<br>Verificare l''operazione e correggere dove necessario.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -3129,9 +3136,10 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../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/dialogs/relation/GenericRelationEditor.java:1224
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
@@ -3141,5 +3149,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:323
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:27
@@ -3156,5 +3164,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58
+#: build/specialmessages.java:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3257,5 +3265,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
 msgid "Double conflict"
 msgstr "Doppio conflitto"
@@ -4220,5 +4228,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "railway"
 msgstr "ferrovia"
@@ -4252,5 +4260,4 @@
 msgstr "trasporto pubblico"
 
-#. color tiger_data
 #. </rule>
 #.
@@ -4305,4 +4312,5 @@
 #. <condition k="building"/>
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
+#. color building
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
@@ -4678,5 +4686,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1067
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -4907,5 +4915,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5017,5 +5025,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
@@ -5033,5 +5041,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:313
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -5489,6 +5497,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5504,6 +5512,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5587,5 +5595,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
@@ -5601,5 +5609,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "all"
 msgstr "tutti"
@@ -5918,5 +5926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:537
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -6024,5 +6032,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -6282,9 +6290,9 @@
 msgstr "Informazioni sul livello"
 
-#. item "Annotation/Contact" text "Image"
+#. group "Relations"
 #: ../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:3532
+#: build/trans_presets.java:3558
 msgid "Relations"
 msgstr "Relazioni"
@@ -6307,5 +6315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1432
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -6380,15 +6388,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
 
 #: ../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/GenericRelationEditor.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67
@@ -6749,32 +6757,32 @@
 
 #. Strings in JFileChooser
-#. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
-#. item "Highways/Streets/Trunk" text "Reference"
+#. item "Highways/Streets/Motorway" text "Name"
 #. <optional>
-#. item "Highways/Streets/Primary" text "Reference"
+#. item "Highways/Streets/Trunk" text "Name"
 #. <optional>
-#. item "Highways/Streets/Secondary" text "Reference"
+#. item "Highways/Streets/Primary" text "Name"
 #. <optional>
-#. item "Highways/Streets/Tertiary" text "Reference"
+#. item "Highways/Streets/Secondary" text "Name"
 #. <optional>
-#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
+#. item "Highways/Streets/Tertiary" text "Name"
 #. <space />
 #. <key key="highway" value="unclassified" />
 #. <optional>
-#. item "Highways/Streets/Residential" label "Edit Residential Street"
+#. item "Highways/Streets/Unclassified" text "Name"
 #. <space />
 #. <key key="highway" value="residential" />
-#. item "Highways/Streets/Living Street" label "Edit Living Street"
+#. item "Highways/Streets/Residential" text "Name"
 #. <space />
 #. <key key="highway" value="living_street" />
-#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
+#. item "Highways/Streets/Living Street" text "Name"
 #. <space />
 #. <key key="highway" value="pedestrian" />
-#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
+#. item "Highways/Streets/Pedestrian" text "Name"
+#. item "Highways/Streets/Service" text "Name"
 #. <space />
 #. <key key="highway" value="road" />
 #. <optional>
-#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. item "Highways/Streets/Road (Unknown Type)" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
@@ -6782,9 +6790,11 @@
 #. <key key="highway" value="construction" />
 #. <optional>
-#. item "Highways/Streets/Bridge" label "Edit Bridge"
+#. item "Highways/Streets/Construction" text "Name"
+#. <optional>
+#. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
 #. <key key="bridge" value="yes" />
 #. <optional>
-#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
+#. item "Highways/Streets/Bridge" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -6793,21 +6803,21 @@
 #. <key key="tunnel" value="yes" />
 #. <optional>
-#. item "Ways/Track" label "Edit Track"
+#. item "Highways/Streets/Tunnel" text "Name"
 #. <space />
 #. <key key="highway" value="track" />
 #. <optional>
-#. item "Ways/Path" label "Edit Path"
+#. item "Ways/Track" text "Name"
 #. <space />
 #. <key key="highway" value="path" />
 #. <optional>
-#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
+#. item "Ways/Path" text "Name"
 #. <space />
 #. <key key="highway" value="bridleway" />
 #. <optional>
-#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
+#. item "Ways/Dedicated Bridleway" text "Name"
 #. <space />
 #. <key key="highway" value="cycleway" />
 #. <optional>
-#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
+#. item "Ways/Dedicated Cycleway" text "Name"
 #. <space />
 #. <key key="highway" value="path" />
@@ -6816,5 +6826,5 @@
 #. <key key="segregated" value="yes" />
 #. <optional>
-#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
 #. <space />
 #. <key key="highway" value="path" />
@@ -6823,667 +6833,673 @@
 #. <key key="segregated" value="no" />
 #. <optional>
-#. item "Ways/Dedicated Footway" label "Edit Footway"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
 #. <space />
 #. <key key="highway" value="footway" />
 #. <optional>
-#. item "Ways/Steps" label "Edit Flight of Steps"
+#. item "Ways/Dedicated Footway" text "Name"
 #. <space />
 #. <key key="highway" value="steps" />
 #. <optional>
-#. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
+#. item "Ways/Steps" text "Name"
 #. <space />
 #. <key key="highway" value="motorway_junction" />
-#. item "Waypoints/Services" label "Edit Service Station"
+#. item "Waypoints/Motorway Junction" text "Name"
 #. <space />
 #. <key key="highway" value="services" />
 #. <optional>
-#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. item "Waypoints/Services" text "Name"
 #. <space />
 #. <key key="highway" value="rest_area" />
 #. <optional>
-#. item "Waypoints/City Limit" label "Edit City Limit Sign"
+#. item "Waypoints/Rest Area" text "Name"
 #. <space />
 #. <key key="traffic_sign" value="city_limit" />
 #. <space />
-#. item "Waypoints/Ford" label "Edit Ford"
+#. item "Waypoints/City Limit" text "Name"
 #. <space />
 #. <key key="highway" value="ford" />
 #. <optional>
-#. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
+#. item "Waypoints/Ford" text "Name"
 #. <space />
 #. <key key="mountain_pass" value="yes" />
 #. <optional>
-#. item "Barriers/Toll Booth" label "Edit Toll Booth"
+#. item "Waypoints/Mountain Pass" text "Name"
 #. <space />
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Drain" label "Edit Drain"
+#. item "Barriers/Toll Booth" text "Name"
 #. <space />
 #. <key key="waterway" value="drain" />
-#. item "Water/Water/Ditch" label "Edit Ditch"
+#. item "Water/Water/Drain" text "Name"
 #. <space />
 #. <key key="waterway" value="ditch" />
-#. item "Water/Water/Stream" label "Edit Stream"
+#. item "Water/Water/Ditch" text "Name"
 #. <space />
 #. <key key="waterway" value="stream" />
-#. item "Water/Water/Canal" label "Edit Canal"
+#. item "Water/Water/Stream" text "Name"
 #. <space />
 #. <key key="waterway" value="canal" />
-#. item "Water/Water/River" label "Edit River"
+#. item "Water/Water/Canal" text "Name"
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Spring" label "Edit Spring"
+#. item "Water/Water/River" text "Name"
 #. <key key="natural" value="spring" />
-#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. item "Water/Water/Spring" text "Name"
 #. <space />
 #. <key key="waterway" value="waterfall" />
-#. item "Water/Water/Weir" label "Edit Weir"
+#. item "Water/Water/Waterfall" text "Name"
 #. <space />
 #. <key key="waterway" value="weir" />
-#. item "Water/Water/Dam" label "Edit Dam"
+#. item "Water/Water/Weir" text "Name"
 #. <space />
 #. <key key="waterway" value="dam" />
-#. item "Water/Water/Basin" label "Edit Basin Landuse"
+#. item "Water/Water/Dam" text "Name"
 #. <space />
 #. <key key="landuse" value="basin" />
-#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
+#. item "Water/Water/Basin" text "Name"
 #. <space />
 #. <key key="landuse" value="reservoir" />
-#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
+#. item "Water/Water/Reservoir" text "Name"
 #. <key key="man_made" value="reservoir_covered" />
-#. item "Water/Water/Water" label "Edit Water"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
+#. item "Water/Water/Water" text "Name"
 #. <key key="natural" value="land" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
+#. item "Water/Water/Land" text "Name"
 #. <key key="natural" value="coastline" />
-#. item "Water/Water/Riverbank" label "Edit Riverbank"
+#. item "Water/Water/Coastline" text "Name"
 #. <key key="waterway" value="riverbank" />
-#. item "Water/Water/Wetland" label "Edit Wetland"
+#. item "Water/Water/Riverbank" text "Name"
 #. <key key="natural" value="wetland" />
-#. item "Water/Water/Mud" label "Edit Mud"
+#. item "Water/Water/Wetland" text "Name"
 #. <key key="natural" value="mud" />
-#. item "Water/Water/Beach" label "Edit Beach"
+#. item "Water/Water/Mud" text "Name"
 #. <key key="natural" value="beach" />
-#. item "Water/Water/Bay" label "Edit Bay"
+#. item "Water/Water/Beach" text "Name"
 #. <key key="natural" value="bay" />
-#. item "Water/Water/Cliff" label "Edit Cliff"
+#. item "Water/Water/Bay" text "Name"
 #. <key key="natural" value="cliff" />
-#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. item "Water/Water/Cliff" text "Name"
 #. <key key="amenity" value="ferry_terminal" />
-#. item "Shipping/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" text "Name"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Shipping/Marina" label "Edit Marina"
+#. item "Shipping/Ferry Route" text "Name"
 #. <key key="leisure" value="marina" />
-#. item "Shipping/Pier" label "Edit Pier"
+#. item "Shipping/Marina" text "Name"
 #. <key key="man_made" value="pier" />
-#. item "Shipping/Slipway" label "Edit Slipway"
+#. item "Shipping/Pier" text "Name"
 #. <key key="leisure" value="slipway" />
-#. item "Shipping/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Slipway" text "Name"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Shipping/Dock" label "Edit Dock"
+#. item "Shipping/Boatyard" text "Name"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
+#. item "Shipping/Dock" text "Name"
 #. <space />
 #. <key key="highway" value="bus_guideway" />
 #. <optional>
-#. item "Aerialway/Chair Lift" label "Edit Chair Lift"
+#. item "Transport/Railway/Bus Guideway" text "Name"
 #. <key key="aerialway" value="chair_lift" />
-#. item "Aerialway/Drag Lift" label "Edit Drag Lift"
+#. item "Aerialway/Chair Lift" text "Name"
 #. <key key="aerialway" value="drag_lift" />
-#. item "Aerialway/Cable Car" label "Edit Cable Car"
+#. item "Aerialway/Drag Lift" text "Name"
 #. <key key="aerialway" value="cable_car" />
-#. item "Aerialway/Gondola" label "Edit Gondola"
+#. item "Aerialway/Cable Car" text "Name"
 #. <key key="aerialway" value="gondola" />
-#. item "Aerialway/Station" label "Edit Station"
+#. item "Aerialway/Gondola" text "Name"
 #. <key key="aerialway" value="station" />
-#. item "Aerialway/Pylon" label "Edit Pylon"
+#. item "Aerialway/Station" text "Name"
 #. <key key="aerialway" value="pylon" />
-#. item "Aerialway/Goods" label "Edit Goods"
+#. item "Aerialway/Pylon" text "Name"
 #. <key key="aerialway" value="goods" />
+#. item "Aerialway/Goods" text "Name"
 #. <optional>
-#. item "Car/Parking" label "Edit Parking"
+#. item "Car/Fuel" text "Name"
 #. <key key="amenity" value="parking" />
-#. item "Car/Wash" label "Edit Car Wash"
+#. item "Car/Parking" text "Name"
 #. <key key="amenity" value="car_wash" />
-#. item "Car/Car Dealer" label "Edit Car Shop"
+#. item "Car/Wash" text "Name"
 #. <key key="shop" value="car" />
-#. item "Car/Repair" label "Edit Car Repair"
+#. item "Car/Car Dealer" text "Name"
 #. <key key="shop" value="car_repair" />
-#. item "Car/Tyres" label "Edit Tyres"
+#. item "Car/Repair" text "Name"
 #. <key key="shop" value="tyres" />
-#. item "Car/Rental" label "Edit Car Rental"
+#. item "Car/Tyres" text "Name"
 #. <key key="amenity" value="car_rental" />
-#. item "Car/Sharing" label "Edit Car Sharing"
+#. item "Car/Rental" text "Name"
 #. <key key="amenity" value="car_sharing" />
-#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. item "Car/Sharing" text "Name"
 #. <key key="amenity" value="motorcycle_parking" />
-#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. item "Motorcycle/Parking" text "Name"
 #. <key key="shop" value="motorcycle" />
-#. item "Bicycle/Parking" label "Edit Bicycle Parking"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
 #. <key key="amenity" value="bicycle_parking" />
-#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. item "Bicycle/Parking" text "Name"
 #. <key key="shop" value="bicycle" />
-#. item "Bicycle/Rental" label "Edit Bicycle Rental"
+#. item "Bicycle/Bike Dealer" text "Name"
 #. <key key="amenity" value="bicycle_rental" />
-#. item "Public Transport/Station" label "Edit Station"
+#. item "Bicycle/Rental" text "Name"
 #. <space />
 #. <key key="railway" value="station" />
 #. <optional>
-#. item "Public Transport/Railway Halt" label "Edit Halt"
+#. item "Public Transport/Station" text "Name"
 #. <space />
 #. <key key="railway" value="halt" />
 #. <optional>
-#. item "Public Transport/Tram Stop" label "Edit Tram Stop"
+#. item "Public Transport/Railway Halt" text "Name"
 #. <space />
 #. <key key="railway" value="tram_stop" />
 #. <optional>
-#. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
+#. item "Public Transport/Tram Stop" text "Name"
 #. <space />
 #. <key key="railway" value="subway_entrance" />
 #. <optional>
-#. item "Public Transport/Bus Station" label "Edit Bus Station"
+#. item "Public Transport/Subway Entrance" text "Name"
 #. <key key="amenity" value="bus_station" />
 #. <optional>
-#. item "Public Transport/Bus Stop" label "Edit Bus Stop"
+#. item "Public Transport/Bus Station" text "Name"
 #. <space />
 #. <key key="highway" value="bus_stop" />
 #. <optional>
-#. item "Public Transport/Taxi" label "Edit Taxi station"
+#. item "Public Transport/Bus Stop" text "Name"
 #. <key key="amenity" value="taxi" />
-#. item "Airport/Airport Ground" label "Edit Airport Ground"
+#. item "Public Transport/Taxi" text "Name"
 #. <key key="aeroway" value="aerodrome" />
-#. item "Airport/Terminal" label "Edit Terminal"
+#. item "Airport/Airport Ground" text "Name"
 #. <key key="aeroway" value="terminal" />
-#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
+#. item "Airport/Terminal" text "Name"
 #. <key key="tourism" value="hotel" />
-#. item "Travel/Accomodation/Motel" label "Edit Motel"
+#. item "Travel/Accomodation/Hotel" text "Name"
 #. <key key="tourism" value="motel" />
-#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
+#. item "Travel/Accomodation/Motel" text "Name"
 #. <key key="tourism" value="guest_house" />
-#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
+#. item "Travel/Accomodation/Guest House" text "Name"
 #. <key key="tourism" value="chalet" />
-#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
+#. item "Travel/Accomodation/Chalet" text "Name"
 #. <key key="tourism" value="hostel" />
-#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#. item "Travel/Accomodation/Hostel" text "Name"
 #. <key key="tourism" value="alpine_hut" />
-#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
 #. <key key="tourism" value="caravan_site" />
-#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
 #. <key key="tourism" value="camp_site" />
-#. item "Food+Drinks/Restaurant" label "Edit Restaurant"
+#. item "Travel/Accomodation/Camping Site" text "Name"
 #. <key key="amenity" value="restaurant" />
-#. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
+#. item "Food+Drinks/Restaurant" text "Name"
 #. <key key="amenity" value="fast_food" />
-#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. item "Food+Drinks/Fast Food" text "Name"
 #. <key key="amenity" value="food_court" />
-#. item "Food+Drinks/Cafe" label "Edit Cafe"
+#. item "Food+Drinks/Food Court" text "Name"
 #. <key key="amenity" value="cafe" />
-#. item "Food+Drinks/Pub" label "Edit Pub"
+#. item "Food+Drinks/Cafe" text "Name"
 #. <key key="amenity" value="pub" />
-#. item "Food+Drinks/Biergarten" label "Edit Biergarten"
+#. item "Food+Drinks/Pub" text "Name"
 #. <key key="amenity" value="biergarten" />
-#. item "Food+Drinks/Bar" label "Edit Bar"
+#. item "Food+Drinks/Biergarten" text "Name"
 #. <key key="amenity" value="bar" />
-#. item "Food+Drinks/Nightclub" label "Edit Nightclub"
+#. item "Food+Drinks/Bar" text "Name"
 #. <key key="amenity" value="nightclub" />
-#. item "Tourism/Attraction" label "Edit Attraction"
+#. item "Food+Drinks/Nightclub" text "Name"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Museum" label "Edit Museum"
+#. item "Tourism/Attraction" text "Name"
 #. <key key="tourism" value="museum" />
-#. item "Tourism/Zoo" label "Edit Zoo"
+#. item "Tourism/Museum" text "Name"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Theme Park" label "Edit Theme Park"
+#. item "Tourism/Zoo" text "Name"
 #. <key key="tourism" value="theme_park" />
-#. item "Tourism/Artwork" label "Edit Artwork"
+#. item "Tourism/Theme Park" text "Name"
 #. <key key="tourism" value="artwork" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. item "Tourism/Artwork" text "Name"
 #. <key key="tourism" value="viewpoint" />
-#. item "Tourism/Shelter" label "Edit Shelter"
+#. item "Tourism/Viewpoint" text "Name"
 #. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. item "Tourism/Shelter" text "Name"
 #. <key key="tourism" value="picnic_site" />
-#. item "Tourism/Information Office"
+#. item "Tourism/Picnic Site" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="office" />
-#. item "Tourism/Map"
+#. item "Tourism/Information Office" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="map" />
-#. item "Tourism/Information Board"
+#. item "Tourism/Map" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="board" />
-#. item "Tourism/Guidepost"
+#. item "Tourism/Information Board" text "Name"
 #. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="guidepost" />
-#. item "Tourism/Information Terminal"
+#. item "Tourism/Guidepost" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="terminal" />
-#. item "Tourism/Audioguide"
+#. item "Tourism/Information Terminal" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="audioguide" />
-#. item "Tourism/Other Information Points"
+#. item "Tourism/Audioguide" text "Name"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Historic Places/Castle" label "Edit Castle"
+#. item "Tourism/Other Information Points" text "Name"
 #. <key key="historic" value="castle" />
-#. item "Historic Places/Ruins" label "Edit Ruins"
+#. item "Historic Places/Castle" text "Name"
 #. <key key="historic" value="ruins" />
-#. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
+#. item "Historic Places/Ruins" text "Name"
 #. <key key="historic" value="archaeological_site" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. item "Historic Places/Archaeological Site" text "Name"
 #. <key key="historic" value="battlefield" />
-#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#. item "Historic Places/Battlefield" text "Name"
 #. <key key="geological" value="palaeontological_site" />
-#. item "Historic Places/Monument" label "Edit Monument"
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <key key="historic" value="monument" />
-#. item "Historic Places/Memorial" label "Edit Memorial"
+#. item "Historic Places/Monument" text "Name"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
+#. item "Historic Places/Memorial" text "Name"
 #. <key key="historic" value="wayside_cross" />
-#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
+#. item "Historic Places/Wayside Cross" text "Name"
 #. <key key="historic" value="wayside_shrine" />
-#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. item "Historic Places/Wayside Shrine" text "Name"
 #. <key key="historic" value="boundary_stone" />
-#. item "Leisure/Water Park" label "Edit Water Park"
+#. item "Historic Places/Boundary Stone" text "Name"
 #. <key key="leisure" value="water_park" />
-#. item "Leisure/Playground" label "Edit Playground"
+#. item "Leisure/Water Park" text "Name"
 #. <key key="leisure" value="playground" />
-#. item "Leisure/Fishing" label "Edit Fishing"
+#. item "Leisure/Playground" text "Name"
 #. <key key="leisure" value="fishing" />
-#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
+#. item "Leisure/Fishing" text "Name"
 #. <key key="leisure" value="stadium" />
-#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#. item "Sports/Sport Facilities/Stadium" text "Name"
 #. <key key="leisure" value="sports_centre" />
-#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
+#. item "Sports/Sport Facilities/Sports Centre" text "Name"
 #. <key key="leisure" value="pitch" />
-#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
+#. item "Sports/Sport Facilities/Pitch" text "Name"
 #. <key key="leisure" value="track" />
-#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
+#. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <key key="leisure" value="golf_course" />
-#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#. item "Sports/Sport Facilities/Golf Course" text "Name"
 #. <key key="leisure" value="miniature_golf" />
-#. item "Sport/Multi" label "Edit Multi"
+#. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. <key key="sport" value="multi" />
-#. item "Sport/10pin" label "Edit 10pin"
+#. item "Sport/Multi" text "Name"
 #. <key key="sport" value="10pin" />
-#. item "Sport/Athletics" label "Edit Athletics"
+#. item "Sport/10pin" text "Name"
 #. <key key="sport" value="athletics" />
-#. item "Sport/Archery" label "Edit Archery"
+#. item "Sport/Athletics" text "Name"
 #. <key key="sport" value="archery" />
-#. item "Sport/Climbing" label "Edit Climbing"
+#. item "Sport/Archery" text "Name"
 #. <key key="sport" value="climbing" />
-#. item "Sport/Canoeing" label "Edit Canoeing"
+#. item "Sport/Climbing" text "Name"
 #. <key key="sport" value="canoe" />
-#. item "Sport/Cycling" label "Edit Cycling"
+#. item "Sport/Canoeing" text "Name"
 #. <key key="sport" value="cycling" />
-#. item "Sport/Dog Racing" label "Edit Dog Racing"
+#. item "Sport/Cycling" text "Name"
 #. <key key="sport" value="dog_racing" />
-#. item "Sport/Equestrian" label "Edit Equestrian"
+#. item "Sport/Dog Racing" text "Name"
 #. <key key="sport" value="equestrian" />
-#. item "Sport/Horse Racing" label "Edit Horse Racing"
+#. item "Sport/Equestrian" text "Name"
 #. <key key="sport" value="horse_racing" />
-#. item "Sport/Gymnastics" label "Edit Gymnastics"
+#. item "Sport/Horse Racing" text "Name"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Skating" label "Edit Skating"
+#. item "Sport/Gymnastics" text "Name"
 #. <key key="sport" value="skating" />
-#. item "Sport/Skateboard" label "Edit Skateboard"
+#. item "Sport/Skating" text "Name"
 #. <key key="sport" value="skateboard" />
-#. item "Sport/Swimming" label "Edit Swimming"
+#. item "Sport/Skateboard" text "Name"
 #. <key key="sport" value="swimming" />
-#. item "Sport/Skiing" label "Edit Skiing"
+#. item "Sport/Swimming" text "Name"
 #. <key key="sport" value="skiing" />
-#. item "Sport/Shooting" label "Edit Shooting"
+#. item "Sport/Skiing" text "Name"
 #. <key key="sport" value="shooting" />
-#. item "Sport (Ball)/Soccer" label "Edit Soccer"
+#. item "Sport/Shooting" text "Name"
 #. <key key="sport" value="soccer" />
-#. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
+#. item "Sport (Ball)/Soccer" text "Name"
 #. <key key="sport" value="australian_football" />
-#. item "Sport (Ball)/American Football" label "Edit American Football"
+#. item "Sport (Ball)/Australian Football" text "Name"
 #. <key key="sport" value="american_football" />
-#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#. item "Sport (Ball)/American Football" text "Name"
 #. <key key="sport" value="canadian_football" />
-#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#. item "Sport (Ball)/Canadian Football" text "Name"
 #. <key key="sport" value="gaelic_football" />
-#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#. item "Sport (Ball)/Gaelic Football" text "Name"
 #. <key key="sport" value="rugby_league" />
-#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#. item "Sport (Ball)/Rugby League" text "Name"
 #. <key key="sport" value="rugby_union" />
-#. item "Sport (Ball)/Baseball" label "Edit Baseball"
+#. item "Sport (Ball)/Rugby Union" text "Name"
 #. <key key="sport" value="baseball" />
-#. item "Sport (Ball)/Basketball" label "Edit Basketball"
+#. item "Sport (Ball)/Baseball" text "Name"
 #. <key key="sport" value="basketball" />
-#. item "Sport (Ball)/Golf" label "Edit Golf"
+#. item "Sport (Ball)/Basketball" text "Name"
 #. <key key="sport" value="golf" />
-#. item "Sport (Ball)/Boule" label "Edit Boule"
+#. item "Sport (Ball)/Golf" text "Name"
 #. <key key="sport" value="boules" />
-#. item "Sport (Ball)/Bowls" label "Edit Bowls"
+#. item "Sport (Ball)/Boule" text "Name"
 #. <key key="sport" value="bowls" />
-#. item "Sport (Ball)/Cricket" label "Edit Cricket"
+#. item "Sport (Ball)/Bowls" text "Name"
 #. <key key="sport" value="cricket" />
-#. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
+#. item "Sport (Ball)/Cricket" text "Name"
 #. <key key="sport" value="cricket_nets" />
-#. item "Sport (Ball)/Croquet" label "Edit Croquet"
+#. item "Sport (Ball)/Cricket Nets" text "Name"
 #. <key key="sport" value="croquet" />
-#. item "Sport (Ball)/Hockey" label "Edit Hockey"
+#. item "Sport (Ball)/Croquet" text "Name"
 #. <key key="sport" value="hockey" />
-#. item "Sport (Ball)/Pelota" label "Edit Pelota"
+#. item "Sport (Ball)/Hockey" text "Name"
 #. <key key="sport" value="pelota" />
-#. item "Sport (Ball)/Racquet" label "Edit Racquet"
+#. item "Sport (Ball)/Pelota" text "Name"
 #. <key key="sport" value="racquet" />
-#. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
+#. item "Sport (Ball)/Racquet" text "Name"
 #. <key key="sport" value="table_tennis" />
-#. item "Sport (Ball)/Tennis" label "Edit Tennis"
+#. item "Sport (Ball)/Table Tennis" text "Name"
 #. <key key="sport" value="tennis" />
-#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. item "Sport (Ball)/Tennis" text "Name"
 #. <key key="sport" value="motor" />
-#. item "Motorsport/Karting" label "Edit Karting"
+#. item "Motorsport/Motorsport" text "Name"
 #. <key key="sport" value="karting" />
-#. item "Motorsport/Motocross" label "Edit Motocross"
+#. item "Motorsport/Karting" text "Name"
 #. <key key="sport" value="motocross" />
-#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. item "Motorsport/Motocross" text "Name"
 #. <key key="sport" value="safety_training" />
-#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. item "Motorsport/Safety Training" text "Name"
 #. <key key="sport" value="model_aerodrome" />
-#. item "Motorsport/RC Car" label "Edit RC Car"
+#. item "Motorsport/Model Aerodrome" text "Name"
 #. <key key="sport" value="rc_car" />
-#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
+#. item "Motorsport/RC Car" text "Name"
 #. <key key="amenity" value="public_building" />
-#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
+#. item "Man-Made/Buildings/Public Building" text "Name"
 #. <key key="amenity" value="townhall" />
-#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
+#. item "Man-Made/Buildings/Town hall" text "Name"
 #. <key key="amenity" value="embassy" />
-#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
+#. item "Man-Made/Buildings/Embassy" text "Name"
 #. <key key="amenity" value="courthouse" />
-#. item "Man-Made/Buildings/Prison" label "Edit Prison"
+#. item "Man-Made/Buildings/Courthouse" text "Name"
 #. <key key="amenity" value="prison" />
-#. item "Man-Made/Buildings/Police" label "Edit Police"
+#. item "Man-Made/Buildings/Prison" text "Name"
 #. <key key="amenity" value="police" />
-#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
+#. item "Man-Made/Buildings/Police" text "Name"
 #. <key key="amenity" value="fire_station" />
-#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
+#. item "Man-Made/Buildings/Fire Station" text "Name"
 #. <key key="amenity" value="post_office" />
-#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
+#. item "Man-Made/Buildings/Post Office" text "Name"
 #. <key key="amenity" value="kindergarten" />
-#. item "Man-Made/Buildings/School" label "Edit School"
+#. item "Man-Made/Buildings/Kindergarten" text "Name"
 #. <key key="amenity" value="school" />
-#. item "Man-Made/Buildings/University" label "Edit University"
+#. item "Man-Made/Buildings/School" text "Name"
 #. <key key="amenity" value="university" />
-#. item "Man-Made/Buildings/College" label "Edit College"
+#. item "Man-Made/Buildings/University" text "Name"
 #. <key key="amenity" value="college" />
-#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
+#. item "Man-Made/Buildings/College" text "Name"
 #. <key key="amenity" value="cinema" />
-#. item "Man-Made/Buildings/Library" label "Edit Library"
+#. item "Man-Made/Buildings/Cinema" text "Name"
 #. <key key="amenity" value="library" />
-#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
+#. item "Man-Made/Buildings/Library" text "Name"
 #. <key key="amenity" value="arts_centre" />
-#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
+#. item "Man-Made/Buildings/Arts Centre" text "Name"
 #. <key key="amenity" value="theatre" />
-#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
+#. item "Man-Made/Buildings/Theatre" text "Name"
 #. <key key="amenity" value="place_of_worship" />
-#. item "Man Made/Works" label "Edit Works"
+#. item "Man-Made/Buildings/Place of Worship" text "Name"
 #. <key key="man_made" value="works" />
-#. item "Man Made/Tower" label "Edit Tower"
+#. item "Man Made/Works" text "Name"
 #. <key key="man_made" value="tower" />
-#. item "Man Made/Water Tower" label "Edit Water Tower"
+#. item "Man Made/Tower" text "Name"
 #. <key key="man_made" value="water_tower" />
-#. item "Man Made/Gasometer" label "Edit Gasometer"
+#. item "Man Made/Water Tower" text "Name"
 #. <key key="man_made" value="gasometer" />
-#. item "Man Made/Lighthouse" label "Edit Lighthouse"
+#. item "Man Made/Gasometer" text "Name"
 #. <key key="man_made" value="lighthouse" />
-#. item "Man Made/Windmill" label "Edit Windmill"
+#. item "Man Made/Lighthouse" text "Name"
 #. <key key="man_made" value="windmill" />
-#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#. item "Man Made/Windmill" text "Name"
 #. <key key="man_made" value="wastewater_plant" />
-#. item "Man Made/Crane" label "Edit Crane"
+#. item "Man Made/Wastewater Plant" text "Name"
 #. <key key="man_made" value="crane" />
-#. item "Man Made/Beacon" label "Edit Beacon"
+#. item "Man Made/Crane" text "Name"
 #. <key key="man_made" value="beacon" />
-#. item "Man Made/Survey Point" label "Edit Survey Point"
+#. item "Man Made/Beacon" text "Name"
 #. <key key="man_made" value="survey_point" />
-#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
+#. item "Man Made/Survey Point" text "Name"
 #. <key key="man_made" value="surveillance" />
-#. item "Man Made/Power Station" label "Edit Power Station"
+#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Power Generator" text "Name"
 #. <key key="power" value="station" />
-#. item "Amenities/Fountain" label "Edit Fountain"
+#. item "Man Made/Power Station" text "Name"
 #. <key key="amenity" value="fountain" />
-#. item "Amenities/Drinking Water" label "Edit Drinking Water"
+#. item "Amenities/Fountain" text "Name"
 #. <key key="amenity" value="drinking_water" />
-#. item "Food/Supermarket" label "Edit Supermarket"
+#. item "Amenities/Drinking Water" text "Name"
 #. <key key="shop" value="supermarket" />
-#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. item "Food/Supermarket" text "Name"
 #. <key key="shop" value="convenience" />
-#. item "Food/Kiosk" label "Edit Kiosk"
+#. item "Food/Convenience Store" text "Name"
 #. <key key="shop" value="kiosk" />
-#. item "Food/Butcher" label "Edit Butcher"
+#. item "Food/Kiosk" text "Name"
 #. <key key="shop" value="butcher" />
-#. item "Food/Baker" label "Edit Baker"
+#. item "Food/Butcher" text "Name"
 #. <key key="shop" value="bakery" />
-#. item "Food/Organic" label "Edit Organic Shop"
+#. item "Food/Baker" text "Name"
 #. <key key="shop" value="organic" />
-#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. item "Food/Organic" text "Name"
 #. <key key="shop" value="alcohol" />
-#. item "Food/Beverages" label "Edit Beverages Shop"
+#. item "Food/Alcohol" text "Name"
 #. <key key="shop" value="beverages" />
-#. item "Shops/Chemist" label "Edit Chemist"
+#. item "Food/Beverages" text "Name"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. item "Shops/Chemist" text "Name"
 #. <key key="shop" value="hairdresser" />
-#. item "Shops/Optician" label "Edit Optician"
+#. item "Shops/Hairdresser" text "Name"
 #. <key key="shop" value="optician" />
-#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. item "Shops/Optician" text "Name"
 #. <key key="shop" value="clothes" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. item "Shops/Clothes" text "Name"
 #. <key key="shop" value="shoes" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. item "Shops/Shoes" text "Name"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
+#. item "Shops/Outdoor" text "Name"
 #. <key key="shop" value="sports" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. item "Shops/Sports" text "Name"
 #. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
+#. item "Shops/Dry Cleaning" text "Name"
 #. <key key="shop" value="laundry" />
-#. item "Shops/Tailor" label "Edit Tailor"
+#. item "Shops/Laundry" text "Name"
 #. <key key="shop" value="tailor" />
-#. item "Shops/Computer" label "Edit Computer Shop"
+#. item "Shops/Tailor" text "Name"
 #. <key key="shop" value="computer" />
-#. item "Shops/Electronics" label "Edit Electronics Shop"
+#. item "Shops/Computer" text "Name"
 #. <key key="shop" value="electronics" />
-#. item "Shops/Hifi" label "Edit Hifi Shop"
+#. item "Shops/Electronics" text "Name"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Video" label "Edit Video Shop"
+#. item "Shops/Hifi" text "Name"
 #. <key key="shop" value="video" />
-#. item "Shops/Florist" label "Edit Florist"
+#. item "Shops/Video" text "Name"
 #. <key key="shop" value="florist" />
-#. item "Shops/Garden Centre" label "Edit Garden Centre"
+#. item "Shops/Florist" text "Name"
 #. <key key="shop" value="garden_centre" />
-#. item "Shops/Hardware" label "Edit Hardware Store"
+#. item "Shops/Garden Centre" text "Name"
 #. <key key="shop" value="hardware" />
-#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
+#. item "Shops/Hardware" text "Name"
 #. <key key="shop" value="doityourself" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. item "Shops/Do-it-yourself-store" text "Name"
 #. <key key="shop" value="furniture" />
-#. item "Shops/Stationery" label "Edit Stationery Shop"
+#. item "Shops/Furniture" text "Name"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Book Store" label "Edit Book Store"
+#. item "Shops/Stationery" text "Name"
 #. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. item "Shops/Book Store" text "Name"
 #. <key key="shop" value="travel_agency" />
-#. item "Shops/Toys" label "Edit Toy Shop"
+#. item "Shops/Travel Agency" text "Name"
 #. <key key="shop" value="toys" />
-#. item "Cash/Bank" label "Edit Bank"
+#. item "Shops/Toys" text "Name"
 #. <key key="amenity" value="bank" />
-#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#. item "Cash/Bank" text "Name"
 #. <key key="amenity" value="bureau_de_change" />
-#. item "Health/Doctors" label "Edit Doctors"
+#. item "Cash/Money Exchange" text "Name"
 #. <key key="amenity" value="doctors" />
-#. item "Health/Dentist" label "Edit Dentist"
+#. item "Health/Doctors" text "Name"
 #. <key key="amenity" value="dentist" />
-#. item "Health/Hospital" label "Edit Hospital"
+#. item "Health/Dentist" text "Name"
+#. item "Health/Pharmacy" text "Name"
 #. <key key="amenity" value="hospital" />
-#. item "Health/Veterinary" label "Edit Veterinary"
+#. item "Health/Hospital" text "Name"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. item "Health/Veterinary" text "Name"
 #. <space />
 #. <key key="boundary" value="national" />
-#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. item "Geography/Boundaries/National" text "Name"
 #. <space />
 #. <key key="boundary" value="administrative" />
-#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. item "Geography/Boundaries/Administrative" text "Name"
 #. <space />
 #. <key key="boundary" value="civil" />
-#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. item "Geography/Boundaries/Civil" text "Name"
 #. <space />
 #. <key key="boundary" value="political" />
-#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. item "Geography/Boundaries/Political" text "Name"
 #. <space />
 #. <key key="boundary" value="national_park" />
-#. item "Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National park" text "Name"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Places/Country" label "Edit Country"
+#. item "Places/Continent" text "Name"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Places/State" label "Edit State"
+#. item "Places/Country" text "Name"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Places/Region" label "Edit Region"
+#. item "Places/State" text "Name"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Places/County" label "Edit County"
+#. item "Places/Region" text "Name"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Places/City" label "Edit City"
+#. item "Places/County" text "Name"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Places/Town" label "Edit Town"
+#. item "Places/City" text "Name"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Places/Suburb" label "Edit Suburb"
+#. item "Places/Town" text "Name"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Places/Village" label "Edit Village"
+#. item "Places/Suburb" text "Name"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Village" text "Name"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Places/Locality" label "Edit Locality"
+#. item "Places/Hamlet" text "Name"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Peak" label "Edit Peak"
+#. item "Places/Locality" text "Name"
 #. <key key="natural" value="peak" />
-#. item "Geography/Glacier" label "Edit Glacier"
+#. item "Geography/Peak" text "Name"
 #. <key key="natural" value="glacier" />
-#. item "Geography/Volcano" label "Edit Volcano"
+#. item "Geography/Glacier" text "Name"
 #. <key key="natural" value="volcano" />
-#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. item "Geography/Volcano" text "Name"
 #. <key key="natural" value="cave_entrance" />
-#. item "Geography/Island" label "Edit Island"
+#. item "Geography/Cave Entrance" text "Name"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Islet" label "Edit Islet"
+#. item "Geography/Island" text "Name"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Nature/Tree" label "Edit Tree"
+#. item "Geography/Islet" text "Name"
 #. <key key="natural" value="tree" />
-#. item "Nature/Wood" label "Edit Wood"
+#. item "Nature/Tree" text "Name"
 #. <key key="natural" value="wood" />
-#. item "Nature/Forest" label "Edit Forest Landuse"
+#. item "Nature/Wood" text "Name"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Forest" text "Name"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Nature/Scree" label "Edit Scree"
+#. item "Nature/Nature Reserve" text "Name"
 #. <key key="natural" value="scree" />
-#. item "Nature/Fell" label "Edit Fell"
+#. item "Nature/Scree" text "Name"
 #. <key key="natural" value="fell" />
-#. item "Nature/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" text "Name"
 #. <key key="natural" value="scrub" />
-#. item "Nature/Heath" label "Edit Heath"
+#. item "Nature/Scrub" text "Name"
 #. <key key="natural" value="heath" />
-#. item "Land use/Farmyard" label "Edit Farmyard Landuse"
+#. item "Nature/Heath" text "Name"
 #. <space />
 #. <key key="landuse" value="farmyard" />
-#. item "Land use/Farmland" label "Edit Farmland Landuse"
+#. item "Land use/Farmyard" text "Name"
 #. <space />
 #. <key key="landuse" value="farmland" />
-#. item "Land use/Meadow" label "Edit Meadow Landuse"
+#. item "Land use/Farmland" text "Name"
 #. <space />
 #. <key key="landuse" value="meadow" />
-#. item "Land use/Vineyard" label "Edit Vineyard Landuse"
+#. item "Land use/Meadow" text "Name"
 #. <space />
 #. <key key="landuse" value="vineyard" />
-#. item "Land use/Allotments" label "Edit Allotments Landuse"
+#. item "Land use/Vineyard" text "Name"
 #. <space />
 #. <key key="landuse" value="allotments" />
-#. item "Land use/Garden" label "Edit Garden"
+#. item "Land use/Allotments" text "Name"
 #. <key key="leisure" value="garden" />
-#. item "Land use/Grass" label "Edit Grass Landuse"
+#. item "Land use/Garden" text "Name"
 #. <space />
 #. <key key="landuse" value="grass" />
-#. item "Land use/Village Green" label "Edit Village Green Landuse"
+#. item "Land use/Grass" text "Name"
 #. <space />
 #. <key key="landuse" value="village_green" />
-#. item "Land use/Common" label "Edit Common"
+#. item "Land use/Village Green" text "Name"
 #. <key key="leisure" value="common" />
-#. item "Land use/Park" label "Edit Park"
+#. item "Land use/Common" text "Name"
 #. <key key="leisure" value="park" />
-#. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
+#. item "Land use/Park" text "Name"
 #. <space />
 #. <key key="landuse" value="recreation_ground" />
-#. item "Land use/Residential area" label "Edit Residential Landuse"
+#. item "Land use/Recreation Ground" text "Name"
 #. <space />
 #. <key key="landuse" value="residential" />
-#. item "Land use/Graveyard" label "Edit Graveyard"
+#. item "Land use/Residential area" text "Name"
 #. <key key="amenity" value="grave_yard" />
-#. item "Land use/Cemetery" label "Edit Cemetery Landuse"
+#. item "Land use/Graveyard" text "Name"
 #. <space />
 #. <key key="landuse" value="cemetery" />
-#. item "Land use/Retail" label "Edit Retail Landuse"
+#. item "Land use/Cemetery" text "Name"
 #. <space />
 #. <key key="landuse" value="retail" />
-#. item "Land use/Commercial" label "Edit Commercial Landuse"
+#. item "Land use/Retail" text "Name"
 #. <space />
 #. <key key="landuse" value="commercial" />
-#. item "Land use/Industrial" label "Edit Industrial Landuse"
+#. item "Land use/Commercial" text "Name"
 #. <space />
 #. <key key="landuse" value="industrial" />
-#. item "Land use/Railway land" label "Edit Railway Landuse"
+#. item "Land use/Industrial" text "Name"
 #. <space />
 #. <key key="landuse" value="railway" />
-#. item "Land use/Military" label "Edit Military Landuse"
+#. item "Land use/Railway land" text "Name"
 #. <space />
 #. <key key="landuse" value="military" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. item "Land use/Military" text "Name"
 #. <space />
 #. <key key="landuse" value="construction" />
-#. item "Land use/Brownfield" label "Edit Brownfield Landuse"
+#. item "Land use/Construction area" text "Name"
 #. <space />
 #. <key key="landuse" value="brownfield" />
-#. item "Land use/Greenfield" label "Edit Greenfield Landuse"
+#. item "Land use/Brownfield" text "Name"
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Landfill" label "Edit Landfill Landuse"
+#. item "Land use/Greenfield" text "Name"
 #. <space />
 #. <key key="landuse" value="landfill" />
-#. item "Land use/Quarry" label "Edit Quarry Landuse"
+#. item "Land use/Landfill" text "Name"
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Relations/Multipolygon" label "Edit Multipolygon"
+#. item "Land use/Quarry" text "Name"
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#. item "Relations/Boundary" label "Edit Boundary"
+#. item "Relations/Multipolygon" text "Name"
 #. <key key="type" value="boundary" />
+#. item "Relations/Boundary" text "Name"
 #. <optional>
+#. item "Relations/Turn restriction" text "Name"
+#. item "Relations/Route" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
@@ -7506,144 +7522,144 @@
 #: 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:1348 build/trans_presets.java:1361
-#: build/trans_presets.java:1387 build/trans_presets.java:1402
-#: build/trans_presets.java:1411 build/trans_presets.java:1417
-#: build/trans_presets.java:1425 build/trans_presets.java:1440
-#: build/trans_presets.java:1449 build/trans_presets.java:1459
-#: build/trans_presets.java:1468 build/trans_presets.java:1490
-#: build/trans_presets.java:1498 build/trans_presets.java:1505
-#: build/trans_presets.java:1516 build/trans_presets.java:1526
-#: build/trans_presets.java:1536 build/trans_presets.java:1556
-#: build/trans_presets.java:1568 build/trans_presets.java:1579
-#: build/trans_presets.java:1599 build/trans_presets.java:1608
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1699 build/trans_presets.java:1716
-#: build/trans_presets.java:1733 build/trans_presets.java:1750
-#: build/trans_presets.java:1767 build/trans_presets.java:1785
-#: build/trans_presets.java:1802 build/trans_presets.java:1821
-#: build/trans_presets.java:1842 build/trans_presets.java:1861
-#: build/trans_presets.java:1878 build/trans_presets.java:1897
-#: build/trans_presets.java:1915 build/trans_presets.java:1932
-#: build/trans_presets.java:1949 build/trans_presets.java:1965
-#: build/trans_presets.java:1972 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1993
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-#: build/trans_presets.java:2012 build/trans_presets.java:2020
-#: build/trans_presets.java:2027 build/trans_presets.java:2044
-#: build/trans_presets.java:2052 build/trans_presets.java:2071
-#: build/trans_presets.java:2081 build/trans_presets.java:2093
-#: build/trans_presets.java:2103 build/trans_presets.java:2108
-#: build/trans_presets.java:2116 build/trans_presets.java:2123
-#: build/trans_presets.java:2129 build/trans_presets.java:2135
-#: build/trans_presets.java:2141 build/trans_presets.java:2146
-#: build/trans_presets.java:2151 build/trans_presets.java:2156
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2174 build/trans_presets.java:2183
-#: build/trans_presets.java:2192 build/trans_presets.java:2201
-#: build/trans_presets.java:2210 build/trans_presets.java:2219
-#: build/trans_presets.java:2225 build/trans_presets.java:2233
-#: build/trans_presets.java:2239 build/trans_presets.java:2245
-#: build/trans_presets.java:2251 build/trans_presets.java:2257
-#: build/trans_presets.java:2263 build/trans_presets.java:2269
-#: build/trans_presets.java:2275 build/trans_presets.java:2281
-#: build/trans_presets.java:2287 build/trans_presets.java:2293
-#: build/trans_presets.java:2299 build/trans_presets.java:2305
-#: build/trans_presets.java:2311 build/trans_presets.java:2318
-#: build/trans_presets.java:2327 build/trans_presets.java:2335
-#: build/trans_presets.java:2341 build/trans_presets.java:2347
-#: build/trans_presets.java:2353 build/trans_presets.java:2359
-#: build/trans_presets.java:2365 build/trans_presets.java:2371
-#: build/trans_presets.java:2377 build/trans_presets.java:2383
-#: build/trans_presets.java:2389 build/trans_presets.java:2395
-#: build/trans_presets.java:2401 build/trans_presets.java:2407
-#: build/trans_presets.java:2413 build/trans_presets.java:2419
-#: build/trans_presets.java:2425 build/trans_presets.java:2431
-#: build/trans_presets.java:2437 build/trans_presets.java:2443
-#: build/trans_presets.java:2449 build/trans_presets.java:2457
-#: build/trans_presets.java:2463 build/trans_presets.java:2469
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2488 build/trans_presets.java:2502
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2536 build/trans_presets.java:2543
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2603 build/trans_presets.java:2611
-#: build/trans_presets.java:2621 build/trans_presets.java:2626
-#: build/trans_presets.java:2636 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2682 build/trans_presets.java:2688
-#: build/trans_presets.java:2694 build/trans_presets.java:2705
-#: build/trans_presets.java:2712 build/trans_presets.java:2813
-#: build/trans_presets.java:2820 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2847
-#: build/trans_presets.java:2854 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2920 build/trans_presets.java:2926
-#: build/trans_presets.java:2933 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2953
-#: build/trans_presets.java:2959 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2979
-#: build/trans_presets.java:2986 build/trans_presets.java:2993
-#: build/trans_presets.java:3000 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3055 build/trans_presets.java:3064
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3093 build/trans_presets.java:3100
-#: build/trans_presets.java:3127 build/trans_presets.java:3138
-#: build/trans_presets.java:3144 build/trans_presets.java:3150
-#: build/trans_presets.java:3156 build/trans_presets.java:3162
-#: build/trans_presets.java:3170 build/trans_presets.java:3176
-#: build/trans_presets.java:3182 build/trans_presets.java:3188
-#: build/trans_presets.java:3194 build/trans_presets.java:3201
-#: build/trans_presets.java:3208 build/trans_presets.java:3215
-#: build/trans_presets.java:3221 build/trans_presets.java:3227
-#: build/trans_presets.java:3235 build/trans_presets.java:3243
-#: build/trans_presets.java:3250 build/trans_presets.java:3257
-#: build/trans_presets.java:3264 build/trans_presets.java:3272
-#: build/trans_presets.java:3279 build/trans_presets.java:3288
-#: build/trans_presets.java:3298 build/trans_presets.java:3307
-#: build/trans_presets.java:3313 build/trans_presets.java:3319
-#: build/trans_presets.java:3325 build/trans_presets.java:3330
-#: build/trans_presets.java:3336 build/trans_presets.java:3346
-#: build/trans_presets.java:3352 build/trans_presets.java:3358
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3389 build/trans_presets.java:3395
-#: build/trans_presets.java:3400 build/trans_presets.java:3407
-#: build/trans_presets.java:3414 build/trans_presets.java:3420
-#: build/trans_presets.java:3429 build/trans_presets.java:3437
-#: build/trans_presets.java:3443 build/trans_presets.java:3449
-#: build/trans_presets.java:3456 build/trans_presets.java:3462
+#: build/trans_presets.java:812 build/trans_presets.java:965
+#: build/trans_presets.java:973 build/trans_presets.java:981
+#: build/trans_presets.java:989 build/trans_presets.java:1000
+#: build/trans_presets.java:1009 build/trans_presets.java:1015
+#: build/trans_presets.java:1023 build/trans_presets.java:1030
+#: build/trans_presets.java:1038 build/trans_presets.java:1045
+#: build/trans_presets.java:1050 build/trans_presets.java:1057
+#: build/trans_presets.java:1062 build/trans_presets.java:1068
+#: build/trans_presets.java:1075 build/trans_presets.java:1085
+#: build/trans_presets.java:1091 build/trans_presets.java:1097
+#: build/trans_presets.java:1102 build/trans_presets.java:1108
+#: build/trans_presets.java:1116 build/trans_presets.java:1125
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1155 build/trans_presets.java:1162
+#: build/trans_presets.java:1169 build/trans_presets.java:1266
+#: build/trans_presets.java:1317 build/trans_presets.java:1323
+#: build/trans_presets.java:1329 build/trans_presets.java:1335
+#: build/trans_presets.java:1342 build/trans_presets.java:1348
+#: build/trans_presets.java:1353 build/trans_presets.java:1366
+#: build/trans_presets.java:1392 build/trans_presets.java:1407
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1445
+#: build/trans_presets.java:1454 build/trans_presets.java:1464
+#: build/trans_presets.java:1473 build/trans_presets.java:1495
+#: build/trans_presets.java:1503 build/trans_presets.java:1510
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1541 build/trans_presets.java:1561
+#: build/trans_presets.java:1573 build/trans_presets.java:1584
+#: build/trans_presets.java:1604 build/trans_presets.java:1613
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1705 build/trans_presets.java:1722
+#: build/trans_presets.java:1739 build/trans_presets.java:1756
+#: build/trans_presets.java:1773 build/trans_presets.java:1791
+#: build/trans_presets.java:1808 build/trans_presets.java:1827
+#: build/trans_presets.java:1848 build/trans_presets.java:1867
+#: build/trans_presets.java:1884 build/trans_presets.java:1903
+#: build/trans_presets.java:1921 build/trans_presets.java:1938
+#: build/trans_presets.java:1955 build/trans_presets.java:1971
+#: build/trans_presets.java:1978 build/trans_presets.java:1987
+#: build/trans_presets.java:1994 build/trans_presets.java:2001
+#: build/trans_presets.java:2008 build/trans_presets.java:2014
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2052
+#: build/trans_presets.java:2060 build/trans_presets.java:2079
+#: build/trans_presets.java:2089 build/trans_presets.java:2101
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2125 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2144
+#: build/trans_presets.java:2150 build/trans_presets.java:2155
+#: build/trans_presets.java:2160 build/trans_presets.java:2165
+#: build/trans_presets.java:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2183 build/trans_presets.java:2192
+#: build/trans_presets.java:2201 build/trans_presets.java:2210
+#: build/trans_presets.java:2219 build/trans_presets.java:2228
+#: build/trans_presets.java:2234 build/trans_presets.java:2242
+#: build/trans_presets.java:2248 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:2327
+#: build/trans_presets.java:2336 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:2374 build/trans_presets.java:2380
+#: build/trans_presets.java:2386 build/trans_presets.java:2392
+#: build/trans_presets.java:2398 build/trans_presets.java:2404
+#: build/trans_presets.java:2410 build/trans_presets.java:2416
+#: build/trans_presets.java:2422 build/trans_presets.java:2428
+#: build/trans_presets.java:2434 build/trans_presets.java:2440
+#: build/trans_presets.java:2446 build/trans_presets.java:2452
+#: build/trans_presets.java:2458 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2491
+#: build/trans_presets.java:2497 build/trans_presets.java:2511
+#: build/trans_presets.java:2517 build/trans_presets.java:2523
+#: build/trans_presets.java:2530 build/trans_presets.java:2537
+#: build/trans_presets.java:2545 build/trans_presets.java:2552
+#: build/trans_presets.java:2558 build/trans_presets.java:2565
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2591
+#: build/trans_presets.java:2598 build/trans_presets.java:2605
+#: build/trans_presets.java:2612 build/trans_presets.java:2620
+#: build/trans_presets.java:2630 build/trans_presets.java:2635
+#: build/trans_presets.java:2645 build/trans_presets.java:2650
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2822
+#: build/trans_presets.java:2829 build/trans_presets.java:2842
+#: build/trans_presets.java:2849 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2883
+#: build/trans_presets.java:2889 build/trans_presets.java:2897
+#: 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:2935
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2962
+#: build/trans_presets.java:2968 build/trans_presets.java:2974
+#: build/trans_presets.java:2980 build/trans_presets.java:2988
+#: build/trans_presets.java:2995 build/trans_presets.java:3002
+#: build/trans_presets.java:3009 build/trans_presets.java:3015
+#: build/trans_presets.java:3021 build/trans_presets.java:3027
+#: build/trans_presets.java:3033 build/trans_presets.java:3039
+#: build/trans_presets.java:3064 build/trans_presets.java:3073
+#: build/trans_presets.java:3088 build/trans_presets.java:3094
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3136 build/trans_presets.java:3147
+#: build/trans_presets.java:3153 build/trans_presets.java:3159
+#: build/trans_presets.java:3165 build/trans_presets.java:3171
+#: build/trans_presets.java:3179 build/trans_presets.java:3186
+#: build/trans_presets.java:3193 build/trans_presets.java:3200
+#: build/trans_presets.java:3207 build/trans_presets.java:3215
+#: build/trans_presets.java:3223 build/trans_presets.java:3231
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3254 build/trans_presets.java:3263
+#: build/trans_presets.java:3271 build/trans_presets.java:3279
+#: build/trans_presets.java:3287 build/trans_presets.java:3296
+#: build/trans_presets.java:3304 build/trans_presets.java:3314
+#: build/trans_presets.java:3324 build/trans_presets.java:3333
+#: build/trans_presets.java:3339 build/trans_presets.java:3345
+#: build/trans_presets.java:3351 build/trans_presets.java:3356
+#: build/trans_presets.java:3362 build/trans_presets.java:3372
+#: build/trans_presets.java:3378 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3396
+#: build/trans_presets.java:3402 build/trans_presets.java:3408
+#: build/trans_presets.java:3415 build/trans_presets.java:3421
+#: build/trans_presets.java:3426 build/trans_presets.java:3433
+#: build/trans_presets.java:3440 build/trans_presets.java:3446
+#: build/trans_presets.java:3455 build/trans_presets.java:3463
 #: build/trans_presets.java:3469 build/trans_presets.java:3475
-#: build/trans_presets.java:3481 build/trans_presets.java:3487
-#: build/trans_presets.java:3493 build/trans_presets.java:3540
-#: build/trans_presets.java:3554 build/trans_presets.java:3573
-#: build/trans_presets.java:3587
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3495 build/trans_presets.java:3501
+#: build/trans_presets.java:3507 build/trans_presets.java:3513
+#: build/trans_presets.java:3519 build/trans_presets.java:3566
+#: build/trans_presets.java:3580 build/trans_presets.java:3599
+#: build/trans_presets.java:3613
 msgid "Name"
 msgstr "Nome"
@@ -8108,9 +8124,9 @@
 "L'indirizzo URL per l'interrogazione sui gruppi di modifiche non è valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
 #, java-format
 msgid "This will change {0} object."
@@ -8119,24 +8135,24 @@
 msgstr[1] "Questo modificherà fino a {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
 msgid "An empty value deletes the tag."
 msgstr "Un campo vuoto cancellerà il tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:248
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:301
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:555
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:404
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8145,5 +8161,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
 #, java-format
 msgid "This will change up to {0} object."
@@ -8152,77 +8168,77 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
 msgid "Please select the objects you want to change properties for."
 msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:536
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:537
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:536
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
 msgid "Position"
 msgstr "Posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:946
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:999
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1002
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1068
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
 msgid "Select relation"
 msgstr "Selezionare la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
 msgid "Select relation in main selection."
 msgstr "Selezionare la relazione nella selezione principale"
@@ -8260,5 +8276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1162
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614
 msgid "Conflict in data"
@@ -8319,26 +8335,26 @@
 msgstr "({0}/{1}): Scaricamento relazione ''''{2}''''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:192
 msgid "Tags and Members"
 msgstr "Etichette e Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:202
 msgid "Parent Relations"
 msgstr "Relazioni da cui dipende"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:195
 msgid "Child Relations"
 msgstr "Relazioni figlie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:335
 msgid "Apply Role:"
 msgstr "Applica ruolo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337
 msgid "Enter a role and apply it to the selected relation members"
 msgstr "Inserire un ruolo e applicarlo ai membri della relazione selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:619
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -8351,14 +8367,14 @@
 "circolari?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:626
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:627
 msgid "Remove them, clean up relation"
 msgstr "Rimuovili, ripulisci la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:626
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorali, mantieni la relazione com'è"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661
 #, java-format
 msgid ""
@@ -8371,9 +8387,9 @@
 "aggiungere un altro membro alla relazione?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid "Multiple members referring to same primitive"
 msgstr "Più membri fanno riferimento alla stessa primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:689
 #, java-format
 msgid ""
@@ -8386,5 +8402,5 @@
 "''''{0}'''' omessa.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:730
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -8393,5 +8409,5 @@
 "del primo membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:756
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -8400,5 +8416,5 @@
 "l''ultimo membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -8408,5 +8424,5 @@
 "del primo membro selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -8416,5 +8432,5 @@
 "l''ultimo membro selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
@@ -8422,10 +8438,10 @@
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor delle relazioni: Rimuovi selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid ""
 "Select relation members which refer to primitives in the current selection"
@@ -8434,5 +8450,5 @@
 "selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896
 #, java-format
 msgid ""
@@ -8443,64 +8459,64 @@
 "selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:920
 msgid "Select primitives for selected relation members"
 msgstr "Seleziona le primitive per i membri della relazione selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
 msgid "Sort the relation members"
 msgstr "Ordina i membri della relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:942
 msgid "Sort"
 msgstr "Ordina"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:943
 msgid "Relation Editor: Sort"
 msgstr "Editor delle relazioni: Ordina"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:963
 msgid "Reverse the order of the relation members"
 msgstr "Inverti l''ordine dei membri della relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
 msgid "Reverse"
 msgstr "Inverti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Relation Editor: Reverse"
 msgstr "Editor delle relazioni: Inverti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
 msgid "Move the currently selected members up"
 msgstr "Sposta in alto i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
 msgid "Relation Editor: Move Up"
 msgstr "Editor delle relazioni: Sposta in alto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1005
 msgid "Move the currently selected members down"
 msgstr "Sposta in basso i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 msgid "Relation Editor: Move Down"
 msgstr "Editor delle relazioni: Sposta in basso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1024
 msgid "Remove the currently selected members from this relation"
 msgstr "Rimuovi i membri correntemente selezionati da questa relazione"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
 msgid "Relation Editor: Remove"
 msgstr "Editor delle relazioni: Rimuovi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043
 msgid "Delete the currently edited relation"
 msgstr "Elimina la relazione correntemente modificata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid ""
 "One or more members of this new relation have been deleted while the "
@@ -8512,24 +8528,24 @@
 "era aperto. Sono stati rimossi dalla lista dei membri."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595
 msgid "Yes, create a conflict and close"
 msgstr "Si, crea un conflitto e chiudi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1145
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 "Cliccare per creare un conflitto e chiudere questo editor delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601
 msgid "No, continue editing"
 msgstr "No, continua la modifica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1151
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr "Cliccare per ritornare alla modifica della relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1158
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -8541,5 +8557,5 @@
 "desidera creare un conflitto e chiudere l''editor?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1175
 #, java-format
 msgid ""
@@ -8551,50 +8567,50 @@
 "riprovare.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641
 msgid "Apply the current updates"
 msgstr "Applica gli aggiornamenti correnti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684
 msgid "Apply the updates and close the dialog"
 msgstr "Applica gli aggiornamenti e chiudi la finestra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738
 msgid "Cancel the updates and close the dialog"
 msgstr "Annulla gli aggiornamenti e chiudi la finestra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 msgid "Add an empty tag"
 msgstr "Aggiungi una etichetta vuota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
 msgid "Download all incomplete members"
 msgstr "Scarica tutti i membri incompleti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
 msgid "Relation Editor: Download Members"
 msgstr "Editor delle relazioni: Scarica membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
 msgid "Download selected incomplete members"
 msgstr "Scarica i membri incompleti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
 msgid "Sets a role for the selected members"
 msgstr "Imposta un ruolo ai membri selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1359
 msgid "Apply Role"
 msgstr "Applica Ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373
 #, java-format
 msgid "You are setting an empty role on {0} primitive."
@@ -8603,25 +8619,25 @@
 msgstr[1] "Si sta impostando un ruolo vuoto su {0} primitive."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376
 msgid "This is equal to deleting the roles of these primitives."
 msgstr "Questo equivale all''eliminazione dei ruoli di queste primitive."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1378
 msgid "Do you really want to apply the new role?"
 msgstr "Si desidera veramente applicare il nuovo ruolo?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380
 msgid "Yes, apply it"
 msgstr "Si, applica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1381
 msgid "No, do not apply"
 msgstr "No, non applicare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 msgid "Confirm empty role"
 msgstr "Conferma ruolo vuoto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1455
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -8629,5 +8645,5 @@
 "correntemente selezionato."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1532
 msgid ""
 "Members from paste buffer cannot be added because they are not included in "
@@ -8983,34 +8999,32 @@
 
 #. Strings in JFileChooser
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
 #. <key key="junction" value="roundabout" />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. item "Highways/Streets/Roundabout" combo "Type"
 #. <key key="highway" value="crossing" />
-#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#. 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"
-#. item "Man Made/Power Generator" label "Edit Power Generator"
+#. item "Waypoints/Pedestrian Crossing" combo "Type"
+#. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Water/Water/Wetland" combo "Type"
+#. item "Car/Parking" combo "Type"
+#. item "Motorcycle/Parking" combo "Type"
+#. item "Man Made/Pipeline" combo "Type"
+#. item "Man Made/Surveillance" combo "Type"
 #. <key key="power" value="generator" />
-#. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Nature/Tree" text "Name"
-#. item "Nature/Wood" text "Name"
-#. item "Nature/Forest" text "Name"
+#. item "Man Made/Power Generator" combo "Type"
+#. item "Man Made/Power Tower" combo "Type"
+#. item "Nature/Tree" text "Type"
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: 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:1389
-#: build/trans_presets.java:1461 build/trans_presets.java:2661
-#: build/trans_presets.java:2695 build/trans_presets.java:2704
-#: build/trans_presets.java:2730 build/trans_presets.java:3289
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:1086 build/trans_presets.java:1394
+#: build/trans_presets.java:1466 build/trans_presets.java:2670
+#: build/trans_presets.java:2704 build/trans_presets.java:2713
+#: build/trans_presets.java:2739 build/trans_presets.java:3315
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "Type"
 msgstr "Tipo"
 
-#. item "Ways/Path" combo "Wheelchairs"
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -9033,8 +9047,8 @@
 #: 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:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1396 build/trans_presets.java:2804
-#: build/trans_presets.java:2805 build/trans_presets.java:2806
+#: build/trans_presets.java:691 build/trans_presets.java:1297
+#: build/trans_presets.java:1399 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:2813
+#: build/trans_presets.java:2814 build/trans_presets.java:2815
 msgid "unknown"
 msgstr "sconosciuto"
@@ -9694,7 +9708,9 @@
 msgstr "Seleziona il nome del file"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -9898,41 +9914,43 @@
 msgstr "Caricamento e/o salvataggio incompleto"
 
-#. item "Highways/Streets/Motorway" text "Name"
-#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
+#. item "Highways/Streets/Motorway" combo "Layer"
 #. <space />
 #. <key key="highway" value="motorway_link" />
 #. <optional>
-#. item "Highways/Streets/Trunk" text "Name"
-#. item "Highways/Streets/Trunk Link" text "Reference"
+#. item "Highways/Streets/Motorway Link" combo "Layer"
+#. item "Highways/Streets/Trunk" combo "Layer"
 #. <optional>
-#. item "Highways/Streets/Primary" text "Name"
-#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
+#. item "Highways/Streets/Trunk Link" combo "Layer"
+#. item "Highways/Streets/Primary" combo "Layer"
 #. <space />
 #. <key key="highway" value="primary_link" />
 #. <optional>
-#. item "Highways/Streets/Secondary" text "Name"
-#. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Passing Places"
-#. item "Highways/Streets/Residential" check "Embankment"
-#. item "Highways/Streets/Living Street" check "Embankment"
-#. item "Highways/Streets/Pedestrian" check "Embankment"
-#. item "Highways/Streets/Service" check "Passing Places"
-#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
-#. item "Highways/Streets/Construction" check "Embankment"
-#. item "Highways/Streets/Roundabout" check "Embankment"
-#. item "Highways/Streets/Bridge" text "Name"
-#. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Dedicated Bridleway" check "Embankment"
-#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Steps" check "Embankment"
-#. item "Water/Water/Drain" text "Name"
-#. item "Water/Water/Ditch" text "Name"
-#. item "Water/Water/Stream" text "Name"
-#. item "Water/Water/Canal" text "Name"
-#. item "Water/Water/River" text "Name"
-#. item "Transport/Railway/Bus Guideway" check "Embankment"
+#. item "Highways/Streets/Primary Link" combo "Layer"
+#. item "Highways/Streets/Secondary" combo "Layer"
+#. item "Highways/Streets/Tertiary" combo "Layer"
+#. item "Highways/Streets/Unclassified" combo "Layer"
+#. item "Highways/Streets/Residential" combo "Layer"
+#. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Pedestrian" combo "Layer"
+#. item "Highways/Streets/Service" combo "Layer"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Highways/Streets/Roundabout" combo "Layer"
+#. item "Highways/Streets/Bridge" combo "Layer"
+#. item "Highways/Streets/Tunnel" combo "Layer"
+#. item "Ways/Track" combo "Layer"
+#. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
+#. item "Water/Water/Drain" combo "Layer"
+#. item "Water/Water/Ditch" combo "Layer"
+#. item "Water/Water/Stream" combo "Layer"
+#. item "Water/Water/Canal" combo "Layer"
+#. item "Water/Water/River" combo "Layer"
+#. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
 #: build/trans_presets.java:89 build/trans_presets.java:106
@@ -9949,7 +9967,7 @@
 #: 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
+#: build/trans_presets.java:966 build/trans_presets.java:974
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:1001 build/trans_presets.java:1272
 msgid "Layer"
 msgstr "Layer"
@@ -10489,8 +10507,8 @@
 msgstr[1] "{0} tracciati"
 
-#. item "Relations/Route" text "Symbol description"
+#. item "Relations/Route" text "Description"
 #: ../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:3590
+#: build/trans_presets.java:3616
 msgid "Description"
 msgstr "Descrizione"
@@ -12411,28 +12429,71 @@
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
 
-#. item "Aerialway/Goods" text "Name"
 #. <separator/>
+#. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1357
 msgid "Car"
 msgstr "Automobile"
 
-#. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Cattle Grid" check "Foot"
-#. item "Barriers/Spikes" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
-#. item "Barriers/Gate" check "Foot"
-#. item "Barriers/Lift Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Turnstile" check "Foot"
-#. item "Barriers/Sally Port" check "Foot"
-#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
-#. item "Public Transport/Subway Entrance" check "Wheelchair"
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Barriers/Bollard" check "Bicycle"
+#. item "Barriers/Cattle Grid" check "Bicycle"
+#. item "Barriers/Spikes" check "Bicycle"
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
+#. item "Barriers/Gate" check "Bicycle"
+#. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#. item "Barriers/Stile" check "Bicycle"
+#. item "Barriers/Turnstile" check "Bicycle"
+#. item "Barriers/Sally Port" check "Bicycle"
+#. group "Bicycle"
+#. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:768 build/trans_presets.java:787
+#: 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:921
+#: build/trans_presets.java:931 build/trans_presets.java:940
+#: build/trans_presets.java:949 build/trans_presets.java:1490
+#: build/trans_presets.java:1563
+msgid "Bicycle"
+msgstr "Bicicletta"
+
+#. item "Highways/Streets/Road Restrictions" combo "Foot"
+#. item "Ways/Path" combo "Foot"
+#. <space />
+#. item "Barriers/Bollard" check "Foot"
+#. <space />
+#. item "Barriers/Cattle Grid" check "Foot"
+#. <space />
+#. item "Barriers/Spikes" check "Foot"
+#. <space />
+#. item "Barriers/Border Control" check "Foot"
+#. <space />
+#. item "Barriers/Entrance" check "Foot"
+#. <space />
+#. item "Barriers/Gate" check "Foot"
+#. <space />
+#. item "Barriers/Lift Gate" check "Foot"
+#. <space />
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. <space />
+#. item "Barriers/Bump Gate" check "Foot"
+#. <space />
+#. item "Barriers/Kissing Gate" check "Foot"
+#. <space />
+#. item "Barriers/Stile" check "Foot"
+#. <space />
+#. item "Barriers/Turnstile" check "Foot"
+#. <space />
+#. item "Barriers/Sally Port" check "Foot"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:389 build/trans_presets.java:497
 #: build/trans_presets.java:767 build/trans_presets.java:786
 #: build/trans_presets.java:800 build/trans_presets.java:822
@@ -12441,45 +12502,5 @@
 #: 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:1485
-#: build/trans_presets.java:1558
-msgid "Bicycle"
-msgstr "Bicicletta"
-
-#. item "Ways/Path" check "Oneway"
-#. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Cattle Grid" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Spikes" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Lift Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Bump Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Turnstile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
-#. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: 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
+#: build/trans_presets.java:948
 msgid "Foot"
 msgstr "Pedone"
@@ -13255,4 +13276,6 @@
 msgid "Internal style to be used as base for runtime switchable overlay styles"
 msgstr ""
+"Stile interno da utilizzare come base per gli stili di copertura "
+"intercambiabili a runtime"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
@@ -13709,5 +13732,5 @@
 msgstr "multiplo"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:500
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:501
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -13724,5 +13747,5 @@
 msgstr "Aggiungi una nuova etichetta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13733,49 +13756,49 @@
 "display_values deve essere lo stesso di values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Ulteriori informazioni su questa caratteristica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Requisito sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Ruoli disponibili"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "conteggio"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "elementi"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Attributi opzionali:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Elemento ruolo preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "Sotto-elemento preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13785,15 +13808,19 @@
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Impossibile leggere {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Sono supportati elementi di tipo {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:954
+msgid "Add relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:975
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13803,17 +13830,22 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:978
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
 msgid "Apply Preset"
 msgstr "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
+msgid "New relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1078
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -14984,5 +15016,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114
 msgid "Reading error text failed."
-msgstr ""
+msgstr "Fallita la lettura del testo dell''errore."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
@@ -16064,5 +16096,5 @@
 msgstr "Carica tracciati"
 
-#. item "Ways/Path" combo "MTB Scale"
+#. item "Ways/Path" combo "Visibility"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 #: build/trans_presets.java:491
@@ -16203,8 +16235,9 @@
 
 #. </optional>
+#. item "Annotation/Address Interpolation"
 #: ../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:3512
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1202
+#: build/trans_presets.java:3538
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -16281,34 +16314,34 @@
 msgstr "Converti percorso in numeri civici indipendenti."
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:308
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "Assocerà {0} nodi supplementari per i numeri civici"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:460
 msgid "City:"
 msgstr "Città:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:461
 msgid "State:"
 msgstr "Regione:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:462
 msgid "Post Code:"
 msgstr "Codice postale:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:463
 msgid "Country:"
 msgstr "Nazione:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:464
 msgid "Full Address:"
 msgstr "Indirizzo completo:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:499
 msgid "Optional Information:"
 msgstr "Informazioni aggiuntive:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:684
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
@@ -16316,34 +16349,34 @@
 "indirizzi"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:697
 msgid "Please select address interpolation way for this street"
 msgstr ""
 "Selezionare un percorso di interpolazione degli indirizzi per questa strada"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1084
 msgid "Expected odd numbers for addresses"
 msgstr "Erano attesi numeri dispari per gli indirizzi"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1089
 msgid "Expected even numbers for addresses"
 msgstr "Erano attesi numeri pari per gli indirizzi"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1099
 msgid "Expected valid number for address increment"
 msgstr "Era atteso un numero valido per l''incremento dell''indirizzo"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1112
 msgid "Country code must be 2 letters"
 msgstr "Il codice della nazione deve essere composto da 2 lettere"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1284
 msgid "Please enter valid number for starting and ending address"
 msgstr "Inserire un numero valido per l''indirizzo iniziale e finale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1302
 msgid "Alphabetic address must end with a letter"
 msgstr "Un indirizzo alfabetico deve terminare con una lettera"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
@@ -16351,26 +16384,26 @@
 "alfabetici"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1323
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 "La lettera iniziale dell''indirizzo deve essere minore di quella finale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1339
 msgid "Please enter valid number for starting address"
 msgstr "Inserire un numero valido per l''indirizzo iniziale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1342
 msgid "Please enter valid number for ending address"
 msgstr "Inserire un numero valido per l''indirizzo finale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1349
 msgid "Starting address number must be less than ending address number"
 msgstr "Il numero iniziale dell''indirizzo deve essere minore di quello finale"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:32
 msgid "Align Way Segments"
 msgstr "Allinea i segmenti del percorso"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:33
 msgid ""
 "Makes a pair of selected way segments parallel by rotating one of them "
@@ -16380,9 +16413,9 @@
 "di loro attorno ad un punto scelto."
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
 msgid "Align Ways"
 msgstr "Allinea percorsi"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:77
 msgid ""
 "Please select two segments that don''t share any nodes\n"
@@ -16392,14 +16425,14 @@
 " oppure stabilire come perno il nodo comune.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:79
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:90
 msgid "AlignWayS: Alignment not possible"
 msgstr "AlignWayS: Allineamento non possibile"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:89
 msgid "Aligning would result nodes outside the world.\n"
 msgstr "L''allineamento posizionerebbe i nodi al di fuori del pianeta.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
 msgid "I''m ready!"
 msgstr "Sono pronto!"
@@ -16407,5 +16440,5 @@
 #. 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
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "AlignWays Tips"
 msgstr "Suggerimenti AlignWays"
@@ -16733,8 +16766,8 @@
 msgstr "Strumento per etichettare l''indirizzo"
 
-#. group "Man-Made"
+#. group "Man-Made/Buildings"
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2503
 msgid "Buildings"
 msgstr "Edifici"
@@ -16938,6 +16971,4 @@
 "\"addr:street\" sugli elementi)."
 
-#. item "Man Made/Pipeline" combo "Type"
-#. color highway_track
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16949,5 +16980,5 @@
 #. <rule>
 #. <condition k="waterway" v="river"/>
-#. color riverbank
+#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16957,5 +16988,5 @@
 #. <rule>
 #. <condition k="waterway" v="canal"/>
-#. color stream
+#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16972,5 +17003,5 @@
 #. <rule>
 #. <condition k="waterway" v="drain"/>
-#. color marsh
+#. color water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16988,7 +17019,8 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
+#. color water
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2661 build/trans_style.java:1018
+#: build/trans_presets.java:2670 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3557
@@ -17009,5 +17041,4 @@
 msgstr "appezzamento numero"
 
-#. color area
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17051,4 +17082,5 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
+#. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
 #: build/trans_style.java:4425 build/trans_style.java:4432
@@ -17784,5 +17816,5 @@
 msgstr "Non è stato trovato alcun livello dei dati GPX."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
 msgid "Child script have returned invalid data."
 msgstr "Lo script figlio riporta dati non validi"
@@ -18051,4 +18083,21 @@
 msgid "Load set of images as a new layer."
 msgstr "Carica le immagini come un nuovo layer."
+
+#: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:56
+msgid ""
+"This option creates IRS adjustment layer and a little way inside it. You "
+"need to adjust WMS layer placement first.\n"
+"Resulting layer is to be saved as .osm and sent to Komzpa (me@komzpa.net) "
+"with [irs rectify] in subject."
+msgstr ""
+
+#: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
+msgid "Zoom level was not enough to record an offset precisely"
+msgstr ""
+
+#. if there are none, create one
+#: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
+msgid "IRS Adjustment Layer"
+msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18966,7 +19015,7 @@
 msgstr "Fermate GTFS"
 
-#. item "Bicycle/Rental" text "Name"
+#. group "Public Transport"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1513
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
@@ -19010,6 +19059,6 @@
 msgstr "Tracciati"
 
-#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
+#. group "Waypoints"
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
 #: build/trans_presets.java:632
@@ -19670,13 +19719,4 @@
 msgid "Terrace"
 msgstr "Complesso"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202
-msgid "Edit OpenSeaMap"
-msgstr "Modifica OpenSeaMap"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204
-msgid "Seamark Editor"
-msgstr "Editor delle caratteristiche nautiche"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20861,7 +20901,7 @@
 msgstr "Nodi dei percorsi duplicati."
 
-#. group "Relations"
+#. item "Relations/Multipolygon"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3533
+#: build/trans_presets.java:3559
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -21405,5 +21445,4 @@
 msgstr "corso d''acqua di tipo {0}"
 
-#. color building
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21412,4 +21451,5 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
+#. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
 #: build/trans_style.java:4404
@@ -22144,4 +22184,6 @@
 "You should update the plugins."
 msgstr ""
+"{0} funzionerà ma per questa estensione il controllo remoto è disabilitato.\n"
+"Si dovrebbero aggiornare le estensioni."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
@@ -22152,4 +22194,8 @@
 "If updating the plugins does not help report a bug for \"{0}\"."
 msgstr ""
+"Versione corrente di \"{1}\": {2}, versione interna {3}. Versione richiesta "
+"{4}, versione interna {5}.\n"
+"Se l''aggiornamento delle estensioni non risolve il problema si prega di "
+"segnalarlo per \"{0}\"."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
@@ -22284,5 +22330,4 @@
 
 #. Landuse type used in multipolygons
-#. color basin
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -22292,4 +22337,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
+#. color forest
 #: build/specialmessages.java:15 build/trans_style.java:3293
 msgid "forest"
@@ -22699,11 +22745,16 @@
 "del percorso corrisponde al nome del file di un'immagine."
 
+#. Plugin irsrectify
+#: build/trans_plugins.java:36
+msgid "A helper for IRS satellite adjustment."
+msgstr ""
+
 #. Plugin lakewalker
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:38
 msgid "Helps vectorizing WMS images."
 msgstr "Aiuta nella vettorizzazione delle immagini WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:40
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22713,5 +22764,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22725,15 +22776,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Aggiunge divieti di svolta a sinistra per insiemi di 4 o 5 percorsi"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:46
 msgid "Simply convert an area to a multipolygon."
 msgstr "Converti semplicemente un''area in un multi-poligono."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22744,5 +22795,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22756,20 +22807,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "extended options for editing opening_hours"
 msgstr "opzioni avanzate per la modifica degli orari di apertura"
 
 #. Plugin openlayers
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Displays an OpenLayers background image"
 msgstr "Visualizza una immagine di sfondo OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importa le segnalazioni da OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22779,5 +22830,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22787,5 +22838,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22796,5 +22847,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22805,10 +22856,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22818,15 +22869,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid "Plugin for reverting changesets"
 msgstr "Estensione per il ripristino dei gruppi di modifiche"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22840,5 +22891,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22850,10 +22901,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22865,5 +22916,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22874,15 +22925,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22896,15 +22947,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
 
 #. Plugin toms
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Crea e modifica le caratteristiche nautiche per OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22916,5 +22967,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22925,5 +22976,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22934,10 +22985,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid "Allows undeleting object from OSM database"
 msgstr "Permette di ripristinare un oggetto dal database di OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22949,5 +23000,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22960,5 +23011,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22970,5 +23021,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22976,15 +23027,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Abilita la ricerca di un punto del percorso importato da un file gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Seleziona una sequenza di percorsi connessi non ramificati"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22995,5 +23046,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:116
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23051,5 +23102,5 @@
 #. count: how often can the role occur (if not given unlimited number is assumed)
 #. type: the data types - way,node,relation,closedway (separated by comma)
-#. For external files the <annotations> should have following elements:
+#. For external files the <presets> should have following elements:
 #. - author           the author of the preset
 #. - version          a version number of some sort (e.g. creation date)
@@ -23061,5 +23112,5 @@
 #. The fields "name", "text", "display_values" may also be localized (e.g. de.name).
 #. When translations of equal words but different meanings may conflict, a translation
-#. context should be specified. Use "name_conext", "text_context" or "values_context"
+#. context should be specified. Use "name_context", "text_context" or "values_context"
 #. for this. The context should be a meaningful short description to help translators.
 #. In JOSM internally all "name", "text" and "display_values" are translated when
@@ -23067,84 +23118,70 @@
 #. are supplied, then "values" will be treated as "display_values" and translated instead.
 #. -->
-#. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
+#. unparsed line <presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
+#. group "Highways"
 #: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Strade"
 
-#. group "Highways"
+#. group "Highways/Streets"
 #: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Strade"
 
-#. group "Highways/Streets"
-#. <button label="Exit" hotkey="E">
+#. item "Highways/Streets/Motorway"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
+#. <button label="Motorway" hotkey="1">
 #: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autostrada/tangenziale"
 
-#. item "Highways/Streets/Motorway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
+#. item "Highways/Streets/Motorway" label "Edit Motorway"
 #: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Modifica autostrada/tangenziale"
 
-#. item "Highways/Streets/Motorway" label "Edit Motorway"
 #. <space />
 #. <key key="highway" value="motorway" />
-#. item "Highways/Streets/Trunk" label "Edit Trunk"
+#. item "Highways/Streets/Motorway" text "Reference"
 #. <space />
 #. <key key="highway" value="trunk" />
-#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
+#. item "Highways/Streets/Trunk" text "Reference"
 #. <space />
 #. <key key="highway" value="trunk_link" />
-#. item "Highways/Streets/Primary" label "Edit Primary Road"
+#. item "Highways/Streets/Trunk Link" text "Reference"
 #. <space />
 #. <key key="highway" value="primary" />
-#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
+#. item "Highways/Streets/Primary" text "Reference"
 #. <space />
 #. <key key="highway" value="secondary" />
-#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
+#. item "Highways/Streets/Secondary" text "Reference"
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Airport/Runway" label "Edit Runway"
+#. item "Highways/Streets/Tertiary" text "Reference"
 #. <key key="aeroway" value="runway" />
 #. <optional>
-#. item "Airport/Taxiway" label "Edit Taxiway"
+#. item "Airport/Runway" text "Reference"
 #. <key key="aeroway" value="taxiway" />
 #. <optional>
-#. item "Airport/Helipad" label "Edit Helipad"
+#. item "Airport/Taxiway" text "Reference"
 #. <key key="aeroway" value="helipad" />
 #. <optional>
-#. item "Airport/Gate" label "Edit Terminal Gate"
+#. item "Airport/Helipad" text "Reference"
 #. <key key="aeroway" value="gate" />
-#. item "Man Made/Power Station" text "Operator"
-#. item "Relations/Route" text "Name"
+#. item "Airport/Gate" text "Reference"
+#. item "Man Made/Power Station" text "Reference"
+#. item "Relations/Route" text "Reference"
 #: 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:1620 build/trans_presets.java:1628
-#: build/trans_presets.java:1636 build/trans_presets.java:1670
-#: build/trans_presets.java:2714 build/trans_presets.java:3588
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1676
+#: build/trans_presets.java:2723 build/trans_presets.java:3614
 msgid "Reference"
 msgstr "Riferimento"
-
-#. item "Highways/Streets/Motorway" combo "Layer"
-#. item "Highways/Streets/Motorway Link" combo "Layer"
-#. item "Highways/Streets/Trunk" combo "Layer"
-#. item "Highways/Streets/Trunk Link" combo "Layer"
-#. item "Highways/Streets/Primary" combo "Layer"
-#. item "Highways/Streets/Primary Link" combo "Layer"
-#. item "Highways/Streets/Secondary" combo "Layer"
-#. item "Highways/Streets/Roundabout" 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:421
-msgid "Lanes"
-msgstr "Corsie"
 
 #. item "Highways/Streets/Motorway" combo "Lanes"
@@ -23155,10 +23192,30 @@
 #. item "Highways/Streets/Primary Link" combo "Lanes"
 #. item "Highways/Streets/Secondary" combo "Lanes"
-#. item "Highways/Streets/Tertiary" combo "Layer"
-#. item "Highways/Streets/Unclassified" combo "Layer"
-#. item "Highways/Streets/Bridge" combo "Layer"
-#. item "Highways/Streets/Tunnel" combo "Layer"
-#. item "Ways/Path" combo "Layer"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
+#. item "Highways/Streets/Roundabout" combo "Lanes"
+#: 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 "Corsie"
+
+#. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
+#. item "Highways/Streets/Motorway Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Secondary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Tertiary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
+#. item "Highways/Streets/Service" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
+#. item "Ways/Path" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
+#. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #: build/trans_presets.java:91 build/trans_presets.java:108
 #: build/trans_presets.java:127 build/trans_presets.java:146
@@ -23169,36 +23226,41 @@
 #: 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
+#: build/trans_presets.java:524 build/trans_presets.java:1274
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
 
-#. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
-#. item "Highways/Streets/Motorway Link" text "Max. speed (km/h)"
-#. item "Highways/Streets/Trunk" text "Max. speed (km/h)"
-#. item "Highways/Streets/Trunk Link" text "Max. speed (km/h)"
-#. item "Highways/Streets/Primary" text "Max. speed (km/h)"
-#. item "Highways/Streets/Primary Link" text "Max. speed (km/h)"
-#. item "Highways/Streets/Secondary" text "Max. speed (km/h)"
-#. item "Highways/Streets/Tertiary" text "Max. speed (km/h)"
-#. item "Highways/Streets/Unclassified" text "Name"
-#. item "Highways/Streets/Residential" text "Name"
+#. item "Highways/Streets/Motorway" check "Oneway"
+#. item "Highways/Streets/Motorway Link" check "Oneway"
+#. item "Highways/Streets/Trunk" check "Oneway"
+#. item "Highways/Streets/Trunk Link" check "Oneway"
+#. item "Highways/Streets/Primary" check "Oneway"
+#. item "Highways/Streets/Primary Link" check "Oneway"
+#. item "Highways/Streets/Secondary" check "Oneway"
+#. item "Highways/Streets/Tertiary" check "Oneway"
+#. item "Highways/Streets/Unclassified" check "Oneway"
 #. <optional>
-#. item "Highways/Streets/Living Street" text "Name"
+#. item "Highways/Streets/Residential" check "Oneway"
 #. <optional>
-#. item "Highways/Streets/Pedestrian" text "Name"
+#. item "Highways/Streets/Living Street" check "Oneway"
 #. <optional>
-#. item "Highways/Streets/Service" text "Name"
-#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
+#. item "Highways/Streets/Pedestrian" check "Oneway"
+#. item "Highways/Streets/Service" check "Oneway"
 #. <space />
 #. <key key="highway" value="service" />
 #. <key key="service" value="parking_aisle" />
 #. <optional>
-#. item "Highways/Streets/Road (Unknown Type)" text "Name"
-#. item "Highways/Streets/Construction" text "Name"
-#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Track" check "Embankment"
-#. item "Ways/Path" check "Embankment"
-#. item "Transport/Railway/Bus Guideway" text "Name"
+#. item "Highways/Streets/Parking Aisle" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
+#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#. item "Highways/Streets/Roundabout" check "Oneway"
+#. item "Ways/Track" check "Oneway"
+#. item "Ways/Path" check "Oneway"
+#. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Dedicated Cycleway" check "Oneway"
+#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
+#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
+#. item "Ways/Steps" check "Oneway"
+#. item "Transport/Railway/Bus Guideway" check "Oneway"
 #: build/trans_presets.java:92 build/trans_presets.java:109
 #: build/trans_presets.java:128 build/trans_presets.java:147
@@ -23213,55 +23275,7 @@
 #: 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
+#: build/trans_presets.java:621 build/trans_presets.java:1267
 msgid "Oneway"
 msgstr "Senso unico"
-
-#. item "Highways/Streets/Motorway" check "Oneway"
-#. item "Highways/Streets/Motorway Link" check "Oneway"
-#. item "Highways/Streets/Trunk" check "Motorroad"
-#. item "Highways/Streets/Trunk Link" check "Motorroad"
-#. item "Highways/Streets/Primary" check "Motorroad"
-#. item "Highways/Streets/Primary Link" check "Motorroad"
-#. item "Highways/Streets/Secondary" check "Oneway"
-#. item "Highways/Streets/Tertiary" check "Oneway"
-#. item "Highways/Streets/Unclassified" check "Oneway"
-#. item "Highways/Streets/Residential" check "Oneway"
-#. item "Highways/Streets/Living Street" check "Oneway"
-#. item "Highways/Streets/Pedestrian" check "Oneway"
-#. item "Highways/Streets/Service" check "Oneway"
-#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
-#. item "Highways/Streets/Construction" check "Oneway"
-#. item "Highways/Streets/Roundabout" check "Oneway"
-#. item "Highways/Streets/Roundabout" text "Width (meters)"
-#. </optional>
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Dedicated Bridleway" check "Oneway"
-#. item "Ways/Dedicated Cycleway" check "Oneway"
-#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
-#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Steps" check "Oneway"
-#. item "Transport/Railway/Bus Guideway" check "Oneway"
-#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
-#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
-#. <action class="SetWaypointAction" params="tunnel start"/>
-#. <!--action class="ConsolePrinterAction" params="tunnel start,tunnel"/-->
-#. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
-#. </button>
-#: 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"
-msgstr "Ponte"
 
 #. item "Highways/Streets/Motorway" check "Bridge"
@@ -23281,6 +23295,6 @@
 #. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
-#. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -23292,19 +23306,26 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: 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 "Galleria/tunnel"
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="tunnel start"/>
+#. <!--action class="ConsolePrinterAction" params="tunnel start,tunnel"/-->
+#. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
+#. </button>
+#. <button label="Bridge" hotkey="B" type="toggle">
+#: 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:1268
+#: build/trans_surveyor.java:12
+msgid "Bridge"
+msgstr "Ponte"
 
 #. item "Highways/Streets/Motorway" check "Tunnel"
@@ -23324,4 +23345,6 @@
 #. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
+#. </optional>
+#. item "Highways/Streets/Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -23333,19 +23356,19 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: 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 "Sbancamento"
+#: 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:1269
+msgid "Tunnel"
+msgstr "Galleria/tunnel"
 
 #. item "Highways/Streets/Motorway" check "Cutting"
@@ -23374,4 +23397,45 @@
 #. 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:1270
+msgid "Cutting"
+msgstr "Sbancamento"
+
+#. item "Highways/Streets/Motorway" check "Embankment"
+#. item "Highways/Streets/Motorway Link" check "Embankment"
+#. item "Highways/Streets/Trunk" check "Embankment"
+#. item "Highways/Streets/Trunk Link" check "Embankment"
+#. item "Highways/Streets/Primary" check "Embankment"
+#. item "Highways/Streets/Primary Link" check "Embankment"
+#. item "Highways/Streets/Secondary" check "Embankment"
+#. item "Highways/Streets/Tertiary" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Residential" check "Embankment"
+#. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Pedestrian" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
+#. item "Highways/Streets/Roundabout" check "Embankment"
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Ways/Dedicated Bridleway" check "Embankment"
+#. item "Ways/Dedicated Cycleway" check "Embankment"
+#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#. item "Ways/Steps" check "Embankment"
+#. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: build/trans_presets.java:96 build/trans_presets.java:113
 #: build/trans_presets.java:133 build/trans_presets.java:152
@@ -23386,38 +23450,38 @@
 #: 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
+#: build/trans_presets.java:1271
 msgid "Embankment"
 msgstr "Terrapieno"
 
-#. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Motorway Link"
 #: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Collegamento autostradale"
 
-#. item "Highways/Streets/Motorway Link"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
+#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
 #: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Modifica collegamento autostradale"
 
-#. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Trunk"
 #: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Trunk"
 
-#. item "Highways/Streets/Trunk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
+#. item "Highways/Streets/Trunk" label "Edit Trunk"
 #: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Modifica Trunk"
 
-#. item "Highways/Streets/Trunk" check "Oneway"
-#. item "Highways/Streets/Trunk Link" check "Oneway"
-#. item "Highways/Streets/Primary" check "Oneway"
-#. item "Highways/Streets/Primary Link" check "Oneway"
+#. item "Highways/Streets/Trunk" check "Motorroad"
+#. item "Highways/Streets/Trunk Link" check "Motorroad"
+#. item "Highways/Streets/Primary" check "Motorroad"
+#. item "Highways/Streets/Primary Link" check "Motorroad"
 #: build/trans_presets.java:129 build/trans_presets.java:148
 #: build/trans_presets.java:169 build/trans_presets.java:185
@@ -23425,100 +23489,100 @@
 msgstr "Superstrada"
 
-#. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Trunk Link"
 #: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Trunk Link"
 
-#. item "Highways/Streets/Trunk Link"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
+#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
 #: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Modifica Trunk Link"
 
-#. item "Highways/Streets/Trunk Link" check "Embankment"
 #. </optional>
 #. <separator/>
-#. <button label="Motorway" hotkey="1">
+#. item "Highways/Streets/Primary"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
+#. <button label="Primary" hotkey="2">
 #: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primaria"
 
-#. item "Highways/Streets/Primary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
+#. item "Highways/Streets/Primary" label "Edit Primary Road"
 #: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Modifica strada primaria"
 
-#. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Primary Link"
 #: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Svincolo primario"
 
-#. item "Highways/Streets/Primary Link"
+#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
 #: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Modifica svincolo primario"
 
-#. item "Highways/Streets/Primary Link" check "Embankment"
 #. </optional>
-#. <button label="Primary" hotkey="2">
+#. item "Highways/Streets/Secondary"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
+#. <button label="Secondary" hotkey="3">
 #: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondaria"
 
-#. item "Highways/Streets/Secondary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
+#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
 #: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Modifica strada secondaria"
 
-#. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
+#. item "Highways/Streets/Tertiary"
 #: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Terziaria"
 
-#. item "Highways/Streets/Tertiary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
+#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
 #: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Modifica strada terziaria"
 
-#. item "Highways/Streets/Tertiary" check "Embankment"
 #. </optional>
-#. <button label="Secondary" hotkey="3">
+#. item "Highways/Streets/Unclassified"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
+#. <button label="Unclassified" hotkey="4">
 #: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#. item "Highways/Streets/Unclassified"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
+#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
 #: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Modifica una strada unclassified"
 
-#. item "Highways/Streets/Unclassified" check "Embankment"
-#. item "Highways/Streets/Service" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
-#. item "Ways/Dedicated Footway" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
+#. item "Highways/Streets/Service" check "Passing Places"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #: build/trans_presets.java:245 build/trans_presets.java:319
 #: build/trans_presets.java:588 build/trans_presets.java:606
@@ -23526,21 +23590,25 @@
 msgstr "Slarghi per l''incrocio"
 
-#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
-#. item "Highways/Streets/Service" text "Max. speed (km/h)"
-#. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
-#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
-#. item "Highways/Streets/Roundabout" combo "Lanes"
-#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Path" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
-#. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
-#. item "Public Transport/Railway Platform" text "Reference (track number)"
-#. item "Public Transport/Bus Platform" text "Reference (track number)"
+#. item "Highways/Streets/Unclassified" text "Width (meters)"
+#. item "Highways/Streets/Residential" text "Width (meters)"
+#. item "Highways/Streets/Living Street" text "Width (meters)"
+#. item "Highways/Streets/Pedestrian" text "Width (meters)"
+#. item "Highways/Streets/Service" text "Width (meters)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. item "Highways/Streets/Roundabout" text "Width (meters)"
+#. item "Highways/Streets/Bridge" text "Width (meters)"
+#. item "Highways/Streets/Tunnel" text "Width (meters)"
+#. item "Ways/Track" text "Width (meters)"
+#. item "Ways/Path" text "Width (meters)"
+#. item "Ways/Dedicated Bridleway" text "Width (meters)"
+#. item "Ways/Dedicated Cycleway" text "Width (meters)"
+#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
+#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
+#. item "Ways/Dedicated Footway" text "Width (meters)"
+#. item "Ways/Steps" text "Width (meters)"
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. item "Public Transport/Railway Platform" text "Width (meters)"
+#. item "Public Transport/Bus Platform" text "Width (meters)"
 #: build/trans_presets.java:248 build/trans_presets.java:266
 #: build/trans_presets.java:284 build/trans_presets.java:302
@@ -23552,50 +23620,25 @@
 #: 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:1546
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1275 build/trans_presets.java:1551
+#: build/trans_presets.java:1596
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
 
-#. item "Highways/Streets/Unclassified" text "Width (meters)"
 #. </optional>
-#. <button label="Unclassified" hotkey="4">
+#. item "Highways/Streets/Residential"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
+#. <button label="Residential" hotkey="5">
 #: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Strada residenziale"
 
-#. item "Highways/Streets/Residential"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
+#. item "Highways/Streets/Residential" label "Edit Residential Street"
 #: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Modifica strada residenziale"
-
-#. item "Highways/Streets/Residential" combo "Layer"
-#. item "Highways/Streets/Living Street" combo "Layer"
-#. item "Highways/Streets/Pedestrian" combo "Layer"
-#. item "Highways/Streets/Service" combo "Layer"
-#. item "Highways/Streets/Parking Aisle" check "Oneway"
-#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Highways/Streets/Construction" combo "Layer"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
-#. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: 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 "Superficie"
 
 #. item "Highways/Streets/Residential" combo "Surface"
@@ -23622,5 +23665,16 @@
 #: 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:620 build/trans_presets.java:1273
+msgid "Surface"
+msgstr "Superficie"
+
+#: 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:1273
 msgid "paved"
 msgstr "pavimentata"
@@ -23633,5 +23687,5 @@
 #: 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:1273
 msgid "unpaved"
 msgstr "non pavimentata"
@@ -23644,5 +23698,5 @@
 #: 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:1273
 msgid "asphalt"
 msgstr "asfalto"
@@ -23655,5 +23709,5 @@
 #: 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:620 build/trans_presets.java:1273
 msgid "concrete"
 msgstr "calcestruzzo"
@@ -23666,5 +23720,5 @@
 #: 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:2796
+#: build/trans_presets.java:1273 build/trans_presets.java:2805
 msgid "metal"
 msgstr "metallo"
@@ -23677,5 +23731,5 @@
 #: 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:2796
+#: build/trans_presets.java:1273 build/trans_presets.java:2805
 msgid "wood"
 msgstr "bosco"
@@ -23688,5 +23742,5 @@
 #: 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:1273
 msgid "paving_stones"
 msgstr "lastricato"
@@ -23699,5 +23753,5 @@
 #: 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:620 build/trans_presets.java:1273
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
@@ -23710,5 +23764,5 @@
 #: 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:620 build/trans_presets.java:1273
 msgid "gravel"
 msgstr "ghiaia"
@@ -23721,5 +23775,5 @@
 #: 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:1273
 msgid "pebblestone"
 msgstr "ciottoli"
@@ -23732,5 +23786,5 @@
 #: 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:1273
 msgid "compacted"
 msgstr "compattato"
@@ -23743,5 +23797,5 @@
 #: 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:1273
 msgid "grass_paver"
 msgstr "erba"
@@ -23754,5 +23808,5 @@
 #: 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:620 build/trans_presets.java:1273
 msgid "grass"
 msgstr "erba"
@@ -23765,5 +23819,5 @@
 #: 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:620 build/trans_presets.java:1273
 msgid "sand"
 msgstr "sabbia"
@@ -23776,56 +23830,55 @@
 #: 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:620 build/trans_presets.java:1273
 msgid "ground"
 msgstr "terra"
 
-#. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Living Street"
 #: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Living Street"
 
-#. item "Highways/Streets/Living Street"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
+#. item "Highways/Streets/Living Street" label "Edit Living Street"
 #: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Modifica Living Street"
 
-#. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Pedestrian"
 #: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Area pedonale"
 
-#. item "Highways/Streets/Pedestrian"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
 #: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Modifica area pedonale"
 
-#. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Service"
 #: build/trans_presets.java:305
 msgid "Service"
 msgstr "Strada di servizio"
 
-#. item "Highways/Streets/Service"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
+#. item "Highways/Streets/Service" label "Edit Serviceway"
 #: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Modifica strada di servizio"
 
-#. item "Highways/Streets/Service" label "Edit Serviceway"
 #. <space />
 #. <key key="highway" value="service" />
 #. <optional>
+#. item "Highways/Streets/Service" combo "Serviceway type"
 #: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Tipo di strada di servizio"
 
-#. item "Highways/Streets/Service" combo "Serviceway type"
 #: build/trans_presets.java:312
 msgid "alley"
@@ -23840,14 +23893,14 @@
 msgstr "corsia interna a parcheggio"
 
-#. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Parking Aisle"
 #: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Corsia interna a parcheggio"
 
-#. item "Highways/Streets/Parking Aisle"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
+#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
 #: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
@@ -23855,32 +23908,32 @@
 
 #. </optional>
+#. item "Highways/Streets/Road (Unknown Type)"
 #: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Road (Tipo Sconosciuto)"
 
-#. item "Highways/Streets/Road (Unknown Type)"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
+#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Modifica Road (Tipo Sconosciuto)"
 
-#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#. item "Highways/Streets/Construction"
 #: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Construction"
 
-#. item "Highways/Streets/Construction"
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
 #: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Modifica una strada in costruzione"
 
+#. item "Highways/Streets/Construction" combo "Junction"
 #: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Svincolo"
 
-#. item "Highways/Streets/Construction" combo "Junction"
-#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -23891,143 +23944,39 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
+#. color roundabout
 #: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rotatoria"
 
-#. item "Highways/Streets/Construction" text "Width (meters)"
 #. </optional>
 #. <separator/>
+#. item "Highways/Streets/Road Restrictions"
 #: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Restrizioni e divieti"
 
-#. item "Highways/Streets/Road Restrictions"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
+#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Modifica restrizioni e divieti"
 
-#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#. item "Highways/Streets/Road Restrictions" check "Toll"
 #: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Pedaggio"
 
-#. item "Highways/Streets/Road Restrictions" check "Toll"
+#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Senza uscita (cul-de-sac)"
 
-#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#. item "Ways/Track" combo "Layer"
+#. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Ways/Track" combo "Access"
 #: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Permesso di accesso"
 
-#. item "Highways/Streets/Road Restrictions" combo "Access"
-#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#. item "Highways/Streets/Road Restrictions" combo "Bicycle"
-#. item "Highways/Streets/Road Restrictions" combo "Foot"
-#. item "Highways/Streets/Road Restrictions" combo "Goods"
-#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Highways/Streets/Road Restrictions" combo "Horse"
-#. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
-#. item "Highways/Streets/Road Restrictions" combo "Motorcar"
-#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Path" combo "Foot"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Snowmobile"
-#. 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"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. 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"
-#. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#. item "Travel/Accomodation/Hotel" combo "Internet access"
-#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
-#. item "Travel/Accomodation/Hotel" combo "Smoking"
-#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Motel" combo "Internet access"
-#. item "Travel/Accomodation/Motel" combo "Internet access fee"
-#. item "Travel/Accomodation/Motel" combo "Smoking"
-#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Guest House" combo "Internet access"
-#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
-#. item "Travel/Accomodation/Guest House" combo "Smoking"
-#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
-#. item "Travel/Accomodation/Chalet" combo "Internet access"
-#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
-#. item "Travel/Accomodation/Chalet" combo "Smoking"
-#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
-#. item "Travel/Accomodation/Hostel" combo "Internet access"
-#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
-#. item "Travel/Accomodation/Hostel" combo "Smoking"
-#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
-#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
-#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
-#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
-#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
-#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
-#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
-#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
-#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
-#. item "Travel/Accomodation/Camping Site" combo "Internet access"
-#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
-#. item "Travel/Accomodation/Camping Site" combo "Smoking"
-#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
-#. item "Food+Drinks/Restaurant" combo "Internet access"
-#. item "Food+Drinks/Restaurant" combo "Internet access fee"
-#. item "Food+Drinks/Restaurant" combo "Smoking"
-#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
-#. item "Food+Drinks/Fast Food" combo "Internet access"
-#. item "Food+Drinks/Fast Food" combo "Internet access fee"
-#. item "Food+Drinks/Fast Food" combo "Smoking"
-#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
-#. item "Food+Drinks/Food Court" combo "Internet access"
-#. item "Food+Drinks/Food Court" combo "Internet access fee"
-#. item "Food+Drinks/Food Court" combo "Smoking"
-#. item "Food+Drinks/Food Court" combo "Wheelchairs"
-#. item "Food+Drinks/Cafe" combo "Internet access"
-#. item "Food+Drinks/Cafe" combo "Internet access fee"
-#. item "Food+Drinks/Cafe" combo "Smoking"
-#. item "Food+Drinks/Cafe" combo "Wheelchairs"
-#. item "Food+Drinks/Pub" combo "Internet access"
-#. item "Food+Drinks/Pub" combo "Internet access fee"
-#. item "Food+Drinks/Pub" combo "Smoking"
-#. item "Food+Drinks/Pub" combo "Wheelchairs"
-#. item "Food+Drinks/Biergarten" combo "Internet access"
-#. item "Food+Drinks/Biergarten" combo "Internet access fee"
-#. item "Food+Drinks/Biergarten" combo "Smoking"
-#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
-#. item "Food+Drinks/Bar" combo "Internet access"
-#. item "Food+Drinks/Bar" combo "Internet access fee"
-#. item "Food+Drinks/Bar" combo "Smoking"
-#. item "Food+Drinks/Bar" combo "Wheelchairs"
-#. item "Food+Drinks/Nightclub" combo "Smoking"
-#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#. item "Tourism/Information Terminal" combo "Fee"
-#. item "Tourism/Audioguide" combo "Fee"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Amenities/Bench" combo "Backrest"
-#. item "Amenities/Hunting Stand" combo "Shelter"
-#. item "Amenities/Hunting Stand" combo "Hide"
-#. item "Amenities/Hunting Stand" combo "Lock"
-#. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -24041,55 +23990,54 @@
 #: 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:1364
-#: build/trans_presets.java:1390 build/trans_presets.java:1391
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1396 build/trans_presets.java:1462
-#: build/trans_presets.java:1473 build/trans_presets.java:1474
-#: build/trans_presets.java:1475 build/trans_presets.java:1476
-#: build/trans_presets.java:1477 build/trans_presets.java:1580
-#: build/trans_presets.java:1581 build/trans_presets.java:1582
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1705 build/trans_presets.java:1706
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1722
-#: build/trans_presets.java:1736 build/trans_presets.java:1737
-#: build/trans_presets.java:1738 build/trans_presets.java:1739
-#: build/trans_presets.java:1754 build/trans_presets.java:1755
-#: build/trans_presets.java:1756 build/trans_presets.java:1757
-#: build/trans_presets.java:1771 build/trans_presets.java:1772
-#: build/trans_presets.java:1773 build/trans_presets.java:1774
-#: build/trans_presets.java:1788 build/trans_presets.java:1789
-#: build/trans_presets.java:1790 build/trans_presets.java:1791
-#: build/trans_presets.java:1805 build/trans_presets.java:1806
-#: build/trans_presets.java:1807 build/trans_presets.java:1808
-#: build/trans_presets.java:1828 build/trans_presets.java:1829
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: 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:1866 build/trans_presets.java:1867
-#: build/trans_presets.java:1883 build/trans_presets.java:1884
-#: build/trans_presets.java:1885 build/trans_presets.java:1886
-#: build/trans_presets.java:1902 build/trans_presets.java:1903
-#: build/trans_presets.java:1904 build/trans_presets.java:1905
-#: build/trans_presets.java:1918 build/trans_presets.java:1919
-#: build/trans_presets.java:1920 build/trans_presets.java:1921
-#: build/trans_presets.java:1935 build/trans_presets.java:1936
-#: build/trans_presets.java:1937 build/trans_presets.java:1938
-#: build/trans_presets.java:1952 build/trans_presets.java:1953
-#: build/trans_presets.java:2075 build/trans_presets.java:2085
-#: build/trans_presets.java:2753 build/trans_presets.java:2754
-#: build/trans_presets.java:2795 build/trans_presets.java:2804
-#: build/trans_presets.java:2805 build/trans_presets.java:2806
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1369
+#: build/trans_presets.java:1395 build/trans_presets.java:1396
+#: build/trans_presets.java:1399 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1467
+#: build/trans_presets.java:1478 build/trans_presets.java:1479
+#: build/trans_presets.java:1480 build/trans_presets.java:1481
+#: build/trans_presets.java:1482 build/trans_presets.java:1585
+#: build/trans_presets.java:1586 build/trans_presets.java:1587
+#: build/trans_presets.java:1691 build/trans_presets.java:1692
+#: build/trans_presets.java:1693 build/trans_presets.java:1694
+#: build/trans_presets.java:1709 build/trans_presets.java:1710
+#: build/trans_presets.java:1711 build/trans_presets.java:1712
+#: build/trans_presets.java:1725 build/trans_presets.java:1726
+#: build/trans_presets.java:1727 build/trans_presets.java:1728
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1745
+#: 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:1794 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1811 build/trans_presets.java:1812
+#: build/trans_presets.java:1813 build/trans_presets.java:1814
+#: build/trans_presets.java:1834 build/trans_presets.java:1835
+#: build/trans_presets.java:1836 build/trans_presets.java:1837
+#: build/trans_presets.java:1853 build/trans_presets.java:1854
+#: build/trans_presets.java:1855 build/trans_presets.java:1856
+#: build/trans_presets.java:1870 build/trans_presets.java:1871
+#: build/trans_presets.java:1872 build/trans_presets.java:1873
+#: build/trans_presets.java:1889 build/trans_presets.java:1890
+#: build/trans_presets.java:1891 build/trans_presets.java:1892
+#: build/trans_presets.java:1908 build/trans_presets.java:1909
+#: build/trans_presets.java:1910 build/trans_presets.java:1911
+#: build/trans_presets.java:1924 build/trans_presets.java:1925
+#: build/trans_presets.java:1926 build/trans_presets.java:1927
+#: build/trans_presets.java:1941 build/trans_presets.java:1942
+#: build/trans_presets.java:1943 build/trans_presets.java:1944
+#: build/trans_presets.java:1958 build/trans_presets.java:1959
+#: build/trans_presets.java:2083 build/trans_presets.java:2093
+#: build/trans_presets.java:2762 build/trans_presets.java:2763
+#: build/trans_presets.java:2804 build/trans_presets.java:2813
+#: build/trans_presets.java:2814 build/trans_presets.java:2815
+#: build/trans_presets.java:3101
 msgid "yes"
 msgstr "si"
 
-#. color permissive
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -24098,4 +24046,5 @@
 #. <rule>
 #. <condition k="access" v="private"/>
+#. color private
 #: build/trans_presets.java:386 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
@@ -24108,5 +24057,4 @@
 msgstr "privato"
 
-#. color private
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -24115,4 +24063,5 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
+#. color destination
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -24125,5 +24074,4 @@
 msgstr "destinazione"
 
-#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24142,4 +24090,5 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
+#. color permissive
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -24174,5 +24123,4 @@
 msgstr "carico e scarico"
 
-#. 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
@@ -24187,54 +24135,55 @@
 #: 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:1364 build/trans_presets.java:1390
-#: build/trans_presets.java:1391 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1396
-#: build/trans_presets.java:1462 build/trans_presets.java:1473
-#: build/trans_presets.java:1474 build/trans_presets.java:1475
-#: build/trans_presets.java:1476 build/trans_presets.java:1477
-#: build/trans_presets.java:1580 build/trans_presets.java:1581
-#: build/trans_presets.java:1582 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1705
-#: build/trans_presets.java:1706 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1722 build/trans_presets.java:1736
-#: build/trans_presets.java:1737 build/trans_presets.java:1738
-#: build/trans_presets.java:1739 build/trans_presets.java:1754
-#: build/trans_presets.java:1755 build/trans_presets.java:1756
-#: build/trans_presets.java:1757 build/trans_presets.java:1771
-#: build/trans_presets.java:1772 build/trans_presets.java:1773
-#: build/trans_presets.java:1774 build/trans_presets.java:1788
-#: build/trans_presets.java:1789 build/trans_presets.java:1790
-#: build/trans_presets.java:1791 build/trans_presets.java:1805
-#: build/trans_presets.java:1806 build/trans_presets.java:1807
-#: build/trans_presets.java:1808 build/trans_presets.java:1828
-#: build/trans_presets.java:1829 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 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:1866
-#: build/trans_presets.java:1867 build/trans_presets.java:1883
-#: build/trans_presets.java:1884 build/trans_presets.java:1885
-#: build/trans_presets.java:1886 build/trans_presets.java:1902
-#: build/trans_presets.java:1903 build/trans_presets.java:1904
-#: build/trans_presets.java:1905 build/trans_presets.java:1918
-#: build/trans_presets.java:1919 build/trans_presets.java:1920
-#: build/trans_presets.java:1921 build/trans_presets.java:1935
-#: build/trans_presets.java:1936 build/trans_presets.java:1937
-#: build/trans_presets.java:1938 build/trans_presets.java:1952
-#: build/trans_presets.java:1953 build/trans_presets.java:2075
-#: build/trans_presets.java:2085 build/trans_presets.java:2753
-#: build/trans_presets.java:2754 build/trans_presets.java:2795
-#: build/trans_presets.java:2804 build/trans_presets.java:2805
-#: build/trans_presets.java:2806 build/trans_presets.java:3092
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 build/trans_presets.java:1297
+#: build/trans_presets.java:1369 build/trans_presets.java:1395
+#: build/trans_presets.java:1396 build/trans_presets.java:1399
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1467 build/trans_presets.java:1478
+#: build/trans_presets.java:1479 build/trans_presets.java:1480
+#: build/trans_presets.java:1481 build/trans_presets.java:1482
+#: build/trans_presets.java:1585 build/trans_presets.java:1586
+#: build/trans_presets.java:1587 build/trans_presets.java:1691
+#: build/trans_presets.java:1692 build/trans_presets.java:1693
+#: build/trans_presets.java:1694 build/trans_presets.java:1709
+#: build/trans_presets.java:1710 build/trans_presets.java:1711
+#: build/trans_presets.java:1712 build/trans_presets.java:1725
+#: build/trans_presets.java:1726 build/trans_presets.java:1727
+#: build/trans_presets.java:1728 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1745 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:1794
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1811
+#: build/trans_presets.java:1812 build/trans_presets.java:1813
+#: build/trans_presets.java:1814 build/trans_presets.java:1834
+#: build/trans_presets.java:1835 build/trans_presets.java:1836
+#: build/trans_presets.java:1837 build/trans_presets.java:1853
+#: build/trans_presets.java:1854 build/trans_presets.java:1855
+#: build/trans_presets.java:1856 build/trans_presets.java:1870
+#: build/trans_presets.java:1871 build/trans_presets.java:1872
+#: build/trans_presets.java:1873 build/trans_presets.java:1889
+#: build/trans_presets.java:1890 build/trans_presets.java:1891
+#: build/trans_presets.java:1892 build/trans_presets.java:1908
+#: build/trans_presets.java:1909 build/trans_presets.java:1910
+#: build/trans_presets.java:1911 build/trans_presets.java:1924
+#: build/trans_presets.java:1925 build/trans_presets.java:1926
+#: build/trans_presets.java:1927 build/trans_presets.java:1941
+#: build/trans_presets.java:1942 build/trans_presets.java:1943
+#: build/trans_presets.java:1944 build/trans_presets.java:1958
+#: build/trans_presets.java:1959 build/trans_presets.java:2083
+#: build/trans_presets.java:2093 build/trans_presets.java:2762
+#: build/trans_presets.java:2763 build/trans_presets.java:2804
+#: build/trans_presets.java:2813 build/trans_presets.java:2814
+#: build/trans_presets.java:2815 build/trans_presets.java:3101
 msgid "no"
 msgstr "no"
 
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
 #: build/trans_presets.java:387
 msgid "Agricultural"
@@ -24264,32 +24213,17 @@
 msgstr "ufficiale"
 
+#. item "Highways/Streets/Road Restrictions" combo "Goods"
 #: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Carico e scarico merci"
 
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
 #: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Merci pesanti/Trasporti eccezionali"
 
-#. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
-#. item "Barriers/Gate" check "Bicycle"
-#. item "Barriers/Lift Gate" check "Bicycle"
-#. item "Barriers/Hampshire Gate" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Sally Port" check "Bicycle"
-#: 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 "Cavallo"
-
+#. item "Highways/Streets/Road Restrictions" combo "Horse"
+#. item "Ways/Path" combo "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
 #. item "Barriers/Border Control" check "Horse"
@@ -24300,14 +24234,16 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: 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:1455
-msgid "Motorcycle"
-msgstr "Motocicletta"
-
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:769 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
+msgid "Horse"
+msgstr "Cavallo"
+
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Barriers/Bollard" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
@@ -24319,60 +24255,82 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:394 build/trans_presets.java:476
-#: build/trans_presets.java:503 build/trans_presets.java:788
+#. group "Motorcycle"
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:770 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
+#: build/trans_presets.java:1460
+msgid "Motorcycle"
+msgstr "Motocicletta"
+
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#. item "Barriers/Spikes" check "Motorcar"
+#. item "Barriers/Border Control" check "Motorcar"
+#. item "Barriers/Entrance" check "Motorcar"
+#. item "Barriers/Gate" check "Motorcar"
+#. item "Barriers/Lift Gate" check "Motorcar"
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#. item "Barriers/Bump Gate" check "Motorcar"
+#. item "Barriers/Sally Port" check "Motorcar"
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:789
+#: build/trans_presets.java:804 build/trans_presets.java:826
+#: build/trans_presets.java:863 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:912 build/trans_presets.java:952
 msgid "Motorcar"
 msgstr "Automobile"
 
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
 #: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Veicoli di servizio pubblico"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Velocità minima (km/h)"
 
-#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Peso massimo (tonnellate)"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Altezza massima (metri)"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
+#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Larghezza massima (metri)"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
+#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Lunghezza massima (metri)"
 
-#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
+#. item "Highways/Streets/Roundabout"
 #: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rotatoria"
 
-#. item "Highways/Streets/Roundabout"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
 #: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Modifica un incrocio"
 
-#. item "Highways/Streets/Roundabout" combo "Type"
-#. color motorroad
 #. </rule>
 #.
@@ -24387,4 +24345,5 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
+#. color motorway
 #: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
@@ -24396,5 +24355,4 @@
 msgstr "collegamento autostradale"
 
-#. color motorway
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24412,4 +24370,5 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
+#. color trunk
 #: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
@@ -24421,5 +24380,4 @@
 msgstr "trunk_link"
 
-#. color trunk
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24437,4 +24395,5 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
+#. color primary
 #: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
@@ -24446,5 +24405,4 @@
 msgstr "svincolo primario"
 
-#. color primary
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24462,4 +24420,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
+#. color secondary
 #: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
@@ -24467,5 +24426,4 @@
 msgstr "secondaria"
 
-#. color secondary
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24475,4 +24433,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
+#. color tertiary
 #: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
@@ -24483,5 +24442,4 @@
 msgstr "unclassified"
 
-#. color green
 #. <icon src="misc/landmark/plant.png"/>
 #. <scale_min>1</scale_min>
@@ -24491,4 +24449,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
+#. color residential
 #: build/trans_presets.java:412 build/trans_style.java:3317
 msgid "residential"
@@ -24499,5 +24458,4 @@
 msgstr "living_street"
 
-#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -24507,5 +24465,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#. color address
+#. color service
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -24537,4 +24495,5 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
+#. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4476
@@ -24546,5 +24505,4 @@
 msgstr "autobus guidato"
 
-#. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
 #. <scale_min>1</scale_min>
@@ -24561,5 +24519,5 @@
 #. <rule>
 #. <condition k="highway" v="construction"/>
-#. color railland
+#. color construction
 #. <icon src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
@@ -24575,42 +24533,41 @@
 msgstr "construction"
 
-#. item "Highways/Streets/Bridge"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
+#. item "Highways/Streets/Bridge" label "Edit Bridge"
 #: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Modifica ponte"
 
-#. item "Highways/Streets/Tunnel"
+#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
 #: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Modifica un Tunnel"
 
-#. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
+#. group "Ways"
 #: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Percorsi"
 
-#. group "Ways"
+#. item "Ways/Track"
 #: build/trans_presets.java:457
 msgid "Track"
 msgstr "Track"
 
-#. item "Ways/Track"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+#. item "Ways/Track" label "Edit Track"
 #: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Modifica Track"
 
-#. item "Ways/Track" text "Name"
+#. item "Ways/Track" combo "Tracktype"
 #: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Tipo di traccia"
 
-#. item "Ways/Track" combo "Tracktype"
 #: build/trans_presets.java:465
 msgid "grade1"
@@ -24633,28 +24590,29 @@
 msgstr "grado5"
 
+#. item "Ways/Track" combo "MTB Scale"
+#. item "Ways/Path" combo "MTB Scale"
 #: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Scala di classificazione MTB"
 
-#. item "Ways/Track" text "Width (meters)"
 #. </optional>
+#. item "Ways/Path"
 #: build/trans_presets.java:480
 msgid "Path"
 msgstr "Percorso"
 
-#. item "Ways/Path"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+#. item "Ways/Path" label "Edit Path"
 #: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Modifica percorso"
 
-#. item "Ways/Path" text "Name"
+#. item "Ways/Path" combo "SAC Scale"
 #: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Scala escursionistica SAC"
 
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:488 build/trans_presets.java:3586
+#: build/trans_presets.java:488 build/trans_presets.java:3612
 msgid "hiking"
 msgstr "escursionismo"
@@ -24680,5 +24638,4 @@
 msgstr "sentiero alpino difficile"
 
-#. item "Ways/Path" combo "Visibility"
 #: build/trans_presets.java:491
 msgid "excellent"
@@ -24689,5 +24646,5 @@
 msgstr "buona"
 
-#: build/trans_presets.java:491 build/trans_presets.java:2320
+#: build/trans_presets.java:491 build/trans_presets.java:2329
 msgid "intermediate"
 msgstr "intermedio"
@@ -24701,55 +24658,74 @@
 msgstr "orribile"
 
-#: build/trans_presets.java:500 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
+#. item "Ways/Path" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
+#: build/trans_presets.java:500 build/trans_presets.java:1694
+#: build/trans_presets.java:1712 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1763
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1814 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1911
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1959
 msgid "Wheelchairs"
 msgstr "Sedie a rotelle"
 
+#. item "Ways/Path" combo "Ski"
 #: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Sci"
 
+#. item "Ways/Path" combo "Snowmobile"
 #: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Motoslitta"
 
-#. item "Ways/Path" text "Width (meters)"
 #. </optional>
 #. <separator/>
+#. item "Ways/Dedicated Bridleway"
 #: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Percorso dedicato all''equitazione"
 
-#. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
+#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
 #: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Modifica un percorso per equitazione"
 
-#. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Dedicated Cycleway"
 #: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Pista ciclabile dedicata"
 
-#. item "Ways/Dedicated Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#. item "Ways/Segregated Foot- and Cycleway"
+#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#. item "Ways/Combined Foot- and Cycleway"
+#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
 #: build/trans_presets.java:532 build/trans_presets.java:552
 #: build/trans_presets.java:574
@@ -24757,228 +24733,229 @@
 msgstr "Modifica Cycleway"
 
-#. item "Ways/Dedicated Cycleway" check "Embankment"
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Pedoni"
 
-#. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Segregated Foot- and Cycleway"
 #: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Pista pedonale separata e ciclabile"
 
-#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Combined Foot- and Cycleway"
 #: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Pista combinata pedonale e ciclabile"
 
-#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Dedicated Footway"
 #: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Marciapiede Dedicato"
 
-#. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
+#. item "Ways/Dedicated Footway" label "Edit Footway"
 #: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Modifica Footway"
 
-#. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
+#. item "Ways/Steps"
 #: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Rampa di scale"
 
-#. item "Ways/Steps"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
+#. item "Ways/Steps" label "Edit Flight of Steps"
 #: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Modifica una rampa di scale"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #: build/trans_presets.java:628
 msgid "Amount of Steps"
 msgstr "Quantità di gradini"
 
-#. group "Waypoints"
+#. item "Waypoints/Motorway Junction"
 #: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Svincolo autostradale"
 
-#. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
+#. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
 #: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Modifica svincolo autostradale"
 
-#. item "Waypoints/Motorway Junction" text "Name"
+#. item "Waypoints/Motorway Junction" text "Number"
 #: build/trans_presets.java:639
 msgid "Number"
 msgstr "Numero"
 
-#. item "Waypoints/Motorway Junction" text "Number"
+#. item "Waypoints/Services"
 #: build/trans_presets.java:641
 msgid "Services"
 msgstr "Stazione di servizio"
 
-#. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
+#. item "Waypoints/Services" label "Edit Service Station"
 #: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Modifica stazione di servizio"
 
-#. item "Waypoints/Services" text "Name"
-#. item "Barriers/Toll Booth" 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"
-#. item "Travel/Accomodation/Hostel" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
-#. item "Tourism/Information Terminal" text "Closer description"
-#. item "Tourism/Audioguide" text "Closer description"
-#. item "Man-Made/Buildings/Post Office" text "Name"
-#. item "Man Made/Tower" text "Height (meters)"
-#. item "Man Made/Pipeline" label "Edit Pipeline"
+#. item "Waypoints/Services" text "Operator"
+#. item "Barriers/Toll Booth" text "Operator"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Car Dealer" 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 "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" text "Operator"
+#. item "Tourism/Information Terminal" text "Operator"
+#. item "Tourism/Audioguide" text "Operator"
+#. item "Man-Made/Buildings/Post Office" text "Operator"
+#. item "Man Made/Tower" text "Operator"
 #. <key key="man_made" value="pipeline" />
-#. item "Man Made/Power Station" text "Name"
-#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
+#. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Power Station" text "Operator"
 #. <key key="power" value="sub_station" />
-#. item "Amenities/Toilets"
+#. item "Man Made/Power Sub Station" text "Operator"
+#. item "Man Made/Power Line" text "Operator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
 #. <key key="amenity" value="toilets" />
-#. item "Amenities/Post Box"
+#. item "Amenities/Toilets" text "Operator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
 #. <key key="amenity" value="post_box" />
-#. item "Amenities/Telephone" label "Edit Telephone"
+#. item "Amenities/Post Box" text "Operator"
 #. <key key="amenity" value="telephone" />
-#. item "Cash/Bank" text "Name"
-#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
+#. item "Amenities/Telephone" text "Operator"
+#. item "Shops/Vending machine" text "Operator"
+#. item "Cash/Bank" text "Operator"
 #. <key key="amenity" value="atm" />
-#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. item "Cash/Automated Teller Machine" text "Operator"
 #. <key key="amenity" value="baby_hatch" />
-#. item "Health/Emergency Access Point" text "Point Name"
-#. item "Relations/Route" text "Network"
-#: build/trans_presets.java:648 build/trans_presets.java:812
-#: build/trans_presets.java:1362 build/trans_presets.java:1404
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1442
-#: build/trans_presets.java:1451 build/trans_presets.java:1470
-#: build/trans_presets.java:1682 build/trans_presets.java:1700
-#: build/trans_presets.java:1751 build/trans_presets.java:1768
-#: build/trans_presets.java:1822 build/trans_presets.java:1843
-#: build/trans_presets.java:1879 build/trans_presets.java:1898
-#: build/trans_presets.java:2073 build/trans_presets.java:2083
-#: build/trans_presets.java:2550 build/trans_presets.java:2630
-#: build/trans_presets.java:2660 build/trans_presets.java:2713
-#: build/trans_presets.java:2721 build/trans_presets.java:2738
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
-#: build/trans_presets.java:2767 build/trans_presets.java:3039
-#: build/trans_presets.java:3056 build/trans_presets.java:3071
-#: build/trans_presets.java:3106 build/trans_presets.java:3117
-#: build/trans_presets.java:3593
+#. item "Health/Baby Hatch" text "Operator"
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:648 build/trans_presets.java:813
+#: build/trans_presets.java:1367 build/trans_presets.java:1409
+#: build/trans_presets.java:1417 build/trans_presets.java:1424
+#: build/trans_presets.java:1432 build/trans_presets.java:1447
+#: build/trans_presets.java:1456 build/trans_presets.java:1475
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1828 build/trans_presets.java:1849
+#: build/trans_presets.java:1885 build/trans_presets.java:1904
+#: build/trans_presets.java:2081 build/trans_presets.java:2091
+#: build/trans_presets.java:2559 build/trans_presets.java:2639
+#: build/trans_presets.java:2669 build/trans_presets.java:2722
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:3048
+#: build/trans_presets.java:3065 build/trans_presets.java:3080
+#: build/trans_presets.java:3115 build/trans_presets.java:3126
+#: build/trans_presets.java:3619
 msgid "Operator"
 msgstr "Operatore"
 
-#. item "Waypoints/Services" text "Operator"
 #. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#. item "Waypoints/Rest Area"
 #: build/trans_presets.java:652
 msgid "Rest Area"
 msgstr "Area di sosta"
 
-#. item "Waypoints/Rest Area"
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
 #: build/trans_presets.java:653
 msgid "Edit Rest Area"
 msgstr "Modifica area di sosta"
 
-#. item "Waypoints/Rest Area" text "Name"
 #. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#. item "Waypoints/Emergency Phone"
 #: build/trans_presets.java:661
 msgid "Emergency Phone"
 msgstr "Telefono di emergenza"
 
-#. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
 #. <separator/>
+#. item "Waypoints/Traffic Signal"
 #: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semaforo"
 
-#. item "Waypoints/Traffic Signal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
 #: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Tipo di attraversamento pedonale"
 
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#. item "Waypoints/Pedestrian Crossing" combo "Type"
-#. item "Transport/Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "uncontrolled"
 msgstr "non presidiato"
 
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "traffic_signals"
 msgstr "Semaforo"
 
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "island"
 msgstr "isola spartitraffico"
 
 #: build/trans_presets.java:669 build/trans_presets.java:691
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1297
 msgid "unmarked"
 msgstr "non marcato"
 
-#. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
+#. item "Waypoints/Traffic Signal" check "Cross on horseback"
+#. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
+#. item "Transport/Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:670 build/trans_presets.java:693
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1298
 msgid "Cross on horseback"
 msgstr "Attraversamento a cavallo"
 
-#. item "Waypoints/Traffic Signal" check "Cross on horseback"
-#. item "Transport/Railway/Crossing" check "Cross on horseback"
+#. item "Waypoints/Traffic Signal" check "Cross by bicycle"
+#. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
+#. item "Transport/Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:671 build/trans_presets.java:692
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1299
 msgid "Cross by bicycle"
 msgstr "Attraversamento ciclabile"
 
-#. item "Waypoints/Traffic Signal" check "Cross by bicycle"
-#. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
-#. item "Transport/Railway/Crossing" check "Cross by bicycle"
+#. item "Waypoints/Traffic Signal" check "Crossing attendant"
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#. item "Transport/Railway/Crossing" check "Crossing attendant"
 #: build/trans_presets.java:672 build/trans_presets.java:694
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1300
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
-#. item "Waypoints/Traffic Signal" check "Crossing attendant"
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Nome del tipo di attraversamento (UK)"
 
-#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
 #: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
@@ -25006,50 +24983,52 @@
 
 #. </optional>
+#. item "Waypoints/Stop"
 #: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
 
-#. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
+#. item "Waypoints/Mini-roundabout"
 #: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-rotatoria"
 
-#. item "Waypoints/Mini-roundabout"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
+#. item "Waypoints/Mini-roundabout" combo "Direction"
 #: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Direzione"
 
-#. item "Waypoints/Mini-roundabout" combo "Direction"
 #: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "senso orario"
 
+#. item "Waypoints/Pedestrian Crossing"
 #: build/trans_presets.java:686
 msgid "Pedestrian Crossing"
 msgstr "Attraversamento pedonale"
 
-#. item "Waypoints/Pedestrian Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #: build/trans_presets.java:689
 msgid "Edit Crossing"
 msgstr "Modifica attraversamento pedonale"
 
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
 #: build/trans_presets.java:695
 msgid "Type name (UK)"
 msgstr "Nome del tipo (UK)"
 
+#. item "Waypoints/Traffic Calming"
 #: build/trans_presets.java:697
 msgid "Traffic Calming"
 msgstr "Rallentatore del traffico"
 
-#. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
 #: build/trans_presets.java:699
 msgid "Edit Traffic Calming"
@@ -25080,580 +25059,623 @@
 msgstr "dosso piatto"
 
+#. item "Waypoints/Passing Place"
 #: build/trans_presets.java:702
 msgid "Passing Place"
 msgstr "Slargo per l''incrocio"
 
-#. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
 #: build/trans_presets.java:704
 msgid "Edit Passing Place"
 msgstr "Modifica slargo per l''incrocio"
 
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
+#. item "Waypoints/Turning Circle"
 #: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Slargo per inversione di marcia"
 
-#. item "Waypoints/Turning Circle"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
+#. item "Waypoints/City Limit"
 #: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Cartello di inizio/fine di centro abitato"
 
-#. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Modifica cartello di inizio/fine di centro abitato"
 
-#. item "Waypoints/City Limit" text "Name"
+#. item "Waypoints/City Limit" text "Second Name"
 #: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Secondo nome"
 
-#. item "Waypoints/City Limit" text "Second Name"
+#. item "Waypoints/Speed Camera"
 #: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Rilevatore di velocità"
 
-#. item "Waypoints/Speed Camera"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
 #. <separator/>
+#. item "Waypoints/Incline"
 #: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Rampa"
 
-#. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
+#. item "Waypoints/Incline Steep"
 #: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Rampa ripida"
 
-#. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#. item "Waypoints/Grit Bin"
 #: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Cassone di sabbia"
 
-#. item "Waypoints/Grit Bin"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
+#. item "Waypoints/Ford"
 #: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Guado"
 
-#. item "Waypoints/Ford"
+#. item "Waypoints/Ford" label "Edit Ford"
 #: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Modifica guado"
 
-#. item "Waypoints/Ford" text "Name"
 #. </optional>
+#. item "Waypoints/Mountain Pass"
 #: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Passo montano"
 
-#. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
+#. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Modifica passo montano"
 
-#. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Operator"
-#. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Peak" text "Name"
-#. item "Geography/Glacier" text "Name"
-#. item "Geography/Volcano" text "Name"
-#: build/trans_presets.java:752 build/trans_presets.java:1769
-#: build/trans_presets.java:2053 build/trans_presets.java:3244
-#: build/trans_presets.java:3251 build/trans_presets.java:3258
+#. item "Waypoints/Mountain Pass" text "Elevation"
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. item "Tourism/Guidepost" text "Elevation"
+#. item "Geography/Peak" text "Elevation"
+#. item "Geography/Glacier" text "Elevation"
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:752 build/trans_presets.java:1775
+#: build/trans_presets.java:2061 build/trans_presets.java:3264
+#: build/trans_presets.java:3272 build/trans_presets.java:3280
 msgid "Elevation"
 msgstr "Elevazione"
 
-#. item "Waypoints/Mountain Pass" text "Elevation"
+#. item "Waypoints/Mountain Pass" text "Wikipedia"
+#. item "Water/Water/Canal" text "Wikipedia"
+#. item "Water/Water/River" text "Wikipedia"
+#. item "Water/Water/Waterfall" text "Wikipedia"
+#. item "Water/Water/Dam" text "Wikipedia"
+#. item "Airport/Airport Ground" text "Wikipedia"
+#. item "Tourism/Museum" text "Wikipedia"
+#. item "Tourism/Zoo" text "Wikipedia"
+#. item "Historic Places/Castle" text "Wikipedia"
+#. item "Places/Continent" text "Wikipedia"
+#. item "Places/Country" text "Wikipedia"
+#. item "Places/State" text "Wikipedia"
+#. item "Places/Region" text "Wikipedia"
+#. item "Places/County" text "Wikipedia"
+#. item "Places/City" text "Wikipedia"
+#. item "Places/Town" text "Wikipedia"
+#. item "Places/Suburb" text "Wikipedia"
+#. item "Places/Village" text "Wikipedia"
+#. item "Places/Hamlet" text "Wikipedia"
+#. item "Places/Locality" text "Wikipedia"
+#. item "Geography/Peak" text "Wikipedia"
+#. item "Geography/Glacier" text "Wikipedia"
+#. item "Geography/Volcano" text "Wikipedia"
+#. item "Geography/Cave Entrance" text "Wikipedia"
+#. item "Geography/Island" text "Wikipedia"
+#. item "Geography/Islet" text "Wikipedia"
+#. <space />
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:753 build/trans_presets.java:991
+#: build/trans_presets.java:1002 build/trans_presets.java:1016
+#: build/trans_presets.java:1031 build/trans_presets.java:1617
+#: build/trans_presets.java:1980 build/trans_presets.java:1989
+#: build/trans_presets.java:2112 build/trans_presets.java:3180
+#: build/trans_presets.java:3187 build/trans_presets.java:3194
+#: build/trans_presets.java:3201 build/trans_presets.java:3208
+#: build/trans_presets.java:3216 build/trans_presets.java:3224
+#: build/trans_presets.java:3232 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3255
+#: build/trans_presets.java:3265 build/trans_presets.java:3273
+#: build/trans_presets.java:3281 build/trans_presets.java:3288
+#: build/trans_presets.java:3297 build/trans_presets.java:3305
+#: build/trans_presets.java:3554
+msgid "Wikipedia"
+msgstr "Wikipedia"
+
 #. </optional>
-#: build/trans_presets.java:756
+#. group "Barriers"
+#: build/trans_presets.java:757
 msgid "Barriers"
 msgstr "Barriere"
 
-#. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:759
+#. item "Barriers/Bollard"
+#: build/trans_presets.java:760
 msgid "Bollard"
 msgstr "Colonnina"
 
-#. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:761
+#. item "Barriers/Bollard" label "Edit Bollard"
+#: build/trans_presets.java:762
 msgid "Edit Bollard"
 msgstr "Modifica colonnina"
 
-#. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
+#. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="cattle_grid" />
-#. item "Barriers/Spikes" label "Edit Spikes"
+#. item "Barriers/Cattle Grid" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Border Control" label "Edit Border Control"
+#. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
+#. item "Barriers/Border Control" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="entrance" />
-#. item "Barriers/Gate" label "Edit Gate"
+#. item "Barriers/Entrance" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="gate" />
-#. item "Barriers/Lift Gate" label "Edit Lift Gate"
+#. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="lift_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="hampshire_gate" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Stile" label "Edit Stile"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="stile" />
-#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="turnstile" />
-#. item "Barriers/Sally Port" label "Edit Sally Port"
+#. item "Barriers/Turnstile" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: 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
+#. item "Barriers/Sally Port" label "Allowed traffic:"
+#: build/trans_presets.java:765 build/trans_presets.java:784
+#: build/trans_presets.java:798 build/trans_presets.java:820
+#: build/trans_presets.java:857 build/trans_presets.java:870
+#: build/trans_presets.java:882 build/trans_presets.java:894
+#: build/trans_presets.java:906 build/trans_presets.java:918
+#: build/trans_presets.java:928 build/trans_presets.java:937
+#: build/trans_presets.java:946
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:771
+#. item "Barriers/Cycle Barrier"
+#: build/trans_presets.java:772
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
 
-#. item "Barriers/Cycle Barrier"
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:775
+#. item "Barriers/Block"
+#: build/trans_presets.java:776
 msgid "Block"
 msgstr "Blocco"
 
-#. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:778
+#. item "Barriers/Cattle Grid"
+#: build/trans_presets.java:779
 msgid "Cattle Grid"
 msgstr "Griglia"
 
-#. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:780
+#. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
+#: build/trans_presets.java:781
 msgid "Edit Cattle Grid"
 msgstr "Modifica griglia"
 
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:790
+#. item "Barriers/Bus Trap"
+#: build/trans_presets.java:791
 msgid "Bus Trap"
 msgstr "Trappola bus"
 
-#. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:793
+#. item "Barriers/Spikes"
+#: build/trans_presets.java:794
 msgid "Spikes"
 msgstr "Spunzoni"
 
-#. item "Barriers/Spikes"
-#: build/trans_presets.java:794
+#. item "Barriers/Spikes" label "Edit Spikes"
+#: build/trans_presets.java:795
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:805
+#. item "Barriers/Toll Booth"
+#: build/trans_presets.java:806
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
 
-#. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:807
+#. item "Barriers/Toll Booth" label "Edit Toll Booth"
+#: build/trans_presets.java:808
 msgid "Edit Toll Booth"
 msgstr "Modifica casello (per pedaggio)"
 
-#. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:815
+#. item "Barriers/Border Control"
+#: build/trans_presets.java:816
 msgid "Border Control"
 msgstr "Dogana"
 
-#. item "Barriers/Border Control"
-#: build/trans_presets.java:816
+#. item "Barriers/Border Control" label "Edit Border Control"
+#: build/trans_presets.java:817
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
 
-#. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:830
+#. item "Barriers/Hedge"
+#: build/trans_presets.java:831
 msgid "Hedge"
 msgstr "Siepe"
 
-#. item "Barriers/Hedge"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:834 build/trans_presets.java:836
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:835 build/trans_presets.java:837
 msgid "Fence"
 msgstr "Recinto"
 
-#. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:836
+#: build/trans_presets.java:837
 msgid "fence"
 msgstr "recinzione"
 
-#: build/trans_presets.java:836
+#: build/trans_presets.java:837
 msgid "wood_fence"
 msgstr "recinto in legno"
 
-#: build/trans_presets.java:836
+#: build/trans_presets.java:837
 msgid "wire_fence"
 msgstr "recinto in rete"
 
-#: build/trans_presets.java:838
+#. item "Barriers/Wall"
+#: build/trans_presets.java:839
 msgid "Wall"
 msgstr "Muro"
 
-#. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:841
+#. item "Barriers/City Wall"
+#: build/trans_presets.java:842
 msgid "City Wall"
 msgstr "Cinta muraria"
 
-#. item "Barriers/City Wall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:845
+#. item "Barriers/Retaining Wall"
+#: build/trans_presets.java:846
 msgid "Retaining Wall"
 msgstr "Muro di contenimento"
 
-#. item "Barriers/Retaining Wall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:852
+#. item "Barriers/Entrance"
+#: build/trans_presets.java:853
 msgid "Entrance"
 msgstr "Punto di accesso"
 
-#. item "Barriers/Entrance"
-#: build/trans_presets.java:853
+#. item "Barriers/Entrance" label "Edit Entrance"
+#: build/trans_presets.java:854
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
 
-#. item "Barriers/Entrance" check "Motorcar"
-#. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:864 build/trans_presets.java:1666
+#. item "Barriers/Gate"
+#: build/trans_presets.java:865
 msgid "Gate"
 msgstr "Cancello"
 
-#. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:866
+#. item "Barriers/Gate" label "Edit Gate"
+#: build/trans_presets.java:867
 msgid "Edit Gate"
 msgstr "Modifica cancello"
 
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:877
+#. item "Barriers/Lift Gate"
+#: build/trans_presets.java:878
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
-#. item "Barriers/Lift Gate"
-#: build/trans_presets.java:878
+#. item "Barriers/Lift Gate" label "Edit Lift Gate"
+#: build/trans_presets.java:879
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:889
+#. item "Barriers/Hampshire Gate"
+#: build/trans_presets.java:890
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
-#. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:890
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#: build/trans_presets.java:891
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:901
+#. item "Barriers/Bump Gate"
+#: build/trans_presets.java:902
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
-#. item "Barriers/Bump Gate"
-#: build/trans_presets.java:902
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#: build/trans_presets.java:903
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:913
+#. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:914
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
-#. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:914
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#: build/trans_presets.java:915
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:922
+#. item "Barriers/Stile"
+#: build/trans_presets.java:923
 msgid "Stile"
 msgstr "Scaletta"
 
-#. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:924
+#. item "Barriers/Stile" label "Edit Stile"
+#: build/trans_presets.java:925
 msgid "Edit Stile"
 msgstr "Modifica scaletta"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:932
+#. item "Barriers/Turnstile"
+#: build/trans_presets.java:933
 msgid "Turnstile"
 msgstr "Tornello"
 
-#. item "Barriers/Turnstile"
-#: build/trans_presets.java:933
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#: build/trans_presets.java:934
 msgid "Edit Turnstile"
 msgstr "Modifica tornello"
 
-#. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:941
+#. item "Barriers/Sally Port"
+#: build/trans_presets.java:942
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
-#. item "Barriers/Sally Port"
-#: build/trans_presets.java:942
+#. item "Barriers/Sally Port" label "Edit Sally Port"
+#: build/trans_presets.java:943
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
 
-#. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/Covered Reservoir" text "Name"
+#. group "Water/Water"
 #. <separator/>
-#: build/trans_presets.java:956 build/trans_presets.java:957
-#: build/trans_presets.java:1048
+#. item "Water/Water/Water"
+#: build/trans_presets.java:957 build/trans_presets.java:958
+#: build/trans_presets.java:1053
 msgid "Water"
 msgstr "Acqua"
 
-#. group "Water/Water"
 #. <separator/>
-#: build/trans_presets.java:959
+#. item "Water/Water/Drain"
+#: build/trans_presets.java:960
 msgid "Drain"
 msgstr "Canale di scolo"
 
-#. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:961
+#. item "Water/Water/Drain" label "Edit Drain"
+#: build/trans_presets.java:962
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
-#. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:967
+#. item "Water/Water/Ditch"
+#: build/trans_presets.java:968
 msgid "Ditch"
 msgstr "Fosso"
 
-#. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:969
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#: build/trans_presets.java:970
 msgid "Edit Ditch"
 msgstr "Modifica fosso"
 
-#. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:975
+#. item "Water/Water/Stream"
+#: build/trans_presets.java:976
 msgid "Stream"
 msgstr "Torrente"
 
-#. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:977
+#. item "Water/Water/Stream" label "Edit Stream"
+#: build/trans_presets.java:978
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
-#. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:983
+#. item "Water/Water/Canal"
+#: build/trans_presets.java:984
 msgid "Canal"
 msgstr "Canale"
 
-#. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:985
+#. item "Water/Water/Canal" label "Edit Canal"
+#: build/trans_presets.java:986
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
-#. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:991
+#. item "Water/Water/River"
+#: build/trans_presets.java:993
 msgid "River"
 msgstr "Fiume"
 
-#. item "Water/Water/River"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
 #. 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:995
+#. item "Water/Water/River" label "Edit River"
+#: build/trans_presets.java:997
 msgid "Edit River"
 msgstr "Modifica un fiume"
 
-#. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1002
+#. item "Water/Water/Spring"
+#: build/trans_presets.java:1005
 msgid "Spring"
 msgstr "Sorgente"
 
-#. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1004
+#. item "Water/Water/Spring" label "Edit Spring"
+#: build/trans_presets.java:1007
 msgid "Edit Spring"
 msgstr "Modifica sorgente"
 
-#. item "Water/Water/Spring" text "Name"
-#: build/trans_presets.java:1008
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1011
 msgid "Waterfall"
 msgstr "Cascata"
 
-#. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1009
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#: build/trans_presets.java:1012
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
-#. item "Water/Water/Waterfall" text "Name"
-#: build/trans_presets.java:1014
+#. item "Water/Water/Weir"
+#: build/trans_presets.java:1018
 msgid "Weir"
 msgstr "Sbarramento"
 
-#. item "Water/Water/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1016
+#. item "Water/Water/Weir" label "Edit Weir"
+#: build/trans_presets.java:1020
 msgid "Edit Weir"
 msgstr "Modifica sbarramento"
 
-#. item "Water/Water/Weir" text "Name"
-#: build/trans_presets.java:1021
+#. item "Water/Water/Dam"
+#: build/trans_presets.java:1025
 msgid "Dam"
 msgstr "Diga"
 
-#. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1023
+#. item "Water/Water/Dam" label "Edit Dam"
+#: build/trans_presets.java:1027
 msgid "Edit Dam"
 msgstr "Modifica una diga"
 
-#. item "Water/Water/Dam" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1029
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1034
 msgid "Basin"
 msgstr "Bacino"
 
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1030
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
+#: build/trans_presets.java:1035
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1035
+#. item "Water/Water/Reservoir"
+#: build/trans_presets.java:1040
 msgid "Reservoir"
 msgstr "Serbatoio"
 
-#. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1037
+#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
+#: build/trans_presets.java:1042
 msgid "Edit Reservoir Landuse"
 msgstr "Modifica area di riserva d''acqua"
 
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1042
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1047
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1043
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
+#: build/trans_presets.java:1048
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
 
-#. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1050
+#. item "Water/Water/Water" label "Edit Water"
+#: build/trans_presets.java:1055
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
-#. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1054
+#. item "Water/Water/Land"
+#: build/trans_presets.java:1059
 msgid "Land"
 msgstr "Terraferma"
 
-#. item "Water/Water/Land"
-#: build/trans_presets.java:1055
+#. item "Water/Water/Land" label "Edit Land"
+#: build/trans_presets.java:1060
 msgid "Edit Land"
 msgstr "Modifica terraferma"
 
-#. item "Water/Water/Land" text "Name"
-#: build/trans_presets.java:1059
+#. item "Water/Water/Coastline"
+#: build/trans_presets.java:1064
 msgid "Coastline"
 msgstr "Linea di costa"
 
-#. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1061
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#: build/trans_presets.java:1066
 msgid "Edit Coastline"
 msgstr "Modifica linea di costa"
 
-#. item "Water/Water/Coastline" text "Name"
-#: build/trans_presets.java:1065
+#. item "Water/Water/Riverbank"
+#: build/trans_presets.java:1070
 msgid "Riverbank"
 msgstr "Argine"
 
-#. item "Water/Water/Riverbank"
 #. <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:1068
+#. item "Water/Water/Riverbank" label "Edit Riverbank"
+#: build/trans_presets.java:1073
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
-#. item "Water/Water/Riverbank" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1073
+#. item "Water/Water/Wetland"
+#: build/trans_presets.java:1078
 msgid "Wetland"
 msgstr "Zona umida"
 
-#. item "Water/Water/Wetland"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
 #. 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:1078
+#. item "Water/Water/Wetland" label "Edit Wetland"
+#: build/trans_presets.java:1083
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
-#. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "bog"
 msgstr "torbiera"
 
-#. color woodarea
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25663,97 +25685,96 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1081 build/trans_style.java:3549
+#. color marsh
+#: build/trans_presets.java:1086 build/trans_style.java:3549
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1086
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1083
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1088
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
-#. item "Water/Water/Mud"
-#: build/trans_presets.java:1084
+#. item "Water/Water/Mud" label "Edit Mud"
+#: build/trans_presets.java:1089
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
-#. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1088
+#. item "Water/Water/Beach"
+#: build/trans_presets.java:1093
 msgid "Beach"
 msgstr "Spiaggia"
 
-#. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1090
+#. item "Water/Water/Beach" label "Edit Beach"
+#: build/trans_presets.java:1095
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
-#. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1094
+#. item "Water/Water/Bay"
+#: build/trans_presets.java:1099
 msgid "Bay"
 msgstr "Baia"
 
-#. item "Water/Water/Bay"
-#: build/trans_presets.java:1095
+#. item "Water/Water/Bay" label "Edit Bay"
+#: build/trans_presets.java:1100
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
-#. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1099
+#. item "Water/Water/Cliff"
+#: build/trans_presets.java:1104
 msgid "Cliff"
 msgstr "Rupe"
 
-#. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1101
+#. item "Water/Water/Cliff" label "Edit Cliff"
+#: build/trans_presets.java:1106
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
-#. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1106
+#. group "Shipping"
+#: build/trans_presets.java:1111
 msgid "Shipping"
 msgstr "Navigazione"
 
-#. group "Shipping"
-#: build/trans_presets.java:1107
+#. item "Shipping/Ferry Terminal"
+#: build/trans_presets.java:1112
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
 
-#. item "Shipping/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1109
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#: build/trans_presets.java:1114
 msgid "Edit Ferry Terminal"
 msgstr "Modifica terminal traghetti"
 
-#. item "Shipping/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1117
 msgid "Cargo"
 msgstr "Trasporto"
 
-#. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "passengers"
 msgstr "passeggeri"
 
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "vehicle"
 msgstr "veicoli"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -25769,5 +25790,5 @@
 #. <rule>
 #. <condition k="bicycle" v="designated"/>
-#. color horse
+#. color bicycle
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -25777,5 +25798,5 @@
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
-#. color foot
+#. color bicycle
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -25795,5 +25816,5 @@
 #. <condition k="highway" v="path"/>
 #. <condition k="bicycle" v="official"/>
-#. color foot
+#. color bicycle
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25813,5 +25834,5 @@
 #. <condition k="bicycle" v="official"/>
 #. <condition k="foot" v="official"/>
-#. color roundabout
+#. color bicycle
 #. <!-- 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"/>
@@ -25856,5 +25877,6 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:1112 build/trans_presets.java:3586
+#. color bicycle
+#: build/trans_presets.java:1117 build/trans_presets.java:3612
 #: build/trans_style.java:233 build/trans_style.java:689
 #: build/trans_style.java:715 build/trans_style.java:723
@@ -25866,165 +25888,152 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "hgv"
 msgstr "merci pesanti/trasporti eccezionali"
 
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1117
 msgid "passengers;vehicle"
 msgstr "passeggeri;veicoli"
 
-#: build/trans_presets.java:1114
+#. item "Shipping/Ferry Route"
+#: build/trans_presets.java:1119
 msgid "Ferry Route"
 msgstr "Itinerario traghetto"
 
-#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1116
+#. item "Shipping/Ferry Route" label "Edit Ferry"
+#: build/trans_presets.java:1121
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
 
-#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1124
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1129
 msgid "Marina"
 msgstr "Porto turistico"
 
-#. item "Shipping/Marina"
-#: build/trans_presets.java:1125
+#. item "Shipping/Marina" label "Edit Marina"
+#: build/trans_presets.java:1130
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
-#. item "Shipping/Marina" text "Name"
-#: build/trans_presets.java:1129
+#. item "Shipping/Pier"
+#: build/trans_presets.java:1134
 msgid "Pier"
 msgstr "Passerella"
 
-#. item "Shipping/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1131
+#. item "Shipping/Pier" label "Edit Pier"
+#: build/trans_presets.java:1136
 msgid "Edit Pier"
 msgstr "Modifica passerella"
 
-#. item "Shipping/Pier" text "Name"
-#: build/trans_presets.java:1135
+#. item "Shipping/Lock Gate"
+#: build/trans_presets.java:1140
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
 
-#. 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:1139
+#. item "Shipping/Turning Point"
+#: build/trans_presets.java:1144
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
 
-#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
 #. <separator/>
-#: build/trans_presets.java:1144
+#. item "Shipping/Slipway"
+#: build/trans_presets.java:1149
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
 
-#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1148
+#. item "Shipping/Slipway" label "Edit Slipway"
+#: build/trans_presets.java:1153
 msgid "Edit Slipway"
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
 
-#. item "Shipping/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#. item "Shipping/Boatyard"
+#: build/trans_presets.java:1157
 msgid "Boatyard"
 msgstr "Cantiere navale"
 
-#. item "Shipping/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1154
+#. item "Shipping/Boatyard" label "Edit Boatyard"
+#: build/trans_presets.java:1159
 msgid "Edit Boatyard"
 msgstr "Modifica cantiere navale"
 
-#. item "Shipping/Boatyard" text "Name"
-#: build/trans_presets.java:1159
+#. item "Shipping/Dock"
+#: build/trans_presets.java:1164
 msgid "Dock"
 msgstr "Darsena/bacino navale"
 
-#. item "Shipping/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1161
+#. item "Shipping/Dock" label "Edit Dock"
+#: build/trans_presets.java:1166
 msgid "Edit Dock"
 msgstr "Modifica una darsena/bacino navale"
 
-#. item "Shipping/Dock" text "Name"
-#: build/trans_presets.java:1168
+#. group "Transport"
+#: build/trans_presets.java:1173
 msgid "Transport"
 msgstr "Trasporto"
 
-#. group "Transport"
-#: build/trans_presets.java:1169
+#. group "Transport/Railway"
+#: build/trans_presets.java:1174
 msgid "Railway"
 msgstr "Ferrovia"
 
-#. group "Transport/Railway"
-#: build/trans_presets.java:1170
+#. item "Transport/Railway/Rail"
+#: build/trans_presets.java:1175
 msgid "Rail"
 msgstr "Ferrovia"
 
-#. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1172
+#. item "Transport/Railway/Rail" label "Edit Rail"
+#: build/trans_presets.java:1177
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
 
-#. item "Transport/Railway/Rail" label "Edit Rail"
 #. <space />
 #. <key key="railway" value="rail" />
 #. <optional>
-#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
 #. <optional>
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="preserved" />
 #. <optional>
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="light_rail" />
 #. <optional>
-#. item "Transport/Railway/Subway" label "Edit Subway"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="subway" />
 #. <optional>
-#. item "Transport/Railway/Tram" label "Edit Tram"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. <space />
 #. <key key="railway" value="tram" />
 #. <optional>
-#: 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
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1217 build/trans_presets.java:1229
+#: build/trans_presets.java:1241 build/trans_presets.java:1253
 msgid "Gauge (mm)"
 msgstr "Scartamento (mm)"
 
-#. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
-#. item "Transport/Railway/Monorail" label "Edit Monorail"
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
 #. <space />
 #. <key key="railway" value="monorail" />
 #. <optional>
-#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
-#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
-#. item "Transport/Railway/Subway" combo "Gauge (mm)"
-#. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: 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 "Tipi"
-
-#. item "Transport/Railway/Rail" combo "Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
 #. item "Transport/Railway/Monorail" combo "Types"
 #. item "Transport/Railway/Preserved" combo "Types"
@@ -26032,32 +26041,31 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: 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
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254
+msgid "Types"
+msgstr "Tipi"
+
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1283
 msgid "yard"
 msgstr "tratto per lo smistamento delle merci"
 
-#: 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
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1283
 msgid "siding"
 msgstr "tratto parallelo ad una ferrovia principale"
 
-#: 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
+#: build/trans_presets.java:1182 build/trans_presets.java:1194
+#: build/trans_presets.java:1206 build/trans_presets.java:1218
+#: build/trans_presets.java:1230 build/trans_presets.java:1242
+#: build/trans_presets.java:1254 build/trans_presets.java:1283
 msgid "spur"
 msgstr "tratto per una società o ente"
-
-#: 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 "Elettrificato"
 
 #. item "Transport/Railway/Rail" combo "Electrified"
@@ -26068,12 +26076,18 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: 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:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255
+msgid "Electrified"
+msgstr "Elettrificato"
+
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255
 msgid "contact_line"
 msgstr "linea aerea"
 
-#. color foot
 #. <icon annotate="true" src="transport/steps.png"/>
 #. <scale_min>1</scale_min>
@@ -26083,5 +26097,5 @@
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
-#. color railwaypoint
+#. color rail
 #. <icon annotate="true" src="vehicle/crossing.png"/>
 #. <scale_min>1</scale_min>
@@ -26091,5 +26105,5 @@
 #. <rule>
 #. <condition k="railway" v="rail"/>
-#. color oldrail
+#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -26133,15 +26147,15 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
 #. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="funicular"/>
-#: 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_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1243
+#: build/trans_presets.java:1255 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
@@ -26150,13 +26164,4 @@
 msgid "rail"
 msgstr "ferrovia"
-
-#. 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: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:2741
-msgid "Voltage"
-msgstr "Tensione"
 
 #. item "Transport/Railway/Rail" combo "Voltage"
@@ -26167,10 +26172,12 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: 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 "Frequenza (Hz)"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_presets.java:1244
+#: build/trans_presets.java:1256 build/trans_presets.java:2750
+msgid "Voltage"
+msgstr "Tensione"
 
 #. item "Transport/Railway/Rail" combo "Frequency (Hz)"
@@ -26181,412 +26188,329 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: 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
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:1245
+#: build/trans_presets.java:1257
+msgid "Frequency (Hz)"
+msgstr "Frequenza (Hz)"
+
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:1245
+#: build/trans_presets.java:1257
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1183
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1188
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1184
+#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#: build/trans_presets.java:1189
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifica una ferrovia a scartamento ridotto"
 
 #. </optional>
-#: build/trans_presets.java:1195
+#. item "Transport/Railway/Monorail"
+#: build/trans_presets.java:1200
 msgid "Monorail"
 msgstr "Monorotaia"
 
-#. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1197
+#. item "Transport/Railway/Monorail" label "Edit Monorail"
+#: build/trans_presets.java:1202
 msgid "Edit Monorail"
 msgstr "Modifica una monorotaia"
 
 #. </optional>
-#: build/trans_presets.java:1207
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1212
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1208
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#: build/trans_presets.java:1213
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
 
 #. </optional>
-#: build/trans_presets.java:1219
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1224
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1220
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#: build/trans_presets.java:1225
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
 
 #. </optional>
-#: build/trans_presets.java:1231
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1236
 msgid "Subway"
 msgstr "Metropolitana"
 
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1232
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#: build/trans_presets.java:1237
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
 
 #. </optional>
-#: build/trans_presets.java:1243
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1248
 msgid "Tram"
 msgstr "Tramvia"
 
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1244
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#: build/trans_presets.java:1249
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
 
 #. </optional>
-#: build/trans_presets.java:1255
+#. item "Transport/Railway/Bus Guideway"
+#: build/trans_presets.java:1260
 msgid "Bus Guideway"
 msgstr "Autobus guidato"
 
-#. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1257
+#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
+#: build/trans_presets.java:1262
 msgid "Edit Bus Guideway"
 msgstr "Modificare autobus guidato"
 
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1274
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1279
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1275
+#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
+#: build/trans_presets.java:1280
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
 
-#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1278
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1283
 msgid "Optional Types"
 msgstr "Tipi opzionali"
 
-#: build/trans_presets.java:1280
+#. item "Transport/Railway/Abandoned Rail"
+#: build/trans_presets.java:1285
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
 
-#. item "Transport/Railway/Abandoned Rail"
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1284
+#. item "Transport/Railway/Level Crossing"
+#: build/trans_presets.java:1289
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
 
-#. item "Transport/Railway/Level Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1288
+#. item "Transport/Railway/Crossing"
+#: build/trans_presets.java:1293
 msgid "Crossing"
 msgstr "Attraversamento"
 
-#. item "Transport/Railway/Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1292
+#. item "Transport/Railway/Crossing" combo "Crossing type"
+#: build/trans_presets.java:1297
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
 
-#. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1298
+#. item "Transport/Railway/Turntable"
+#: build/trans_presets.java:1303
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
 
-#. item "Transport/Railway/Turntable"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1302
+#. item "Transport/Railway/Buffer Stop"
+#: build/trans_presets.java:1307
 msgid "Buffer Stop"
 msgstr "Respingente"
 
-#. item "Transport/Railway/Buffer Stop"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1307
+#. group "Aerialway"
+#: build/trans_presets.java:1312
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
-#. group "Aerialway"
-#: build/trans_presets.java:1308
+#. item "Aerialway/Chair Lift"
+#: build/trans_presets.java:1313
 msgid "Chair Lift"
 msgstr "Seggiovia"
 
-#. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1310
+#. item "Aerialway/Chair Lift" label "Edit Chair Lift"
+#: build/trans_presets.java:1315
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
-#. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1314
+#. item "Aerialway/Drag Lift"
+#: build/trans_presets.java:1319
 msgid "Drag Lift"
 msgstr "Ski-lift"
 
-#. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1316
+#. item "Aerialway/Drag Lift" label "Edit Drag Lift"
+#: build/trans_presets.java:1321
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
-#. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1320
+#. item "Aerialway/Cable Car"
+#: build/trans_presets.java:1325
 msgid "Cable Car"
 msgstr "Funivia"
 
-#. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1322
+#. item "Aerialway/Cable Car" label "Edit Cable Car"
+#: build/trans_presets.java:1327
 msgid "Edit Cable Car"
 msgstr "Modifica funivia"
 
-#. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1326
+#. item "Aerialway/Gondola"
+#: build/trans_presets.java:1331
 msgid "Gondola"
 msgstr "Cabinovia/Ovovia"
 
-#. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1328
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#: build/trans_presets.java:1333
 msgid "Edit Gondola"
 msgstr "Modifica cabinovia/ovovia"
 
-#. item "Aerialway/Gondola" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1333
+#. item "Aerialway/Station"
+#: build/trans_presets.java:1338
 msgctxt "aerialway"
 msgid "Station"
 msgstr "Stazione"
 
-#. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1335
+#. item "Aerialway/Station" label "Edit Station"
+#: build/trans_presets.java:1340
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Modifica stazione"
 
-#. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1339
+#. item "Aerialway/Pylon"
+#: build/trans_presets.java:1344
 msgctxt "aerialway"
 msgid "Pylon"
 msgstr "Pilone"
 
-#. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1341
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#: build/trans_presets.java:1346
 msgctxt "aerialway"
 msgid "Edit Pylon"
 msgstr "Modifica pilone"
 
-#. item "Aerialway/Pylon" text "Name"
-#: build/trans_presets.java:1345
+#. item "Aerialway/Goods"
+#: build/trans_presets.java:1350
 msgctxt "aerialway"
 msgid "Goods"
 msgstr "Teleferica"
 
-#. item "Aerialway/Goods"
-#: build/trans_presets.java:1346
+#. item "Aerialway/Goods" label "Edit Goods"
+#: build/trans_presets.java:1351
 msgctxt "aerialway"
 msgid "Edit Goods"
 msgstr "Modifica teleferica"
 
-#. group "Car"
-#: build/trans_presets.java:1353
+#. item "Car/Fuel"
+#: build/trans_presets.java:1358
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
 
-#. item "Car/Fuel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
 #. 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:1357
+#. item "Car/Fuel" label "Edit Fuel"
+#: build/trans_presets.java:1362
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
 
-#. 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:1359 build/trans_presets.java:1403
-#: build/trans_presets.java:1418 build/trans_presets.java:1426
-#: build/trans_presets.java:1441 build/trans_presets.java:1450
-#: build/trans_presets.java:1469
+#. item "Car/Fuel" combo "Brand"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1364 build/trans_presets.java:1408
+#: build/trans_presets.java:1423 build/trans_presets.java:1431
+#: build/trans_presets.java:1446 build/trans_presets.java:1455
+#: build/trans_presets.java:1474
 msgid "Brand"
 msgstr "Casa produttrice"
 
-#. item "Car/Fuel" combo "Brand"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1364
 msgid "Total"
 msgstr "Total"
 
-#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1359 build/trans_presets.java:1469
+#: build/trans_presets.java:1364 build/trans_presets.java:1474
 msgid "Independent"
 msgstr "Indipendente"
-
-#. 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/Pub" check "Microbrewery"
-#. item "Food+Drinks/Biergarten" text "Name"
-#. item "Food+Drinks/Bar" text "Name"
-#. item "Food+Drinks/Nightclub" text "Name"
-#. item "Tourism/Attraction" text "Name"
-#. item "Tourism/Museum" text "Name"
-#. item "Tourism/Zoo" text "Name"
-#. item "Tourism/Theme Park" text "Name"
-#. item "Tourism/Information Office" text "Name"
-#. item "Historic Places/Ruins" text "Name"
-#. item "Historic Places/Archaeological Site" text "Name"
-#. item "Sports/Sport Facilities/Golf Course" text "Name"
-#. item "Sports/Sport Facilities/Miniature Golf" text "Name"
-#. item "Man-Made/Buildings/Library" 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/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/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/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Toys" text "Name"
-#. item "Cash/Bank" text "Operator"
-#. item "Cash/Money Exchange" text "Name"
-#. item "Health/Doctors" text "Name"
-#. 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:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: 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:1950 build/trans_presets.java:1966
-#: build/trans_presets.java:1973 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:2021
-#: build/trans_presets.java:2109 build/trans_presets.java:2117
-#: build/trans_presets.java:2220 build/trans_presets.java:2226
-#: build/trans_presets.java:2590 build/trans_presets.java:2614
-#: build/trans_presets.java:2834 build/trans_presets.java:2841
-#: build/trans_presets.java:2848 build/trans_presets.java:2855
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2875 build/trans_presets.java:2881
-#: build/trans_presets.java:2889 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2908
-#: build/trans_presets.java:2914 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2934
-#: build/trans_presets.java:2941 build/trans_presets.java:2947
-#: build/trans_presets.java:2954 build/trans_presets.java:2960
-#: build/trans_presets.java:2966 build/trans_presets.java:2972
-#: build/trans_presets.java:2980 build/trans_presets.java:2987
-#: build/trans_presets.java:2994 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:3031 build/trans_presets.java:3057
-#: build/trans_presets.java:3065 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3094
-#: build/trans_presets.java:3107 build/trans_presets.java:3128
-msgid "Opening Hours"
-msgstr "Orario di apertura"
 
 #. item "Car/Fuel" combo "Opening Hours"
@@ -26605,4 +26529,5 @@
 #. item "Food+Drinks/Bar" combo "Opening Hours"
 #. item "Food+Drinks/Nightclub" combo "Opening Hours"
+#. item "Tourism/Attraction" text "Opening Hours"
 #. item "Tourism/Museum" combo "Opening Hours"
 #. item "Tourism/Zoo" combo "Opening Hours"
@@ -26651,198 +26576,235 @@
 #. item "Health/Dentist" combo "Opening Hours"
 #. item "Health/Pharmacy" combo "Opening Hours"
+#. item "Health/Baby Hatch" text "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: 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:1950 build/trans_presets.java:1973
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:2021 build/trans_presets.java:2109
-#: build/trans_presets.java:2117 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2590
-#: build/trans_presets.java:2614 build/trans_presets.java:2834
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2875
-#: build/trans_presets.java:2881 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2934 build/trans_presets.java:2941
-#: build/trans_presets.java:2947 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2994
-#: 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:3031
-#: build/trans_presets.java:3057 build/trans_presets.java:3065
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3128
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1972
+#: build/trans_presets.java:1979 build/trans_presets.java:1988
+#: build/trans_presets.java:1995 build/trans_presets.java:2029
+#: build/trans_presets.java:2118 build/trans_presets.java:2126
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2599 build/trans_presets.java:2623
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2864
+#: build/trans_presets.java:2871 build/trans_presets.java:2877
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2898 build/trans_presets.java:2904
+#: build/trans_presets.java:2910 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2930
+#: build/trans_presets.java:2936 build/trans_presets.java:2943
+#: build/trans_presets.java:2950 build/trans_presets.java:2956
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3003 build/trans_presets.java:3010
+#: build/trans_presets.java:3016 build/trans_presets.java:3022
+#: build/trans_presets.java:3028 build/trans_presets.java:3034
+#: build/trans_presets.java:3040 build/trans_presets.java:3066
+#: build/trans_presets.java:3074 build/trans_presets.java:3089
+#: build/trans_presets.java:3095 build/trans_presets.java:3103
+#: build/trans_presets.java:3116 build/trans_presets.java:3137
+msgid "Opening Hours"
+msgstr "Orario di apertura"
+
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1979
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2029 build/trans_presets.java:2118
+#: build/trans_presets.java:2126 build/trans_presets.java:2229
+#: build/trans_presets.java:2235 build/trans_presets.java:2599
+#: build/trans_presets.java:2623 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
+#: build/trans_presets.java:2877 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2898
+#: build/trans_presets.java:2904 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2943 build/trans_presets.java:2950
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3003
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3034 build/trans_presets.java:3040
+#: build/trans_presets.java:3066 build/trans_presets.java:3074
+#: build/trans_presets.java:3089 build/trans_presets.java:3095
+#: build/trans_presets.java:3103 build/trans_presets.java:3137
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: 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:1950 build/trans_presets.java:1973
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:2021 build/trans_presets.java:2109
-#: build/trans_presets.java:2117 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2590
-#: build/trans_presets.java:2614 build/trans_presets.java:2834
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2875
-#: build/trans_presets.java:2881 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2934 build/trans_presets.java:2941
-#: build/trans_presets.java:2947 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2994
-#: 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:3031
-#: build/trans_presets.java:3057 build/trans_presets.java:3065
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3128
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1979
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2029 build/trans_presets.java:2118
+#: build/trans_presets.java:2126 build/trans_presets.java:2229
+#: build/trans_presets.java:2235 build/trans_presets.java:2599
+#: build/trans_presets.java:2623 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
+#: build/trans_presets.java:2877 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2898
+#: build/trans_presets.java:2904 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2943 build/trans_presets.java:2950
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3003
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3034 build/trans_presets.java:3040
+#: build/trans_presets.java:3066 build/trans_presets.java:3074
+#: build/trans_presets.java:3089 build/trans_presets.java:3095
+#: build/trans_presets.java:3103 build/trans_presets.java:3137
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
 
-#: build/trans_presets.java:1363 build/trans_presets.java:1405
-#: build/trans_presets.java:1420 build/trans_presets.java:1428
-#: build/trans_presets.java:1443 build/trans_presets.java:1452
-#: build/trans_presets.java:1471 build/trans_presets.java:1825
-#: 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:1950 build/trans_presets.java:1973
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:2021 build/trans_presets.java:2109
-#: build/trans_presets.java:2117 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2590
-#: build/trans_presets.java:2614 build/trans_presets.java:2834
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2875
-#: build/trans_presets.java:2881 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2914
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2934 build/trans_presets.java:2941
-#: build/trans_presets.java:2947 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2994
-#: 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:3031
-#: build/trans_presets.java:3057 build/trans_presets.java:3065
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3128
+#: build/trans_presets.java:1368 build/trans_presets.java:1410
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1448 build/trans_presets.java:1457
+#: build/trans_presets.java:1476 build/trans_presets.java:1831
+#: build/trans_presets.java:1851 build/trans_presets.java:1868
+#: build/trans_presets.java:1887 build/trans_presets.java:1906
+#: build/trans_presets.java:1922 build/trans_presets.java:1939
+#: build/trans_presets.java:1956 build/trans_presets.java:1979
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2029 build/trans_presets.java:2118
+#: build/trans_presets.java:2126 build/trans_presets.java:2229
+#: build/trans_presets.java:2235 build/trans_presets.java:2599
+#: build/trans_presets.java:2623 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
+#: build/trans_presets.java:2877 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2898
+#: build/trans_presets.java:2904 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2943 build/trans_presets.java:2950
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3003
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3034 build/trans_presets.java:3040
+#: build/trans_presets.java:3066 build/trans_presets.java:3074
+#: build/trans_presets.java:3089 build/trans_presets.java:3095
+#: build/trans_presets.java:3103 build/trans_presets.java:3137
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00;Sa 08:00-12:00"
 
-#: build/trans_presets.java:1364
+#. item "Car/Fuel" combo "With shop"
+#: build/trans_presets.java:1369
 msgid "With shop"
 msgstr "Con negozio"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1369
 msgid "convenience"
 msgstr "drogheria"
 
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1369
 msgid "kiosk"
 msgstr "chiosco"
 
-#: build/trans_presets.java:1365
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1370
 msgid "Fuel types:"
 msgstr "Tipi di carburante:"
 
-#. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1366
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1371
 msgid "Diesel"
 msgstr "Diesel"
 
-#. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1367
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1372
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
-#. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1368
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1373
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1369
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1374
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel per veicoli di trasporto merci pesanti"
 
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1370
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1375
 msgid "Octane 91"
 msgstr "91 ottani"
 
-#. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1371
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1376
 msgid "Octane 95"
 msgstr "95 ottani"
 
-#. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1372
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1377
 msgid "Octane 98"
 msgstr "98 ottani"
 
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1373
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1378
 msgid "Octane 100"
 msgstr "100 ottani"
 
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1374
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1379
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (miscela 10% etanolo)"
 
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1375
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1380
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (miscela 85% etanolo)"
 
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1376
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1381
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (gas di petrolio liquefatto)"
 
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1377
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1382
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNC (gas naturale compresso)"
 
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1378
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1383
 msgid "1/25 mix (mofa/moped)"
 msgstr "Miscela 1/25 (mofa/moped)"
 
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1379
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#: build/trans_presets.java:1384
 msgid "1/50 mix (mofa/moped)"
 msgstr "Miscela 1/50 (mofa/moped)"
 
-#. 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">
+#. item "Car/Parking"
+#. item "Motorcycle/Parking"
+#. item "Bicycle/Parking"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="village"/>
@@ -26852,171 +26814,180 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1382 build/trans_presets.java:1456
-#: build/trans_presets.java:1486 build/trans_surveyor.java:24
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
+#: build/trans_presets.java:1387 build/trans_presets.java:1461
+#: build/trans_presets.java:1491 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parcheggio"
 
-#. item "Car/Parking"
 #. <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:1385
+#. item "Car/Parking" label "Edit Parking"
+#: build/trans_presets.java:1390
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
 
-#. item "Car/Parking" text "Name"
-#. item "Tourism/Information Terminal" text "Operator"
-#. item "Tourism/Audioguide" text "Operator"
-#. item "Amenities/Toilets" text "Operator"
-#. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1388 build/trans_presets.java:2074
-#: build/trans_presets.java:2084 build/trans_presets.java:2752
-#: build/trans_presets.java:3040
-msgid "Reference number"
-msgstr "Numero di riferimento"
-
-#. item "Car/Parking" combo "Type"
-#. item "Motorcycle/Parking" combo "Type"
-#: build/trans_presets.java:1389 build/trans_presets.java:1461
-msgid "multi-storey"
-msgstr "multi-piano"
-
-#: build/trans_presets.java:1389 build/trans_presets.java:1461
-msgid "surface"
-msgstr "superficie"
-
-#. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1389 build/trans_presets.java:1461
-#: build/trans_presets.java:2662
-msgid "underground"
-msgstr "sotterraneo"
-
-#: build/trans_presets.java:1390
-msgid "Park and Ride"
-msgstr "Parcheggio di interscambio"
-
+#. item "Car/Parking" text "Reference number"
 #. item "Tourism/Information Terminal" text "Reference number"
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1391 build/trans_presets.java:1462
-#: build/trans_presets.java:2075 build/trans_presets.java:2085
-#: build/trans_presets.java:2753
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:1393 build/trans_presets.java:2082
+#: build/trans_presets.java:2092 build/trans_presets.java:2761
+#: build/trans_presets.java:3049
+msgid "Reference number"
+msgstr "Numero di riferimento"
+
+#: build/trans_presets.java:1394 build/trans_presets.java:1466
+msgid "multi-storey"
+msgstr "multi-piano"
+
+#: build/trans_presets.java:1394 build/trans_presets.java:1466
+msgid "surface"
+msgstr "superficie"
+
+#: build/trans_presets.java:1394 build/trans_presets.java:1466
+#: build/trans_presets.java:2671
+msgid "underground"
+msgstr "sotterraneo"
+
+#. item "Car/Parking" combo "Park and Ride"
+#: build/trans_presets.java:1395
+msgid "Park and Ride"
+msgstr "Parcheggio di interscambio"
+
+#. item "Car/Parking" combo "Fee"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Tourism/Information Terminal" combo "Fee"
+#. item "Tourism/Audioguide" combo "Fee"
+#. item "Amenities/Toilets" combo "Fee"
+#: build/trans_presets.java:1396 build/trans_presets.java:1467
+#: build/trans_presets.java:2083 build/trans_presets.java:2093
+#: build/trans_presets.java:2762
 msgid "Fee"
 msgstr "Tariffa"
 
 #. <space />
-#: build/trans_presets.java:1393
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1398
 msgid "Capacity (overall)"
 msgstr "Capacità (totale)"
 
-#. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1394
+#. item "Car/Parking" combo "Spaces for Disabled"
+#: build/trans_presets.java:1399
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
-#: build/trans_presets.java:1395
+#. item "Car/Parking" combo "Spaces for Women"
+#: build/trans_presets.java:1400
 msgid "Spaces for Women"
 msgstr "Spazi per le donne"
 
-#: build/trans_presets.java:1396
+#. item "Car/Parking" combo "Spaces for Parents"
+#: build/trans_presets.java:1401
 msgid "Spaces for Parents"
 msgstr "Spazi per gli elementi da cui dipende"
 
-#: build/trans_presets.java:1397
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1402
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Vedere il Wiki per un''altra capacità:[tipi]=*."
 
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1399
+#. item "Car/Wash"
+#: build/trans_presets.java:1404
 msgid "Wash"
 msgstr "Autolavaggio"
 
-#. item "Car/Wash"
-#: build/trans_presets.java:1400
+#. item "Car/Wash" label "Edit Car Wash"
+#: build/trans_presets.java:1405
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
 
-#: build/trans_presets.java:1407
+#. item "Car/Car Dealer"
+#: build/trans_presets.java:1412
 msgid "Car Dealer"
 msgstr "Concessionaria"
 
-#. item "Car/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1409
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#: build/trans_presets.java:1414
 msgid "Edit Car Shop"
 msgstr "Modifica concessionaria"
 
-#. item "Car/Car Dealer" text "Operator"
-#: build/trans_presets.java:1414 build/trans_presets.java:1475
+#. item "Car/Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#: build/trans_presets.java:1419 build/trans_presets.java:1480
 msgid "Repair"
 msgstr "Autofficina"
 
-#. item "Car/Repair"
-#: build/trans_presets.java:1415
+#. item "Car/Repair" label "Edit Car Repair"
+#: build/trans_presets.java:1420
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
 
-#: build/trans_presets.java:1422
+#. item "Car/Tyres"
+#: build/trans_presets.java:1427
 msgid "Tyres"
 msgstr "Pneumatici"
 
-#. item "Car/Tyres"
-#: build/trans_presets.java:1423
+#. item "Car/Tyres" label "Edit Tyres"
+#: build/trans_presets.java:1428
 msgid "Edit Tyres"
 msgstr "Modifica pneumatici"
 
-#: build/trans_presets.java:1429 build/trans_presets.java:1478
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#: build/trans_presets.java:1434 build/trans_presets.java:1483
 msgid "Contact:"
 msgstr "Contatto:"
 
-#. item "Car/Tyres" label "Contact:"
-#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
 #. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#. item "Annotation/Contact" label "Edit Contact information"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
 #. <space />
-#: build/trans_presets.java:1430 build/trans_presets.java:1479
-#: build/trans_presets.java:1690 build/trans_presets.java:1708
-#: build/trans_presets.java:1724 build/trans_presets.java:1741
-#: build/trans_presets.java:1759 build/trans_presets.java:1776
-#: build/trans_presets.java:1793 build/trans_presets.java:1810
-#: build/trans_presets.java:1833 build/trans_presets.java:1852
-#: build/trans_presets.java:1869 build/trans_presets.java:1888
-#: build/trans_presets.java:1907 build/trans_presets.java:1923
-#: build/trans_presets.java:1940 build/trans_presets.java:1955
-#: build/trans_presets.java:3118 build/trans_presets.java:3522
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. <space />
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Health/Emergency Access Point" text "Phone Number"
+#. <space />
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1435 build/trans_presets.java:1484
+#: build/trans_presets.java:1696 build/trans_presets.java:1714
+#: build/trans_presets.java:1730 build/trans_presets.java:1747
+#: build/trans_presets.java:1765 build/trans_presets.java:1782
+#: build/trans_presets.java:1799 build/trans_presets.java:1816
+#: build/trans_presets.java:1839 build/trans_presets.java:1858
+#: build/trans_presets.java:1875 build/trans_presets.java:1894
+#: build/trans_presets.java:1913 build/trans_presets.java:1929
+#: build/trans_presets.java:1946 build/trans_presets.java:1961
+#: build/trans_presets.java:3127 build/trans_presets.java:3548
 msgid "Phone Number"
 msgstr "Numero di telefono"
-
-#. 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:1431 build/trans_presets.java:1480
-#: build/trans_presets.java:1691 build/trans_presets.java:1709
-#: build/trans_presets.java:1725 build/trans_presets.java:1742
-#: build/trans_presets.java:1760 build/trans_presets.java:1777
-#: build/trans_presets.java:1794 build/trans_presets.java:1811
-#: build/trans_presets.java:1834 build/trans_presets.java:1853
-#: build/trans_presets.java:1870 build/trans_presets.java:1889
-#: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_presets.java:1956
-#: build/trans_presets.java:3523
-msgid "Fax Number"
-msgstr "Numero di fax"
 
 #. item "Car/Tyres" text "Fax Number"
@@ -27039,17 +27010,16 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#. <space />
-#: build/trans_presets.java:1432 build/trans_presets.java:1481
-#: build/trans_presets.java:1692 build/trans_presets.java:1710
-#: build/trans_presets.java:1726 build/trans_presets.java:1743
-#: build/trans_presets.java:1761 build/trans_presets.java:1778
-#: build/trans_presets.java:1795 build/trans_presets.java:1812
-#: build/trans_presets.java:1835 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1890
-#: build/trans_presets.java:1909 build/trans_presets.java:1925
-#: build/trans_presets.java:1942 build/trans_presets.java:1957
-#: build/trans_presets.java:3525
-msgid "Website"
-msgstr "Sito Web"
+#: build/trans_presets.java:1436 build/trans_presets.java:1485
+#: build/trans_presets.java:1697 build/trans_presets.java:1715
+#: build/trans_presets.java:1731 build/trans_presets.java:1748
+#: build/trans_presets.java:1766 build/trans_presets.java:1783
+#: build/trans_presets.java:1800 build/trans_presets.java:1817
+#: build/trans_presets.java:1840 build/trans_presets.java:1859
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1914 build/trans_presets.java:1930
+#: build/trans_presets.java:1947 build/trans_presets.java:1962
+#: build/trans_presets.java:3549
+msgid "Fax Number"
+msgstr "Numero di fax"
 
 #. item "Car/Tyres" text "Website"
@@ -27071,6 +27041,605 @@
 #. item "Food+Drinks/Bar" text "Website"
 #. item "Food+Drinks/Nightclub" text "Website"
+#. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1433 build/trans_presets.java:1482
+#: build/trans_presets.java:1437 build/trans_presets.java:1486
+#: build/trans_presets.java:1698 build/trans_presets.java:1716
+#: build/trans_presets.java:1732 build/trans_presets.java:1749
+#: build/trans_presets.java:1767 build/trans_presets.java:1784
+#: build/trans_presets.java:1801 build/trans_presets.java:1818
+#: build/trans_presets.java:1841 build/trans_presets.java:1860
+#: build/trans_presets.java:1877 build/trans_presets.java:1896
+#: build/trans_presets.java:1915 build/trans_presets.java:1931
+#: build/trans_presets.java:1948 build/trans_presets.java:1963
+#: build/trans_presets.java:3551
+msgid "Website"
+msgstr "Sito Web"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#. item "Food+Drinks/Food Court" text "Email Address"
+#. item "Food+Drinks/Cafe" text "Email Address"
+#. item "Food+Drinks/Pub" text "Email Address"
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#. item "Food+Drinks/Bar" text "Email Address"
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#. item "Annotation/Contact" text "Email Address"
+#: build/trans_presets.java:1438 build/trans_presets.java:1487
+#: build/trans_presets.java:1699 build/trans_presets.java:1717
+#: build/trans_presets.java:1733 build/trans_presets.java:1750
+#: build/trans_presets.java:1768 build/trans_presets.java:1785
+#: build/trans_presets.java:1802 build/trans_presets.java:1819
+#: build/trans_presets.java:1842 build/trans_presets.java:1861
+#: build/trans_presets.java:1878 build/trans_presets.java:1897
+#: build/trans_presets.java:1916 build/trans_presets.java:1932
+#: build/trans_presets.java:1949 build/trans_presets.java:1964
+#: build/trans_presets.java:3552
+msgid "Email Address"
+msgstr "Indirizzo email"
+
+#. item "Car/Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Bicycle/Rental"
+#: build/trans_presets.java:1440 build/trans_presets.java:1479
+#: build/trans_presets.java:1505
+msgid "Rental"
+msgstr "Noleggio"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
+#. item "Car/Rental" label "Edit Car Rental"
+#: build/trans_presets.java:1443
+msgid "Edit Car Rental"
+msgstr "Modifica noleggio automobili"
+
+#. item "Car/Sharing"
+#: build/trans_presets.java:1450
+msgid "Sharing"
+msgstr "Condivisione"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
+#. item "Car/Sharing" label "Edit Car Sharing"
+#: build/trans_presets.java:1452
+msgid "Edit Car Sharing"
+msgstr "Modifica condivisione automobili"
+
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#: build/trans_presets.java:1462
+msgid "Edit Motorcycle Parking"
+msgstr "Modifica parcheggio per motociclette"
+
+#. item "Motorcycle/Parking" text "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1465 build/trans_presets.java:1496
+msgid "Capacity"
+msgstr "Capacità"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#: build/trans_presets.java:1469
+msgid "Motorcycle Dealer"
+msgstr "Concessionario di motociclette"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#: build/trans_presets.java:1471
+msgid "Edit Shop Motorcycle"
+msgstr "Modifica concessionario di motociclette"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1477
+msgid "Services:"
+msgstr "Servizi:"
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#: build/trans_presets.java:1478
+msgid "Sale"
+msgstr "Vendita"
+
+#: build/trans_presets.java:1480 build/trans_presets.java:1481
+msgid "brand"
+msgstr "casa produttrice"
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#: build/trans_presets.java:1481
+msgid "Parts"
+msgstr "Componenti"
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
+#. item "Amenities/Recycling" check "Clothes"
+#. <separator/>
+#. item "Shops/Clothes"
+#: build/trans_presets.java:1482 build/trans_presets.java:2791
+#: build/trans_presets.java:2913
+msgid "Clothes"
+msgstr "Abbigliamento"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
+#. item "Bicycle/Parking" label "Edit Bicycle Parking"
+#: build/trans_presets.java:1493
+msgid "Edit Bicycle Parking"
+msgstr "Modifica parcheggio per biciclette"
+
+#. item "Bicycle/Bike Dealer"
+#: build/trans_presets.java:1498
+msgid "Bike Dealer"
+msgstr "Negozio di biciclette"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#: build/trans_presets.java:1501
+msgid "Edit Bicycle Shop"
+msgstr "Modifica negozio di biciclette"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
+#. item "Bicycle/Rental" label "Edit Bicycle Rental"
+#: build/trans_presets.java:1508
+msgid "Edit Bicycle Rental"
+msgstr "Modifica noleggio biciclette"
+
+#. item "Public Transport/Station"
+#: build/trans_presets.java:1514
+msgctxt "railway"
+msgid "Station"
+msgstr "Stazione"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
+#. item "Public Transport/Station" label "Edit Station"
+#: build/trans_presets.java:1517
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Modifica stazione"
+
+#. item "Public Transport/Station" text "UIC-Reference"
+#: build/trans_presets.java:1522
+msgid "UIC-Reference"
+msgstr "Riferimento UIC"
+
+#. </optional>
+#. item "Public Transport/Railway Halt"
+#: build/trans_presets.java:1525
+msgid "Railway Halt"
+msgstr "Stazione ferroviaria non presidiata"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
+#. item "Public Transport/Railway Halt" label "Edit Halt"
+#: build/trans_presets.java:1527
+msgid "Edit Halt"
+msgstr "Modifica stazione non presidiata"
+
+#. </optional>
+#. item "Public Transport/Tram Stop"
+#: build/trans_presets.java:1534
+msgid "Tram Stop"
+msgstr "Fermata del tram"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
+#. item "Public Transport/Tram Stop" label "Edit Tram Stop"
+#: build/trans_presets.java:1537
+msgid "Edit Tram Stop"
+msgstr "Modifica fermata del tram"
+
+#. </optional>
+#. item "Public Transport/Railway Platform"
+#: build/trans_presets.java:1544
+msgid "Railway Platform"
+msgstr "Piattaforma ferroviaria"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
+#. item "Public Transport/Railway Platform" label "Edit Railway Platform"
+#: build/trans_presets.java:1547
+msgid "Edit Railway Platform"
+msgstr "Modifica una piattaforma ferroviaria"
+
+#. <key key="railway" value="platform" />
+#. <space />
+#. item "Public Transport/Railway Platform" text "Reference (track number)"
+#. <key key="highway" value="platform" />
+#. <space />
+#. item "Public Transport/Bus Platform" text "Reference (track number)"
+#: build/trans_presets.java:1550 build/trans_presets.java:1595
+msgid "Reference (track number)"
+msgstr "Riferimento (numero del tracciato)"
+
+#. item "Public Transport/Railway Platform" check "Area"
+#. item "Public Transport/Bus Platform" check "Area"
+#: build/trans_presets.java:1552 build/trans_presets.java:1597
+msgid "Area"
+msgstr "Area"
+
+#. item "Public Transport/Subway Entrance"
+#: build/trans_presets.java:1554
+msgid "Subway Entrance"
+msgstr "Ingresso metropolitana"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
+#. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
+#: build/trans_presets.java:1557
+msgid "Edit Subway Entrance"
+msgstr "Modifica ingresso metropolitana"
+
+#. item "Public Transport/Subway Entrance" check "Wheelchair"
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:1562 build/trans_presets.java:2763
+msgid "Wheelchair"
+msgstr "Sedia a rotelle"
+
+#. </optional>
+#. <separator/>
+#. item "Public Transport/Bus Station"
+#: build/trans_presets.java:1567
+msgid "Bus Station"
+msgstr "Stazione degli autobus"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
+#. item "Public Transport/Bus Station" label "Edit Bus Station"
+#: build/trans_presets.java:1570
+msgid "Edit Bus Station"
+msgstr "Modifica una stazione degli autobus"
+
+#. </optional>
+#. item "Public Transport/Bus Stop"
+#: build/trans_presets.java:1576
+msgid "Bus Stop"
+msgstr "Fermata dell''autobus"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
+#. item "Public Transport/Bus Stop" label "Edit Bus Stop"
+#: build/trans_presets.java:1580
+msgid "Edit Bus Stop"
+msgstr "Modifica fermata dell''autobus"
+
+#. item "Public Transport/Bus Stop" combo "Shelter"
+#. item "Tourism/Shelter"
+#. item "Amenities/Hunting Stand" combo "Shelter"
+#: build/trans_presets.java:1585 build/trans_presets.java:2011
+#: build/trans_presets.java:2813
+msgid "Shelter"
+msgstr "Pensilina/ricovero"
+
+#. item "Public Transport/Bus Stop" combo "Bench"
+#. <key key="amenity" value="waste_basket" />
+#. item "Amenities/Bench"
+#: build/trans_presets.java:1586 build/trans_presets.java:2801
+msgid "Bench"
+msgstr "Panchina"
+
+#. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#: build/trans_presets.java:1587
+msgid "Tactile Paving"
+msgstr "Pavimentazione tattile"
+
+#. </optional>
+#. item "Public Transport/Bus Platform"
+#: build/trans_presets.java:1591
+msgid "Bus Platform"
+msgstr "Piattaforma fermata bus"
+
+#. item "Public Transport/Bus Platform" label "Edit Bus Platform"
+#: build/trans_presets.java:1592
+msgid "Edit Bus Platform"
+msgstr "Modifica una piattaforma degli autobus"
+
+#. <separator/>
+#. item "Public Transport/Taxi"
+#: build/trans_presets.java:1600
+msgid "Taxi"
+msgstr "Taxi"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
+#. item "Public Transport/Taxi" label "Edit Taxi station"
+#: build/trans_presets.java:1602
+msgid "Edit Taxi station"
+msgstr "Stazione dei taxi"
+
+#. <separator/>
+#. group "Airport"
+#: build/trans_presets.java:1608
+msgid "Airport"
+msgstr "Aeroporto"
+
+#. item "Airport/Airport Ground"
+#: build/trans_presets.java:1609
+msgid "Airport Ground"
+msgstr "Terreno aeroportuale"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
+#: build/trans_presets.java:1611
+msgid "Edit Airport Ground"
+msgstr "Modifica terreno aeroportuale"
+
+#. <optional>
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1615
+msgid "IATA"
+msgstr "IATA"
+
+#. item "Airport/Airport Ground" text "ICAO"
+#: build/trans_presets.java:1616
+msgid "ICAO"
+msgstr "ICAO"
+
+#. </optional>
+#. <separator/>
+#. item "Airport/Runway"
+#: build/trans_presets.java:1621
+msgid "Runway"
+msgstr "Pista di decollo/atterraggio"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#. item "Airport/Runway" label "Edit Runway"
+#: build/trans_presets.java:1623
+msgid "Edit Runway"
+msgstr "Modifica pista di decollo/atterraggio"
+
+#. </optional>
+#. item "Airport/Taxiway"
+#: build/trans_presets.java:1629
+msgid "Taxiway"
+msgstr "Pista di rullaggio"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#: build/trans_presets.java:1631
+msgid "Edit Taxiway"
+msgstr "Modifica pista di rullaggio"
+
+#. </optional>
+#. item "Airport/Helipad"
+#: build/trans_presets.java:1637
+msgid "Helipad"
+msgstr "Eliporto"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#. item "Airport/Helipad" label "Edit Helipad"
+#: build/trans_presets.java:1639
+msgid "Edit Helipad"
+msgstr "Modifica eliporto"
+
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#. item "Airport/Apron" label "Apron"
+#: build/trans_presets.java:1645 build/trans_presets.java:1647
+msgid "Apron"
+msgstr "Parcheggio aeromobili"
+
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#. item "Airport/Hangar" label "Hangar"
+#: build/trans_presets.java:1650 build/trans_presets.java:1652
+msgid "Hangar"
+msgstr "Hangar"
+
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Airport/Beacon" label "Beacon"
+#. item "Man Made/Beacon"
+#: build/trans_presets.java:1655 build/trans_presets.java:1657
+#: build/trans_presets.java:2687
+msgid "Beacon"
+msgstr "Torre radio"
+
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#. item "Airport/Windsock" label "Windsock"
+#: build/trans_presets.java:1660 build/trans_presets.java:1662
+msgid "Windsock"
+msgstr "Manica a vento"
+
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#. item "Airport/Terminal"
+#: build/trans_presets.java:1666
+msgid "Terminal"
+msgstr "Terminale"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#: build/trans_presets.java:1668
+msgid "Edit Terminal"
+msgstr "Modifica terminal aeroportuale"
+
+#. item "Airport/Gate"
+#: build/trans_presets.java:1672
+msgctxt "airport"
+msgid "Gate"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#: build/trans_presets.java:1674
+msgid "Edit Terminal Gate"
+msgstr "Modifica varco terminal aeroportuale"
+
+#. group "Travel"
+#: build/trans_presets.java:1680
+msgid "Travel"
+msgstr "Viaggio"
+
+#. group "Travel/Accomodation"
+#: build/trans_presets.java:1681
+msgid "Accomodation"
+msgstr "Alloggiamento"
+
+#. item "Travel/Accomodation/Hotel"
+#. <!--action class="SetNodeAction" params="amenity=fuel"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Fuel"/>
+#. </button>
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
+#: build/trans_presets.java:1682 build/trans_surveyor.java:43
+msgid "Hotel"
+msgstr "Hotel"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
+#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
+#: build/trans_presets.java:1685
+msgid "Edit Hotel"
+msgstr "Modifica hotel"
+
+#. item "Travel/Accomodation/Hotel" combo "Stars"
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#: build/trans_presets.java:1689 build/trans_presets.java:1707
+#: build/trans_presets.java:1723 build/trans_presets.java:1740
+#: build/trans_presets.java:1758 build/trans_presets.java:1792
+#: build/trans_presets.java:1809 build/trans_presets.java:1832
+msgid "Stars"
+msgstr "Stelle"
+
+#. <space />
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. <space />
+#. item "Food+Drinks/Bar" combo "Internet access"
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941
+msgid "Internet access"
+msgstr "Accesso ad Internet"
+
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941
+msgid "wlan"
+msgstr "wlan"
+
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941
+msgid "wired"
+msgstr "via cavo"
+
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#. color terminal
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal aeroportuale"
+
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#: build/trans_presets.java:1692 build/trans_presets.java:1710
+#: build/trans_presets.java:1726 build/trans_presets.java:1743
+#: build/trans_presets.java:1761 build/trans_presets.java:1778
+#: build/trans_presets.java:1795 build/trans_presets.java:1812
+#: build/trans_presets.java:1835 build/trans_presets.java:1854
+#: build/trans_presets.java:1871 build/trans_presets.java:1890
+#: build/trans_presets.java:1909 build/trans_presets.java:1925
+#: build/trans_presets.java:1942
+msgid "Internet access fee"
+msgstr "Tariffa di accesso ad Internet"
+
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. <space />
+#. item "Food+Drinks/Nightclub" combo "Smoking"
 #: build/trans_presets.java:1693 build/trans_presets.java:1711
 #: build/trans_presets.java:1727 build/trans_presets.java:1744
@@ -27081,926 +27650,422 @@
 #: build/trans_presets.java:1910 build/trans_presets.java:1926
 #: build/trans_presets.java:1943 build/trans_presets.java:1958
-#: build/trans_presets.java:3526
-msgid "Email Address"
-msgstr "Indirizzo email"
-
-#. item "Car/Tyres" text "Email Address"
-#. item "Bicycle/Bike Dealer" text "Name"
-#: build/trans_presets.java:1435 build/trans_presets.java:1474
-#: build/trans_presets.java:1500
-msgid "Rental"
-msgstr "Noleggio"
-
-#. item "Car/Rental"
-#. <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:1438
-msgid "Edit Car Rental"
-msgstr "Modifica noleggio automobili"
-
-#: build/trans_presets.java:1445
-msgid "Sharing"
-msgstr "Condivisione"
-
-#. item "Car/Sharing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1447
-msgid "Edit Car Sharing"
-msgstr "Modifica condivisione automobili"
-
-#. item "Motorcycle/Parking"
-#: build/trans_presets.java:1457
-msgid "Edit Motorcycle Parking"
-msgstr "Modifica parcheggio per motociclette"
-
-#. item "Motorcycle/Parking" text "Name"
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1460 build/trans_presets.java:1491
-msgid "Capacity"
-msgstr "Capacità"
-
-#: build/trans_presets.java:1464
-msgid "Motorcycle Dealer"
-msgstr "Concessionario di motociclette"
-
-#. item "Motorcycle/Motorcycle Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
-#: build/trans_presets.java:1466
-msgid "Edit Shop Motorcycle"
-msgstr "Modifica concessionario di motociclette"
-
-#: build/trans_presets.java:1472
-msgid "Services:"
-msgstr "Servizi:"
-
-#. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1473
-msgid "Sale"
-msgstr "Vendita"
-
-#: build/trans_presets.java:1475 build/trans_presets.java:1476
-msgid "brand"
-msgstr "casa produttrice"
-
-#: build/trans_presets.java:1476
-msgid "Parts"
-msgstr "Componenti"
-
-#. item "Amenities/Recycling" check "Cans"
-#. <separator/>
-#: build/trans_presets.java:1477 build/trans_presets.java:2782
-#: build/trans_presets.java:2904
-msgid "Clothes"
-msgstr "Abbigliamento"
-
-#. item "Bicycle/Parking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1488
-msgid "Edit Bicycle Parking"
-msgstr "Modifica parcheggio per biciclette"
-
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1493
-msgid "Bike Dealer"
-msgstr "Negozio di biciclette"
-
-#. 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:1496
-msgid "Edit Bicycle Shop"
-msgstr "Modifica negozio di biciclette"
-
-#. 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:1503
-msgid "Edit Bicycle Rental"
-msgstr "Modifica noleggio biciclette"
-
-#. group "Public Transport"
-#: build/trans_presets.java:1509
-msgctxt "railway"
-msgid "Station"
-msgstr "Stazione"
-
-#. item "Public Transport/Station"
-#. <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:1512
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Modifica stazione"
-
-#. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1517
-msgid "UIC-Reference"
-msgstr "Riferimento UIC"
-
-#. item "Public Transport/Station" text "UIC-Reference"
-#. </optional>
-#: build/trans_presets.java:1520
-msgid "Railway Halt"
-msgstr "Stazione ferroviaria non presidiata"
-
-#. item "Public Transport/Railway Halt"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1522
-msgid "Edit Halt"
-msgstr "Modifica stazione non presidiata"
-
-#. item "Public Transport/Railway Halt" text "Name"
-#. </optional>
-#: build/trans_presets.java:1529
-msgid "Tram Stop"
-msgstr "Fermata del tram"
-
-#. item "Public Transport/Tram Stop"
-#. <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:1532
-msgid "Edit Tram Stop"
-msgstr "Modifica fermata del tram"
-
-#. item "Public Transport/Tram Stop" text "Name"
-#. </optional>
-#: build/trans_presets.java:1539
-msgid "Railway Platform"
-msgstr "Piattaforma ferroviaria"
-
-#. item "Public Transport/Railway Platform"
-#. <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:1542
-msgid "Edit Railway Platform"
-msgstr "Modifica una piattaforma ferroviaria"
-
-#. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#. <key key="railway" value="platform" />
-#. <space />
-#. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#. <key key="highway" value="platform" />
-#. <space />
-#: build/trans_presets.java:1545 build/trans_presets.java:1590
-msgid "Reference (track number)"
-msgstr "Riferimento (numero del tracciato)"
-
-#. item "Public Transport/Railway Platform" text "Width (meters)"
-#. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1547 build/trans_presets.java:1592
-msgid "Area"
-msgstr "Area"
-
-#. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1549
-msgid "Subway Entrance"
-msgstr "Ingresso metropolitana"
-
-#. item "Public Transport/Subway Entrance"
-#. <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:1552
-msgid "Edit Subway Entrance"
-msgstr "Modifica ingresso metropolitana"
-
-#. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1557 build/trans_presets.java:2754
-msgid "Wheelchair"
-msgstr "Sedia a rotelle"
-
-#. item "Public Transport/Subway Entrance" check "Bicycle"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1562
-msgid "Bus Station"
-msgstr "Stazione degli autobus"
-
-#. item "Public Transport/Bus Station"
-#. <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:1565
-msgid "Edit Bus Station"
-msgstr "Modifica una stazione degli autobus"
-
-#. item "Public Transport/Bus Station" text "Name"
-#. </optional>
-#: build/trans_presets.java:1571
-msgid "Bus Stop"
-msgstr "Fermata dell''autobus"
-
-#. item "Public Transport/Bus Stop"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
-#. 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:1575
-msgid "Edit Bus Stop"
-msgstr "Modifica fermata dell''autobus"
-
-#. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1580 build/trans_presets.java:2003
-#: build/trans_presets.java:2804
-msgid "Shelter"
-msgstr "Pensilina/ricovero"
-
-#. item "Amenities/Waste Basket" label "Edit Waste Basket"
-#. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1581 build/trans_presets.java:2792
-msgid "Bench"
-msgstr "Panchina"
-
-#: build/trans_presets.java:1582
-msgid "Tactile Paving"
-msgstr "Pavimentazione tattile"
-
-#. </optional>
-#: build/trans_presets.java:1586
-msgid "Bus Platform"
-msgstr "Piattaforma fermata bus"
-
-#. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1587
-msgid "Edit Bus Platform"
-msgstr "Modifica una piattaforma degli autobus"
-
-#. item "Public Transport/Bus Platform" check "Area"
-#. <separator/>
-#: build/trans_presets.java:1595
-msgid "Taxi"
-msgstr "Taxi"
-
-#. item "Public Transport/Taxi"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1597
-msgid "Edit Taxi station"
-msgstr "Stazione dei taxi"
-
-#. item "Public Transport/Taxi" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1603
-msgid "Airport"
-msgstr "Aeroporto"
-
-#. group "Airport"
-#: build/trans_presets.java:1604
-msgid "Airport Ground"
-msgstr "Terreno aeroportuale"
-
-#. item "Airport/Airport Ground"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1606
-msgid "Edit Airport Ground"
-msgstr "Modifica terreno aeroportuale"
-
-#. item "Airport/Airport Ground" text "Name"
-#. <optional>
-#: build/trans_presets.java:1610
-msgid "IATA"
-msgstr "IATA"
-
-#. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1611
-msgid "ICAO"
-msgstr "ICAO"
-
-#. item "Airport/Airport Ground" text "ICAO"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1615
-msgid "Runway"
-msgstr "Pista di decollo/atterraggio"
-
-#. item "Airport/Runway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1617
-msgid "Edit Runway"
-msgstr "Modifica pista di decollo/atterraggio"
-
-#. item "Airport/Runway" text "Reference"
-#. </optional>
-#: build/trans_presets.java:1623
-msgid "Taxiway"
-msgstr "Pista di rullaggio"
-
-#. item "Airport/Taxiway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1625
-msgid "Edit Taxiway"
-msgstr "Modifica pista di rullaggio"
-
-#. item "Airport/Taxiway" text "Reference"
-#. </optional>
-#: build/trans_presets.java:1631
-msgid "Helipad"
-msgstr "Eliporto"
-
-#. item "Airport/Helipad"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1633
-msgid "Edit Helipad"
-msgstr "Modifica eliporto"
-
-#. item "Airport/Helipad" text "Reference"
-#. </optional>
-#. item "Airport/Apron"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1639 build/trans_presets.java:1641
-msgid "Apron"
-msgstr "Parcheggio aeromobili"
-
-#. item "Airport/Apron" label "Apron"
-#. <key key="aeroway" value="apron" />
-#. item "Airport/Hangar"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1644 build/trans_presets.java:1646
-msgid "Hangar"
-msgstr "Hangar"
-
-#. item "Airport/Hangar" label "Hangar"
-#. <key key="building" value="hangar" />
-#. item "Airport/Beacon"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1649 build/trans_presets.java:1651
-#: build/trans_presets.java:2678
-msgid "Beacon"
-msgstr "Torre radio"
-
-#. item "Airport/Beacon" label "Beacon"
-#. <key key="man_made" value="beacon" />
-#. item "Airport/Windsock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1654 build/trans_presets.java:1656
-msgid "Windsock"
-msgstr "Manica a vento"
-
-#. item "Airport/Windsock" label "Windsock"
-#. <key key="aeroway" value="windsock" />
-#. <separator/>
-#: build/trans_presets.java:1660
-msgid "Terminal"
-msgstr "Terminale"
-
-#. item "Airport/Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1662
-msgid "Edit Terminal"
-msgstr "Modifica terminal aeroportuale"
-
-#. item "Airport/Gate"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1668
-msgid "Edit Terminal Gate"
-msgstr "Modifica varco terminal aeroportuale"
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1674
-msgid "Travel"
-msgstr "Viaggio"
-
-#. group "Travel"
-#: build/trans_presets.java:1675
-msgid "Accomodation"
-msgstr "Alloggiamento"
-
-#. group "Travel/Accomodation"
-#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
-#. <!--action class="SetNodeAction" params="amenity=fuel"/-->
-#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
-#. <action class="SetWaypointAction" params="Fuel"/>
-#. </button>
-#: build/trans_presets.java:1676 build/trans_surveyor.java:43
-msgid "Hotel"
-msgstr "Hotel"
-
-#. item "Travel/Accomodation/Hotel"
-#. <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:1679
-msgid "Edit Hotel"
-msgstr "Modifica hotel"
-
-#. item "Travel/Accomodation/Hotel" text "Operator"
-#. item "Travel/Accomodation/Motel" text "Operator"
-#. item "Travel/Accomodation/Guest House" text "Name"
-#. item "Travel/Accomodation/Chalet" text "Name"
-#. item "Travel/Accomodation/Hostel" text "Operator"
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: 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:1786
-#: build/trans_presets.java:1803 build/trans_presets.java:1826
-msgid "Stars"
-msgstr "Stelle"
-
-#. item "Travel/Accomodation/Hotel" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Motel" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Guest House" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Chalet" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Hostel" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#. <space />
-#. item "Travel/Accomodation/Caravan Site" combo "Stars"
-#. <space />
-#. item "Travel/Accomodation/Camping Site" combo "Stars"
-#. <space />
-#. item "Food+Drinks/Restaurant" combo "Stars"
-#. <space />
-#: 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
-msgid "Internet access"
-msgstr "Accesso ad Internet"
-
-#: 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
-msgid "wlan"
-msgstr "wlan"
-
-#: 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
-msgid "wired"
-msgstr "via cavo"
-
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: 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_style.java:1352
-msgid "terminal"
-msgstr "terminal aeroportuale"
-
-#: 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
-msgid "Internet access fee"
-msgstr "Tariffa di accesso ad Internet"
-
-#. <space />
-#: 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
 msgid "Smoking"
 msgstr "Zona fumatori"
 
-#: 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:1693 build/trans_presets.java:1711
+#: build/trans_presets.java:1727 build/trans_presets.java:1744
+#: build/trans_presets.java:1762 build/trans_presets.java:1779
+#: build/trans_presets.java:1796 build/trans_presets.java:1813
+#: build/trans_presets.java:1836 build/trans_presets.java:1855
+#: build/trans_presets.java:1872 build/trans_presets.java:1891
+#: build/trans_presets.java:1910 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
 msgid "dedicated"
 msgstr "dedicata"
 
-#: 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:1693 build/trans_presets.java:1711
+#: build/trans_presets.java:1727 build/trans_presets.java:1744
+#: build/trans_presets.java:1762 build/trans_presets.java:1779
+#: build/trans_presets.java:1796 build/trans_presets.java:1813
+#: build/trans_presets.java:1836 build/trans_presets.java:1855
+#: build/trans_presets.java:1872 build/trans_presets.java:1891
+#: build/trans_presets.java:1910 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
 msgid "separated"
 msgstr "separata"
 
-#: 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:1693 build/trans_presets.java:1711
+#: build/trans_presets.java:1727 build/trans_presets.java:1744
+#: build/trans_presets.java:1762 build/trans_presets.java:1779
+#: build/trans_presets.java:1796 build/trans_presets.java:1813
+#: build/trans_presets.java:1836 build/trans_presets.java:1855
+#: build/trans_presets.java:1872 build/trans_presets.java:1891
+#: build/trans_presets.java:1910 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
 msgid "isolated"
 msgstr "isolata"
 
-#. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1695
+#. item "Travel/Accomodation/Motel"
+#: build/trans_presets.java:1701
 msgid "Motel"
 msgstr "Motel"
 
-#. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1697
+#. item "Travel/Accomodation/Motel" label "Edit Motel"
+#: build/trans_presets.java:1703
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
-#. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1713
+#. item "Travel/Accomodation/Guest House"
+#: build/trans_presets.java:1719
 msgid "Guest House"
 msgstr "Guest House"
 
-#. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1714
+#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
+#: build/trans_presets.java:1720
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
-#. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1729
+#. item "Travel/Accomodation/Chalet"
+#: build/trans_presets.java:1735
 msgid "Chalet"
 msgstr "Casetta (chalet)"
 
-#. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1731
+#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
+#: build/trans_presets.java:1737
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
-#. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1746
+#. item "Travel/Accomodation/Hostel"
+#: build/trans_presets.java:1752
 msgid "Hostel"
 msgstr "Ostello"
 
-#. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1748
+#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
+#: build/trans_presets.java:1754
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
-#. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1764
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1770
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1765
+#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#: build/trans_presets.java:1771
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
 #. <separator/>
-#: build/trans_presets.java:1782
+#. item "Travel/Accomodation/Caravan Site"
+#: build/trans_presets.java:1788
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1783
+#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
+#: build/trans_presets.java:1789
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
-#. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1798
+#. item "Travel/Accomodation/Camping Site"
+#: build/trans_presets.java:1804
 msgid "Camping Site"
 msgstr "Campeggio"
 
-#. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1800
+#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
+#: build/trans_presets.java:1806
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
-#. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1816
+#. group "Food+Drinks"
+#: build/trans_presets.java:1822
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
 
-#. group "Food+Drinks"
-#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
+#. item "Food+Drinks/Restaurant"
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1817 build/trans_surveyor.java:47
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
+#: build/trans_presets.java:1823 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
 
-#. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1819
+#. item "Food+Drinks/Restaurant" label "Edit Restaurant"
+#: build/trans_presets.java:1825
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
 
-#. item "Food+Drinks/Restaurant" text "Operator"
-#. item "Food+Drinks/Fast Food" text "Operator"
-#. item "Food+Drinks/Cafe" text "Operator"
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
-#: build/trans_presets.java:1880
+#. item "Food+Drinks/Restaurant" combo "Cuisine"
+#. item "Food+Drinks/Fast Food" combo "Cuisine"
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
+#: build/trans_presets.java:1886
 msgid "Cuisine"
 msgstr "Cucina"
 
-#. item "Food+Drinks/Restaurant" combo "Cuisine"
-#. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "regional"
 msgstr "provinciale"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "french"
 msgstr "francese"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "sandwich"
 msgstr "tramezzino"
 
-#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1829 build/trans_presets.java:1850
 msgid "sushi"
 msgstr "sushi"
 
-#. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1824 build/trans_presets.java:1899
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1830 build/trans_presets.java:1905
 msgid "Microbrewery"
 msgstr "Microbirreria"
 
-#. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1838
+#. item "Food+Drinks/Fast Food"
+#: build/trans_presets.java:1844
 msgid "Fast Food"
 msgstr "Fast food"
 
-#. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1840
+#. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
+#: build/trans_presets.java:1846
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1850
 msgid "fish_and_chips"
 msgstr "fish-and-chips"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1850
 msgid "chicken"
 msgstr "pollo"
 
-#. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1857
+#. item "Food+Drinks/Food Court"
+#: build/trans_presets.java:1863
 msgid "Food Court"
 msgstr "Mensa self service"
 
-#. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1859
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#: build/trans_presets.java:1865
 msgid "Edit Food Court"
 msgstr "Modifica mensa self service"
 
-#. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1874
+#. item "Food+Drinks/Cafe"
+#: build/trans_presets.java:1880
 msgid "Cafe"
 msgstr "Caffetteria"
 
-#. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1876
+#. item "Food+Drinks/Cafe" label "Edit Cafe"
+#: build/trans_presets.java:1882
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
-#. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "ice_cream"
 msgstr "gelato"
 
-#. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1893
+#. item "Food+Drinks/Pub"
+#: build/trans_presets.java:1899
 msgid "Pub"
 msgstr "Pub"
 
-#. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1895
+#. item "Food+Drinks/Pub" label "Edit Pub"
+#: build/trans_presets.java:1901
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
-#. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1912
+#. item "Food+Drinks/Biergarten"
+#: build/trans_presets.java:1918
 msgid "Biergarten"
 msgstr "Biergarten"
 
-#. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1913
+#. item "Food+Drinks/Biergarten" label "Edit Biergarten"
+#: build/trans_presets.java:1919
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
-#. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1928
+#. item "Food+Drinks/Bar"
+#: build/trans_presets.java:1934
 msgid "Bar"
 msgstr "Bar"
 
-#. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1930
+#. item "Food+Drinks/Bar" label "Edit Bar"
+#: build/trans_presets.java:1936
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
-#. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1945
+#. item "Food+Drinks/Nightclub"
+#: build/trans_presets.java:1951
 msgid "Nightclub"
 msgstr "Club notturno"
 
-#. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1947
+#. item "Food+Drinks/Nightclub" label "Edit Nightclub"
+#: build/trans_presets.java:1953
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
-#. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1961
+#. group "Tourism"
+#: build/trans_presets.java:1967
 msgid "Tourism"
 msgstr "Turismo"
 
-#. group "Tourism"
-#: build/trans_presets.java:1962
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1968
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
-#. item "Tourism/Attraction"
-#: build/trans_presets.java:1963
+#. item "Tourism/Attraction" label "Edit Attraction"
+#: build/trans_presets.java:1969
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
-#. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1968
+#. item "Tourism/Museum"
+#: build/trans_presets.java:1974
 msgid "Museum"
 msgstr "Museo"
 
-#. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1970
+#. item "Tourism/Museum" label "Edit Museum"
+#: build/trans_presets.java:1976
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1975
+#. item "Tourism/Zoo"
+#: build/trans_presets.java:1982
 msgid "Zoo"
 msgstr "Zoo"
 
-#. item "Tourism/Zoo"
 #. <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:1978
+#. item "Tourism/Zoo" label "Edit Zoo"
+#: build/trans_presets.java:1985
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1983
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1991
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1984
+#. item "Tourism/Theme Park" label "Edit Theme Park"
+#: build/trans_presets.java:1992
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
-#: build/trans_presets.java:1989
+#. item "Tourism/Artwork"
+#: build/trans_presets.java:1997
 msgid "Artwork"
 msgstr "Opera d''arte"
 
-#. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1991
+#. item "Tourism/Artwork" label "Edit Artwork"
+#: build/trans_presets.java:1999
 msgid "Edit Artwork"
 msgstr "Modifica opera d''arte"
 
-#. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1996
+#. item "Tourism/Viewpoint"
+#: build/trans_presets.java:2004
 msgid "Viewpoint"
 msgstr "Punto panoramico"
 
-#. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1998
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#: build/trans_presets.java:2006
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:2001
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:2009
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:2004
+#. item "Tourism/Shelter" label "Edit Shelter"
+#: build/trans_presets.java:2012
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
 
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#. item "Tourism/Shelter" check "Fireplace"
+#. item "Tourism/Picnic Site" check "Fireplace"
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
 msgid "Fireplace"
 msgstr "Caminetto"
 
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2017
 msgid "Picnic Site"
 msgstr "Area picnic"
 
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2010
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#: build/trans_presets.java:2018
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
-#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:2016
+#. item "Tourism/Information Office"
+#: build/trans_presets.java:2024
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:2023
+#. item "Tourism/Map"
+#: build/trans_presets.java:2031
 msgid "Map"
 msgstr "Mappa"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:2028
+#. item "Tourism/Map" combo "Detail Grade"
+#: build/trans_presets.java:2036
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
-#. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2036
 msgid "topo"
 msgstr "topografico"
 
-#. color tertiary
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -28010,5 +28075,5 @@
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
-#. color deprecated
+#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -28018,5 +28083,5 @@
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
-#. color highway_track
+#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -28034,5 +28099,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:2028 build/trans_style.java:625
+#. color street
+#: build/trans_presets.java:2036 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -28040,330 +28106,326 @@
 msgstr "strada"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2036
 msgid "scheme"
 msgstr "schema"
 
-#: build/trans_presets.java:2029
+#. item "Tourism/Map" combo "Shown Area"
+#: build/trans_presets.java:2037
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
-#. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2037
 msgid "site"
 msgstr "luogo"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2037
 msgid "city"
 msgstr "città"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2037
 msgid "region"
 msgstr "provincia"
 
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2094
+#. item "Tourism/Map" text "Closer Description"
+#. item "Tourism/Information Board" text "Closer Description"
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2038 build/trans_presets.java:2054
+#: build/trans_presets.java:2102
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
 
-#. item "Tourism/Map" text "Closer Description"
 #. <space />
-#. item "Tourism/Guidepost" text "Elevation"
+#. item "Tourism/Map" label "Routes shown for:"
 #. <space />
-#: build/trans_presets.java:2032 build/trans_presets.java:2055
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:2040 build/trans_presets.java:2063
 msgid "Routes shown for:"
 msgstr "Itinerari segnalati per:"
 
-#. item "Tourism/Map" label "Routes shown for:"
-#. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2033 build/trans_presets.java:2056
+#. item "Tourism/Map" check "Hiking"
+#. item "Tourism/Guidepost" check "Hiking"
+#: build/trans_presets.java:2041 build/trans_presets.java:2064
 msgid "Hiking"
 msgstr "Percorso escursionistico"
 
-#. item "Tourism/Map" check "Hiking"
-#. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2034 build/trans_presets.java:2057
-#: build/trans_presets.java:2266
+#. item "Tourism/Map" check "Cycling"
+#. item "Tourism/Guidepost" check "Cycling"
+#. item "Sport/Cycling"
+#: build/trans_presets.java:2042 build/trans_presets.java:2065
+#: build/trans_presets.java:2275
 msgid "Cycling"
 msgstr "Ciclismo"
 
-#. item "Tourism/Map" check "Cycling"
-#. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:2035 build/trans_presets.java:2058
+#. item "Tourism/Map" check "Mountainbiking"
+#. item "Tourism/Guidepost" check "Mountainbiking"
+#: build/trans_presets.java:2043 build/trans_presets.java:2066
 msgid "Mountainbiking"
 msgstr "Mountain bike"
 
-#. item "Tourism/Map" check "Mountainbiking"
-#. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2036 build/trans_presets.java:2059
-#: build/trans_presets.java:2314
+#. item "Tourism/Map" check "Skiing"
+#. item "Tourism/Guidepost" check "Skiing"
+#. item "Sport/Skiing"
+#: build/trans_presets.java:2044 build/trans_presets.java:2067
+#: build/trans_presets.java:2323
 msgid "Skiing"
 msgstr "Sci"
 
-#. item "Tourism/Map" check "Skiing"
-#. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:2037 build/trans_presets.java:2060
+#. item "Tourism/Map" check "Riding"
+#. item "Tourism/Guidepost" check "Riding"
+#: build/trans_presets.java:2045 build/trans_presets.java:2068
 msgid "Riding"
 msgstr "Equitazione"
 
-#. item "Tourism/Map" check "Riding"
-#. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2038 build/trans_presets.java:2061
+#. item "Tourism/Map" label "... other transportation modes possible"
+#. item "Tourism/Guidepost" label "... other transportation modes possible"
+#: build/trans_presets.java:2046 build/trans_presets.java:2069
 msgid "... other transportation modes possible"
 msgstr "... altre modalità di trasporto possibili"
 
-#. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:2040
+#. item "Tourism/Information Board"
+#: build/trans_presets.java:2048
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:2045
+#. item "Tourism/Information Board" combo "Board Content"
+#: build/trans_presets.java:2053
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
-#. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "notice"
 msgstr "avviso"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2053
 msgid "plants"
 msgstr "piantine"
 
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:2048
+#. item "Tourism/Guidepost"
+#: build/trans_presets.java:2056
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
-#. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2063
+#. item "Tourism/Flagpole"
+#: build/trans_presets.java:2071
 msgid "Flagpole"
 msgstr "Pennone"
 
-#. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:2067
+#. item "Tourism/Information Terminal"
+#: build/trans_presets.java:2075
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
 
-#. item "Tourism/Information Terminal" text "Name"
-#. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:2072 build/trans_presets.java:2082
+#. item "Tourism/Information Terminal" text "Closer description"
+#. item "Tourism/Audioguide" text "Closer description"
+#: build/trans_presets.java:2080 build/trans_presets.java:2090
 msgid "Closer description"
 msgstr "Descrizione dettagliata"
 
-#: build/trans_presets.java:2077
+#. item "Tourism/Audioguide"
+#: build/trans_presets.java:2085
 msgid "Audioguide"
 msgstr "Audio-guida"
 
 #. <space />
-#: build/trans_presets.java:2087
+#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
+#: build/trans_presets.java:2095
 msgid "Audioguide via mobile phone?"
 msgstr "Audio-guida tramite cellulare?"
 
-#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2088
+#. item "Tourism/Audioguide" text "Phone number"
+#: build/trans_presets.java:2096
 msgid "Phone number"
 msgstr "Numero di telefono"
 
-#. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2090
+#. item "Tourism/Other Information Points"
+#: build/trans_presets.java:2098
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
-#. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2097
+#. group "Historic Places"
+#: build/trans_presets.java:2105
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
-#. group "Historic Places"
-#: build/trans_presets.java:2098
+#. item "Historic Places/Castle"
+#: build/trans_presets.java:2106
 msgid "Castle"
 msgstr "Castello"
 
-#. item "Historic Places/Castle"
 #. <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:2101
+#. item "Historic Places/Castle" label "Edit Castle"
+#: build/trans_presets.java:2109
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
-#. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2105
+#. item "Historic Places/Ruins"
+#: build/trans_presets.java:2114
 msgid "Ruins"
 msgstr "Rovine"
 
-#. item "Historic Places/Ruins"
-#: build/trans_presets.java:2106
+#. item "Historic Places/Ruins" label "Edit Ruins"
+#: build/trans_presets.java:2115
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:2111
+#. item "Historic Places/Archaeological Site"
+#: build/trans_presets.java:2120
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
 
-#. item "Historic Places/Archaeological Site"
 #. <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:2114
+#. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
+#: build/trans_presets.java:2123
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:2119
+#. item "Historic Places/Battlefield"
+#: build/trans_presets.java:2128
 msgid "Battlefield"
 msgstr "Campo di battaglia"
 
-#. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2121
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#: build/trans_presets.java:2130
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
 
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2125
+#. item "Historic Places/Palaeontological Site"
+#: build/trans_presets.java:2134
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
 
-#. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2127
+#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#: build/trans_presets.java:2136
 msgid "Edit Palaeontological Site"
 msgstr "Modifica sito paleontologico"
 
-#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2132
+#. item "Historic Places/Monument"
+#: build/trans_presets.java:2141
 msgid "Monument"
 msgstr "Monumento"
 
-#. item "Historic Places/Monument"
-#: build/trans_presets.java:2133
+#. item "Historic Places/Monument" label "Edit Monument"
+#: build/trans_presets.java:2142
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
-#. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2137
+#. item "Historic Places/Memorial"
+#: build/trans_presets.java:2146
 msgid "Memorial"
 msgstr "Memoriale"
 
-#. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2139
+#. item "Historic Places/Memorial" label "Edit Memorial"
+#: build/trans_presets.java:2148
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
-#. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2143
+#. item "Historic Places/Wayside Cross"
+#: build/trans_presets.java:2152
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
-#. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2144
+#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
+#: build/trans_presets.java:2153
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
-#. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2148
+#. item "Historic Places/Wayside Shrine"
+#: build/trans_presets.java:2157
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
-#. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2149
+#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
+#: build/trans_presets.java:2158
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
-#. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2153
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:2162
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
-#. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2154
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#: build/trans_presets.java:2163
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
-#. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2159
+#. group "Leisure"
+#: build/trans_presets.java:2168
 msgid "Leisure"
 msgstr "Svago"
 
-#. group "Leisure"
-#: build/trans_presets.java:2160
+#. item "Leisure/Water Park"
+#: build/trans_presets.java:2169
 msgid "Water Park"
 msgstr "Parco acquatico"
 
-#. item "Leisure/Water Park"
-#: build/trans_presets.java:2161
+#. item "Leisure/Water Park" label "Edit Water Park"
+#: build/trans_presets.java:2170
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
-#. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2165
+#. item "Leisure/Playground"
+#: build/trans_presets.java:2174
 msgid "Playground"
 msgstr "Parco giochi"
 
-#. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2167
+#. item "Leisure/Playground" label "Edit Playground"
+#: build/trans_presets.java:2176
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
-#. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2171
+#. item "Leisure/Fishing"
+#: build/trans_presets.java:2180
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
-#. item "Leisure/Fishing"
-#: build/trans_presets.java:2172
+#. item "Leisure/Fishing" label "Edit Fishing"
+#: build/trans_presets.java:2181
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
-#. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2178 build/trans_presets.java:2923
+#. group "Sports"
+#. item "Shops/Sports"
+#: build/trans_presets.java:2187 build/trans_presets.java:2932
 msgid "Sports"
 msgstr "Sport"
 
-#. group "Sports"
-#: build/trans_presets.java:2179
+#. group "Sports/Sport Facilities"
+#: build/trans_presets.java:2188
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
-#. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2180
+#. item "Sports/Sport Facilities/Stadium"
+#: build/trans_presets.java:2189
 msgid "Stadium"
 msgstr "Stadio"
 
-#. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2181
+#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
+#: build/trans_presets.java:2190
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
 
-#. item "Sports/Sport Facilities/Stadium" text "Name"
 #. <space />
-#. item "Sports/Sport Facilities/Sports Centre" text "Name"
-#. <space />
-#. item "Sports/Sport Facilities/Pitch" text "Name"
-#. <space />
-#. item "Sports/Sport Facilities/Racetrack" text "Name"
-#. <space />
-#: build/trans_presets.java:2185 build/trans_presets.java:2194
-#: build/trans_presets.java:2203 build/trans_presets.java:2212
-msgid "select sport:"
-msgstr "seleziona uno sport:"
-
 #. item "Sports/Sport Facilities/Stadium" label "select sport:"
 #. <space />
@@ -28373,6 +28435,17 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
+#: build/trans_presets.java:2194 build/trans_presets.java:2203
+#: build/trans_presets.java:2212 build/trans_presets.java:2221
+msgid "select sport:"
+msgstr "seleziona uno sport:"
+
 #. <space />
-#. color boundary
+#. item "Sports/Sport Facilities/Stadium" combo "sport"
+#. <space />
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport"
+#. <space />
+#. item "Sports/Sport Facilities/Pitch" combo "sport"
+#. <space />
+#. item "Sports/Sport Facilities/Racetrack" combo "sport"
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -28601,5 +28674,5 @@
 #. <condition k="sport" v="karting"/>
 #. color sport
-#. <icon src="sport/karting.png"/>
+#. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28792,6 +28865,7 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#. color sport
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 #: build/trans_style.java:3770 build/trans_style.java:3778
 #: build/trans_style.java:3786 build/trans_style.java:3794
@@ -28823,311 +28897,248 @@
 msgstr "sport"
 
-#. item "Sports/Sport Facilities/Stadium" combo "sport"
-#. item "Sports/Sport Facilities/Sports Centre" combo "sport"
-#. item "Sports/Sport Facilities/Pitch" combo "sport"
-#. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "archery"
 msgstr "tiro con l''arco"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "american_football"
 msgstr "football americano"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "canadian_football"
 msgstr "calcio canadese"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "equestrian"
 msgstr "sport equestri"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "gaelic_football"
 msgstr "calcio gaelico"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "rugby_league"
 msgstr "rugby a 13"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "rugby_union"
 msgstr "rugby a 15"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:2187 build/trans_presets.java:2196
-#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2223
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2189
+#. item "Sports/Sport Facilities/Sports Centre"
+#: build/trans_presets.java:2198
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
-#. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2190
+#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#: build/trans_presets.java:2199
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:2198
+#. item "Sports/Sport Facilities/Pitch"
+#: build/trans_presets.java:2207
 msgid "Pitch"
 msgstr "Campo sportivo"
 
-#. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2199
+#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
+#: build/trans_presets.java:2208
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:2207
+#. item "Sports/Sport Facilities/Racetrack"
+#: build/trans_presets.java:2216
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
-#. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2208
+#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
+#: build/trans_presets.java:2217
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:2216
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:2225
 msgid "Golf Course"
 msgstr "Campo da golf"
 
-#. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2217
+#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
+#: build/trans_presets.java:2226
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:2222
+#. item "Sports/Sport Facilities/Miniature Golf"
+#: build/trans_presets.java:2231
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
-#. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2223
+#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#: build/trans_presets.java:2232
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:2229
+#. group "Sport"
+#: build/trans_presets.java:2238
 msgid "Sport"
 msgstr "Discipline sportive"
 
-#. group "Sport"
-#: build/trans_presets.java:2230
+#. item "Sport/Multi"
+#: build/trans_presets.java:2239
 msgid "Multi"
 msgstr "Struttura polivalente"
 
-#. item "Sport/Multi"
-#: build/trans_presets.java:2231
+#. item "Sport/Multi" label "Edit Multi"
+#: build/trans_presets.java:2240
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
-
-#. item "Sport/Multi" text "Name"
-#. item "Sport/10pin" text "Name"
-#. item "Sport/Athletics" text "Name"
-#. item "Sport/Archery" text "Name"
-#. item "Sport/Climbing" text "Name"
-#. item "Sport/Canoeing" text "Name"
-#. item "Sport/Cycling" text "Name"
-#. item "Sport/Dog Racing" text "Name"
-#. item "Sport/Equestrian" text "Name"
-#. item "Sport/Horse Racing" text "Name"
-#. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Skating" text "Name"
-#. item "Sport/Skateboard" text "Name"
-#. item "Sport/Swimming" text "Name"
-#. item "Sport/Shooting" text "Name"
-#. item "Sport (Ball)/Soccer" text "Name"
-#. item "Sport (Ball)/Australian Football" text "Name"
-#. item "Sport (Ball)/American Football" text "Name"
-#. item "Sport (Ball)/Canadian Football" text "Name"
-#. item "Sport (Ball)/Gaelic Football" text "Name"
-#. item "Sport (Ball)/Rugby League" text "Name"
-#. item "Sport (Ball)/Rugby Union" text "Name"
-#. item "Sport (Ball)/Baseball" text "Name"
-#. item "Sport (Ball)/Basketball" text "Name"
-#. item "Sport (Ball)/Golf" text "Name"
-#. item "Sport (Ball)/Boule" text "Name"
-#. item "Sport (Ball)/Bowls" text "Name"
-#. item "Sport (Ball)/Cricket" text "Name"
-#. item "Sport (Ball)/Cricket Nets" text "Name"
-#. item "Sport (Ball)/Croquet" text "Name"
-#. item "Sport (Ball)/Hockey" text "Name"
-#. item "Sport (Ball)/Pelota" text "Name"
-#. item "Sport (Ball)/Racquet" text "Name"
-#. item "Sport (Ball)/Table Tennis" text "Name"
-#. item "Sport (Ball)/Tennis" text "Name"
-#. 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: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:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: 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:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
-msgid "type"
-msgstr "tipo"
 
 #. item "Sport/Multi" combo "type"
@@ -29156,4 +29167,5 @@
 #. item "Sport (Ball)/Baseball" combo "type"
 #. item "Sport (Ball)/Basketball" combo "type"
+#. item "Sport (Ball)/Golf" combo "type"
 #. item "Sport (Ball)/Boule" combo "type"
 #. item "Sport (Ball)/Bowls" combo "type"
@@ -29172,1374 +29184,1435 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: 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:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: 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:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+msgid "type"
+msgstr "tipo"
+
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
 msgid "pitch"
 msgstr "campo sportivo"
 
-#: 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:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: 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:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
 msgid "sports_centre"
 msgstr "centro sportivo"
 
-#: 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:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: 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:2450
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467
 msgid "stadium"
 msgstr "stadio"
 
-#: 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:2312
-#: build/trans_presets.java:2321 build/trans_presets.java:2328
-#: 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:2450
-#: build/trans_presets.java:2458 build/trans_presets.java:2464
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2489
+#: build/trans_presets.java:2243 build/trans_presets.java:2249
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2279 build/trans_presets.java:2285
+#: build/trans_presets.java:2291 build/trans_presets.java:2297
+#: build/trans_presets.java:2303 build/trans_presets.java:2309
+#: build/trans_presets.java:2315 build/trans_presets.java:2321
+#: build/trans_presets.java:2330 build/trans_presets.java:2337
+#: build/trans_presets.java:2345 build/trans_presets.java:2351
+#: build/trans_presets.java:2357 build/trans_presets.java:2363
+#: build/trans_presets.java:2369 build/trans_presets.java:2375
+#: build/trans_presets.java:2381 build/trans_presets.java:2387
+#: build/trans_presets.java:2393 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2417 build/trans_presets.java:2423
+#: build/trans_presets.java:2429 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2467 build/trans_presets.java:2473
+#: build/trans_presets.java:2479 build/trans_presets.java:2485
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
 msgid "track"
 msgstr "tracciato"
 
-#: build/trans_presets.java:2236
+#. item "Sport/10pin"
+#: build/trans_presets.java:2245
 msgid "10pin"
 msgstr "Bowling"
 
-#. item "Sport/10pin"
-#: build/trans_presets.java:2237
+#. item "Sport/10pin" label "Edit 10pin"
+#: build/trans_presets.java:2246
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:2242
+#. item "Sport/Athletics"
+#: build/trans_presets.java:2251
 msgid "Athletics"
 msgstr "Atletica"
 
-#. item "Sport/Athletics"
-#: build/trans_presets.java:2243
+#. item "Sport/Athletics" label "Edit Athletics"
+#: build/trans_presets.java:2252
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:2248
+#. item "Sport/Archery"
+#: build/trans_presets.java:2257
 msgid "Archery"
 msgstr "Tiro con l''arco"
 
-#. item "Sport/Archery"
-#: build/trans_presets.java:2249
+#. item "Sport/Archery" label "Edit Archery"
+#: build/trans_presets.java:2258
 msgid "Edit Archery"
 msgstr "Modifica tiro con l''arco"
 
-#: build/trans_presets.java:2254
+#. item "Sport/Climbing"
+#: build/trans_presets.java:2263
 msgid "Climbing"
 msgstr "Arrampicata"
 
-#. item "Sport/Climbing"
-#: build/trans_presets.java:2255
+#. item "Sport/Climbing" label "Edit Climbing"
+#: build/trans_presets.java:2264
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:2260
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:2269
 msgid "Canoeing"
 msgstr "Canoa"
 
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:2261
+#. item "Sport/Canoeing" label "Edit Canoeing"
+#: build/trans_presets.java:2270
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
-#. item "Sport/Cycling"
-#: build/trans_presets.java:2267
+#. item "Sport/Cycling" label "Edit Cycling"
+#: build/trans_presets.java:2276
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:2272
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:2281
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
-#. item "Sport/Dog Racing"
-#: build/trans_presets.java:2273
+#. item "Sport/Dog Racing" label "Edit Dog Racing"
+#: build/trans_presets.java:2282
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:2278
+#. item "Sport/Equestrian"
+#: build/trans_presets.java:2287
 msgid "Equestrian"
 msgstr "Equitazione"
 
-#. item "Sport/Equestrian"
-#: build/trans_presets.java:2279
+#. item "Sport/Equestrian" label "Edit Equestrian"
+#: build/trans_presets.java:2288
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:2284
+#. item "Sport/Horse Racing"
+#: build/trans_presets.java:2293
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2285
+#. item "Sport/Horse Racing" label "Edit Horse Racing"
+#: build/trans_presets.java:2294
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:2290
+#. item "Sport/Gymnastics"
+#: build/trans_presets.java:2299
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2291
+#. item "Sport/Gymnastics" label "Edit Gymnastics"
+#: build/trans_presets.java:2300
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:2296
+#. item "Sport/Skating"
+#: build/trans_presets.java:2305
 msgid "Skating"
 msgstr "Pattinaggio"
 
-#. item "Sport/Skating"
-#: build/trans_presets.java:2297
+#. item "Sport/Skating" label "Edit Skating"
+#: build/trans_presets.java:2306
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:2302
+#. item "Sport/Skateboard"
+#: build/trans_presets.java:2311
 msgid "Skateboard"
 msgstr "Skateboard"
 
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2303
+#. item "Sport/Skateboard" label "Edit Skateboard"
+#: build/trans_presets.java:2312
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2308
+#. item "Sport/Swimming"
+#: build/trans_presets.java:2317
 msgid "Swimming"
 msgstr "Piscina"
 
-#. item "Sport/Swimming"
-#: build/trans_presets.java:2309
+#. item "Sport/Swimming" label "Edit Swimming"
+#: build/trans_presets.java:2318
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
 
-#. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2316
+#. item "Sport/Skiing" label "Edit Skiing"
+#: build/trans_presets.java:2325
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2319
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:2328
 msgid "Piste type"
 msgstr "Tipo di pista"
 
-#. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2328
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2328
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2328
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2320
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:2329
 msgid "Difficulty"
 msgstr "Difficoltà"
 
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2329
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2323
+#. item "Sport/Shooting"
+#: build/trans_presets.java:2332
 msgid "Shooting"
 msgstr "Poligono di tiro"
 
-#. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2325
+#. item "Sport/Shooting" label "Edit Shooting"
+#: build/trans_presets.java:2334
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2331
+#. group "Sport (Ball)"
+#: build/trans_presets.java:2340
 msgid "Sport (Ball)"
 msgstr "Discipline sportive (palla)"
 
-#. group "Sport (Ball)"
-#: build/trans_presets.java:2332
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2341
 msgid "Soccer"
 msgstr "Calcio"
 
-#. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2333
+#. item "Sport (Ball)/Soccer" label "Edit Soccer"
+#: build/trans_presets.java:2342
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2338
+#. item "Sport (Ball)/Australian Football"
+#: build/trans_presets.java:2347
 msgid "Australian Football"
 msgstr "Football australiano"
 
-#. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2339
+#. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
+#: build/trans_presets.java:2348
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2344
+#. item "Sport (Ball)/American Football"
+#: build/trans_presets.java:2353
 msgid "American Football"
 msgstr "Football americano"
 
-#. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2345
+#. item "Sport (Ball)/American Football" label "Edit American Football"
+#: build/trans_presets.java:2354
 msgid "Edit American Football"
 msgstr "Modifica football americano"
 
-#: build/trans_presets.java:2350
+#. item "Sport (Ball)/Canadian Football"
+#: build/trans_presets.java:2359
 msgid "Canadian Football"
 msgstr "Calcio canadese"
 
-#. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2351
+#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#: build/trans_presets.java:2360
 msgid "Edit Canadian Football"
 msgstr "Modifica calcio canadese"
 
-#: build/trans_presets.java:2356
+#. item "Sport (Ball)/Gaelic Football"
+#: build/trans_presets.java:2365
 msgid "Gaelic Football"
 msgstr "Calcio gaelico"
 
-#. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2357
+#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#: build/trans_presets.java:2366
 msgid "Edit Gaelic Football"
 msgstr "Modifica calcio gaelico"
 
-#: build/trans_presets.java:2362
+#. item "Sport (Ball)/Rugby League"
+#: build/trans_presets.java:2371
 msgid "Rugby League"
 msgstr "Rugby a 13 (rugby league)"
 
-#. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2363
+#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#: build/trans_presets.java:2372
 msgid "Edit Rugby League"
 msgstr "Modifica rugby a 13 (rugby league)"
 
-#: build/trans_presets.java:2368
+#. item "Sport (Ball)/Rugby Union"
+#: build/trans_presets.java:2377
 msgid "Rugby Union"
 msgstr "Rugby a 15 (rugby union)"
 
-#. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2369
+#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#: build/trans_presets.java:2378
 msgid "Edit Rugby Union"
 msgstr "Modifica rugby a 15 (rugby union)"
 
-#: build/trans_presets.java:2374
+#. item "Sport (Ball)/Baseball"
+#: build/trans_presets.java:2383
 msgid "Baseball"
 msgstr "Baseball"
 
-#. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2375
+#. item "Sport (Ball)/Baseball" label "Edit Baseball"
+#: build/trans_presets.java:2384
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2380
+#. item "Sport (Ball)/Basketball"
+#: build/trans_presets.java:2389
 msgid "Basketball"
 msgstr "Pallacanestro"
 
-#. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2381
+#. item "Sport (Ball)/Basketball" label "Edit Basketball"
+#: build/trans_presets.java:2390
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2386
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2395
 msgid "Golf"
 msgstr "Golf"
 
-#. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2387
+#. item "Sport (Ball)/Golf" label "Edit Golf"
+#: build/trans_presets.java:2396
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2399
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2392
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2401
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2393
+#. item "Sport (Ball)/Boule" label "Edit Boule"
+#: build/trans_presets.java:2402
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2398
+#. item "Sport (Ball)/Bowls"
+#: build/trans_presets.java:2407
 msgid "Bowls"
 msgstr "Bocce"
 
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2399
+#. item "Sport (Ball)/Bowls" label "Edit Bowls"
+#: build/trans_presets.java:2408
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2404
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2413
 msgid "Cricket"
 msgstr "Cricket"
 
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2405
+#. item "Sport (Ball)/Cricket" label "Edit Cricket"
+#: build/trans_presets.java:2414
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2410
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2419
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2411
+#. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
+#: build/trans_presets.java:2420
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2416
+#. item "Sport (Ball)/Croquet"
+#: build/trans_presets.java:2425
 msgid "Croquet"
 msgstr "Croquet"
 
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2417
+#. item "Sport (Ball)/Croquet" label "Edit Croquet"
+#: build/trans_presets.java:2426
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2422
+#. item "Sport (Ball)/Hockey"
+#: build/trans_presets.java:2431
 msgid "Hockey"
 msgstr "Hockey"
 
-#. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2423
+#. item "Sport (Ball)/Hockey" label "Edit Hockey"
+#: build/trans_presets.java:2432
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2428
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2437
 msgid "Pelota"
 msgstr "Pelota"
 
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2429
+#. item "Sport (Ball)/Pelota" label "Edit Pelota"
+#: build/trans_presets.java:2438
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2434
+#. item "Sport (Ball)/Racquet"
+#: build/trans_presets.java:2443
 msgid "Racquet"
 msgstr "Racquet"
 
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2435
+#. item "Sport (Ball)/Racquet" label "Edit Racquet"
+#: build/trans_presets.java:2444
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2440
+#. item "Sport (Ball)/Table Tennis"
+#: build/trans_presets.java:2449
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
-#. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2441
+#. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
+#: build/trans_presets.java:2450
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2446
+#. item "Sport (Ball)/Tennis"
+#: build/trans_presets.java:2455
 msgid "Tennis"
 msgstr "Tennis"
 
-#. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2447
+#. item "Sport (Ball)/Tennis" label "Edit Tennis"
+#: build/trans_presets.java:2456
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
 #. group "Motorsport"
-#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2462 build/trans_presets.java:2463
 msgid "Motorsport"
 msgstr "Sport motoristico"
 
-#. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2455
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#: build/trans_presets.java:2464
 msgid "Edit Motorsport"
 msgstr "Modifica sport motoristico"
 
-#: build/trans_presets.java:2460
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2469
 msgid "Karting"
 msgstr "Kart"
 
-#. item "Motorsport/Karting"
-#: build/trans_presets.java:2461
+#. item "Motorsport/Karting" label "Edit Karting"
+#: build/trans_presets.java:2470
 msgid "Edit Karting"
 msgstr "Modifica kart"
 
-#: build/trans_presets.java:2466
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2475
 msgid "Motocross"
 msgstr "Motocross"
 
-#. item "Motorsport/Motocross"
-#: build/trans_presets.java:2467
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#: build/trans_presets.java:2476
 msgid "Edit Motocross"
 msgstr "Modifica motocross"
 
-#: build/trans_presets.java:2472
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2481
 msgid "Safety Training"
 msgstr "Corso di guida sicura"
 
-#. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2473
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#: build/trans_presets.java:2482
 msgid "Edit Safety Training"
 msgstr "Modifica corso di guida sicura"
 
 #. <separator/>
-#: build/trans_presets.java:2479
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2488
 msgid "Model Aerodrome"
 msgstr "Aerodromo per modellini"
 
-#. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2480
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#: build/trans_presets.java:2489
 msgid "Edit Model Aerodrome"
 msgstr "Modifica aerodromo per modellini"
 
-#: build/trans_presets.java:2485
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2494
 msgid "RC Car"
 msgstr "Automobili radiocomandate"
 
-#. item "Motorsport/RC Car"
-#: build/trans_presets.java:2486
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#: build/trans_presets.java:2495
 msgid "Edit RC Car"
 msgstr "Modifica automobili radiocomandate"
 
-#: build/trans_presets.java:2493
+#. group "Man-Made"
+#: build/trans_presets.java:2502
 msgid "Man-Made"
 msgstr "Artificiale"
 
-#. group "Man-Made/Buildings"
-#: build/trans_presets.java:2495
+#. item "Man-Made/Buildings/Building"
+#: build/trans_presets.java:2504
 msgid "Building"
 msgstr "Palazzo"
 
-#. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2498
+#. item "Man-Made/Buildings/Public Building"
+#: build/trans_presets.java:2507
 msgid "Public Building"
 msgstr "Edificio pubblico"
 
-#. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2500
+#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
+#: build/trans_presets.java:2509
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
-#. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2504
+#. item "Man-Made/Buildings/Town hall"
+#: build/trans_presets.java:2513
 msgid "Town hall"
 msgstr "Municipio"
 
-#. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2506
+#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
+#: build/trans_presets.java:2515
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
-#. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2510
+#. item "Man-Made/Buildings/Embassy"
+#: build/trans_presets.java:2519
 msgid "Embassy"
 msgstr "Ambasciata"
 
-#. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2512
+#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
+#: build/trans_presets.java:2521
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
-#. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2516
+#. item "Man-Made/Buildings/Courthouse"
+#: build/trans_presets.java:2525
 msgid "Courthouse"
 msgstr "Tribunale"
 
-#. item "Man-Made/Buildings/Courthouse"
 #. <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:2519
+#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
+#: build/trans_presets.java:2528
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
-#. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2523
+#. item "Man-Made/Buildings/Prison"
+#: build/trans_presets.java:2532
 msgid "Prison"
 msgstr "Prigione"
 
-#. item "Man-Made/Buildings/Prison"
 #. <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:2526
+#. item "Man-Made/Buildings/Prison" label "Edit Prison"
+#: build/trans_presets.java:2535
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
-#. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2530
+#. item "Man-Made/Buildings/Police"
+#: build/trans_presets.java:2539
 msgid "Police"
 msgstr "Polizia"
 
-#. item "Man-Made/Buildings/Police"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
 #. 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:2534
+#. item "Man-Made/Buildings/Police" label "Edit Police"
+#: build/trans_presets.java:2543
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
-#. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2538
+#. item "Man-Made/Buildings/Fire Station"
+#: build/trans_presets.java:2547
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
 
-#. item "Man-Made/Buildings/Fire Station"
 #. <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:2541
+#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
+#: build/trans_presets.java:2550
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
-#. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2545
+#. item "Man-Made/Buildings/Post Office"
+#: build/trans_presets.java:2554
 msgid "Post Office"
 msgstr "Ufficio Postale"
 
-#. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2547
+#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
+#: build/trans_presets.java:2556
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
 
-#. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2553
+#. item "Man-Made/Buildings/Kindergarten"
+#: build/trans_presets.java:2562
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
-#. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2554
+#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
+#: build/trans_presets.java:2563
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
-#. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2558
+#. item "Man-Made/Buildings/School"
+#: build/trans_presets.java:2567
 msgid "School"
 msgstr "Scuola"
 
-#. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2560
+#. item "Man-Made/Buildings/School" label "Edit School"
+#: build/trans_presets.java:2569
 msgid "Edit School"
 msgstr "Modifica scuola"
 
-#. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2564
+#. item "Man-Made/Buildings/University"
+#: build/trans_presets.java:2573
 msgid "University"
 msgstr "Università"
 
-#. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2566
+#. item "Man-Made/Buildings/University" label "Edit University"
+#: build/trans_presets.java:2575
 msgid "Edit University"
 msgstr "Modifica Università"
 
-#. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2570
+#. item "Man-Made/Buildings/College"
+#: build/trans_presets.java:2579
 msgid "College"
 msgstr "Scuola superiore"
 
-#. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2572
+#. item "Man-Made/Buildings/College" label "Edit College"
+#: build/trans_presets.java:2581
 msgid "Edit College"
 msgstr "Modifica scuola superiore"
 
-#. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2577
+#. item "Man-Made/Buildings/Cinema"
+#: build/trans_presets.java:2586
 msgid "Cinema"
 msgstr "Cinema"
 
-#. item "Man-Made/Buildings/Cinema"
 #. <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:2580
+#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
+#: build/trans_presets.java:2589
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
-#. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2584
+#. item "Man-Made/Buildings/Library"
+#: build/trans_presets.java:2593
 msgid "Library"
 msgstr "Biblioteca"
 
-#. item "Man-Made/Buildings/Library"
 #. <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:2587
+#. item "Man-Made/Buildings/Library" label "Edit Library"
+#: build/trans_presets.java:2596
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2592
+#. item "Man-Made/Buildings/Arts Centre"
+#: build/trans_presets.java:2601
 msgid "Arts Centre"
 msgstr "Centro Artistico"
 
-#. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2594
+#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
+#: build/trans_presets.java:2603
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d''arte"
 
-#. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2598
+#. item "Man-Made/Buildings/Theatre"
+#: build/trans_presets.java:2607
 msgid "Theatre"
 msgstr "Teatro"
 
-#. item "Man-Made/Buildings/Theatre"
 #. <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:2601
+#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
+#: build/trans_presets.java:2610
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
-#. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2605
+#. item "Man-Made/Buildings/Place of Worship"
+#: build/trans_presets.java:2614
 msgid "Place of Worship"
 msgstr "Luogo di culto"
 
-#. item "Man-Made/Buildings/Place of Worship"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
 #. 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:2609
+#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
+#: build/trans_presets.java:2618
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
-
-#. item "Man-Made/Buildings/Place of Worship" text "Name"
-#. item "Land use/Graveyard" text "Name"
-#. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
-msgid "Religion"
-msgstr "Religione"
 
 #. item "Man-Made/Buildings/Place of Worship" combo "Religion"
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
+msgid "Religion"
+msgstr "Religione"
+
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "bahai"
 msgstr "Bahaista"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "hindu"
 msgstr "Induista"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "jain"
 msgstr "Giainista"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "taoist"
 msgstr "Taoista"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "unitarian"
 msgstr "Unitariana"
 
-#: build/trans_presets.java:2612 build/trans_presets.java:3421
-#: build/trans_presets.java:3430
+#: build/trans_presets.java:2621 build/trans_presets.java:3447
+#: build/trans_presets.java:3456
 msgid "zoroastrian"
 msgstr "Zoroastrista"
-
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
-msgid "Denomination"
-msgstr "Denominazione"
 
 #. item "Man-Made/Buildings/Place of Worship" combo "Denomination"
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
+msgid "Denomination"
+msgstr "Denominazione"
+
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "shia"
 msgstr "Sciita"
 
-#: build/trans_presets.java:2613 build/trans_presets.java:3422
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:2622 build/trans_presets.java:3448
+#: build/trans_presets.java:3457
 msgid "sunni"
 msgstr "Sunnita"
 
-#: build/trans_presets.java:2617
+#. group "Man Made"
+#: build/trans_presets.java:2626
 msgid "Man Made"
 msgstr "Artificiale"
 
-#. group "Man Made"
-#: build/trans_presets.java:2618
+#. item "Man Made/Works"
+#: build/trans_presets.java:2627
 msgid "Works"
 msgstr "Fabbrica"
 
-#. item "Man Made/Works"
-#: build/trans_presets.java:2619
+#. item "Man Made/Works" label "Edit Works"
+#: build/trans_presets.java:2628
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
-#. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2623
+#. item "Man Made/Tower"
+#: build/trans_presets.java:2632
 msgid "Tower"
 msgstr "Torre"
 
-#. item "Man Made/Tower"
-#: build/trans_presets.java:2624
+#. item "Man Made/Tower" label "Edit Tower"
+#: build/trans_presets.java:2633
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
-#. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2627
+#. item "Man Made/Tower" combo "Tower type"
+#: build/trans_presets.java:2636
 msgid "Tower type"
 msgstr "Tipo di torre"
 
-#. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2636
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2636
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2629
+#. item "Man Made/Tower" text "Height (meters)"
+#: build/trans_presets.java:2638
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
 
-#. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2633
+#. item "Man Made/Water Tower"
+#: build/trans_presets.java:2642
 msgid "Water Tower"
 msgstr "Torre idrica"
 
-#. item "Man Made/Water Tower"
-#: build/trans_presets.java:2634
+#. item "Man Made/Water Tower" label "Edit Water Tower"
+#: build/trans_presets.java:2643
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
-#. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2638
+#. item "Man Made/Gasometer"
+#: build/trans_presets.java:2647
 msgid "Gasometer"
 msgstr "Gasometro"
 
-#. item "Man Made/Gasometer"
-#: build/trans_presets.java:2639
+#. item "Man Made/Gasometer" label "Edit Gasometer"
+#: build/trans_presets.java:2648
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
-#. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2643
+#. item "Man Made/Lighthouse"
+#: build/trans_presets.java:2652
 msgid "Lighthouse"
 msgstr "Faro"
 
-#. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2645
+#. item "Man Made/Lighthouse" label "Edit Lighthouse"
+#: build/trans_presets.java:2654
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
-#. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2649
+#. item "Man Made/Windmill"
+#: build/trans_presets.java:2658
 msgid "Windmill"
 msgstr "Mulino a vento"
 
-#. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2651
+#. item "Man Made/Windmill" label "Edit Windmill"
+#: build/trans_presets.java:2660
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
-#. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2655
+#. item "Man Made/Pipeline"
+#: build/trans_presets.java:2664
 msgid "Pipeline"
 msgstr "Conduttura"
 
-#. item "Man Made/Pipeline"
 #. <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:2658
+#. item "Man Made/Pipeline" label "Edit Pipeline"
+#: build/trans_presets.java:2667
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2661 build/trans_presets.java:2704
+#: build/trans_presets.java:2670 build/trans_presets.java:2713
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "heat"
 msgstr "calore"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2670
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2662
+#. item "Man Made/Pipeline" combo "Location"
+#: build/trans_presets.java:2671
 msgid "Location"
 msgstr "Posizione"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2671
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2671
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2664
+#. item "Man Made/Wastewater Plant"
+#: build/trans_presets.java:2673
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
 
-#. item "Man Made/Wastewater Plant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
 #. 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:2668
+#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#: build/trans_presets.java:2677
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
-#. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2672
+#. item "Man Made/Crane"
+#: build/trans_presets.java:2681
 msgid "Crane"
 msgstr "Gru permanente"
 
-#. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2674
+#. item "Man Made/Crane" label "Edit Crane"
+#: build/trans_presets.java:2683
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
 
-#. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2680
+#. item "Man Made/Beacon" label "Edit Beacon"
+#: build/trans_presets.java:2689
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
-#. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2684
+#. item "Man Made/Survey Point"
+#: build/trans_presets.java:2693
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
 
-#. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2686
+#. item "Man Made/Survey Point" label "Edit Survey Point"
+#: build/trans_presets.java:2695
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
-#. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2690
+#. item "Man Made/Surveillance"
+#: build/trans_presets.java:2699
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
 
-#. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2692
+#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
+#: build/trans_presets.java:2701
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
 
-#. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2704
 msgid "indoor"
 msgstr "interno"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2704
 msgid "outdoor"
 msgstr "esterno"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2704
 msgid "public"
 msgstr "pubblico"
 
 #. <separator/>
-#: build/trans_presets.java:2698
+#. item "Man Made/Power Generator"
+#: build/trans_presets.java:2707
 msgid "Power Generator"
 msgstr "Centrale elettrica"
 
-#. item "Man Made/Power Generator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
 #. 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:2702
+#. item "Man Made/Power Generator" label "Edit Power Generator"
+#: build/trans_presets.java:2711
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
-#. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2713
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2707
+#. item "Man Made/Power Station"
+#: build/trans_presets.java:2716
 msgid "Power Station"
 msgstr "Stazione elettrica"
 
-#. item "Man Made/Power Station"
 #. <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:2710
+#. item "Man Made/Power Station" label "Edit Power Station"
+#: build/trans_presets.java:2719
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
-#. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2716
+#. item "Man Made/Power Sub Station"
+#: build/trans_presets.java:2725
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
 
-#. item "Man Made/Power Sub Station"
 #. <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:2719
+#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
+#: build/trans_presets.java:2728
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
 
-#. item "Man Made/Power Sub Station" text "Operator"
-#. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2722 build/trans_presets.java:2739
+#. item "Man Made/Power Sub Station" text "Line reference"
+#. item "Man Made/Power Line" text "Line reference"
+#: build/trans_presets.java:2731 build/trans_presets.java:2748
 msgid "Line reference"
 msgstr "Riferimento elettrodotto"
 
-#. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2724
+#. item "Man Made/Power Tower"
+#: build/trans_presets.java:2733
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
 
-#. item "Man Made/Power Tower"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
 #. 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:2729
+#. item "Man Made/Power Tower" label "Edit Power Tower"
+#: build/trans_presets.java:2738
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
-#. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2739
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2739
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2731
+#. item "Man Made/Power Tower" text "Tower reference"
+#: build/trans_presets.java:2740
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
-#. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2733
+#. item "Man Made/Power Line"
+#: build/trans_presets.java:2742
 msgid "Power Line"
 msgstr "Elettrodotto"
 
-#. item "Man Made/Power Line"
 #. <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:2736
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2745
 msgid "Edit Power Line"
 msgstr "Modifica elettrodotto"
 
-#. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2737
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2746
 msgid "Line type"
 msgstr "Tipo di linea"
 
-#. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2746
 msgctxt "Power Line"
 msgid "line"
 msgstr "elettrodotto"
 
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2746
 msgctxt "Power Line"
 msgid "minor_line"
 msgstr "elettrodotto secondario"
 
-#. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2742
+#. item "Man Made/Power Line" text "Amount of Cables"
+#: build/trans_presets.java:2751
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
-#. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2743
+#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
+#: build/trans_presets.java:2752
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Numero di fili (conduttori) per cavo elettrico"
 
-#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "single"
 msgstr "singolo"
 
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "double"
 msgstr "doppio"
 
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "triple"
 msgstr "triplo"
 
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2752
 msgid "quad"
 msgstr "quadruplo"
 
-#: build/trans_presets.java:2746
+#. group "Amenities"
+#: build/trans_presets.java:2755
 msgid "Amenities"
 msgstr "Servizi"
 
-#. group "Amenities"
-#: build/trans_presets.java:2747
+#. item "Amenities/Toilets"
+#: build/trans_presets.java:2756
 msgid "Toilets"
 msgstr "Bagni pubblici"
 
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2763
 msgid "limited"
 msgstr "limitato"
 
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2755 build/trans_presets.java:3041
+#. item "Amenities/Toilets" text "Note"
+#. item "Shops/Vending machine" text "Note"
+#: build/trans_presets.java:2764 build/trans_presets.java:3050
 msgid "Note"
 msgstr "Nota"
 
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2757
+#. item "Amenities/Post Box"
+#: build/trans_presets.java:2766
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
-#. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2762
+#. item "Amenities/Telephone"
+#: build/trans_presets.java:2771
 msgid "Telephone"
 msgstr "Telefono"
 
-#. item "Amenities/Telephone"
 #. <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:2765
+#. item "Amenities/Telephone" label "Edit Telephone"
+#: build/trans_presets.java:2774
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
 
-#. item "Amenities/Telephone" text "Operator"
-#. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2768 build/trans_presets.java:3042
+#. item "Amenities/Telephone" check "Coins"
+#. item "Shops/Vending machine" check "Coins"
+#: build/trans_presets.java:2777 build/trans_presets.java:3051
 msgid "Coins"
 msgstr "Monete"
 
-#. item "Amenities/Telephone" check "Coins"
-#. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2769 build/trans_presets.java:3043
+#. item "Amenities/Telephone" check "Notes"
+#. item "Shops/Vending machine" check "Notes"
+#: build/trans_presets.java:2778 build/trans_presets.java:3052
 msgid "Notes"
 msgstr "Banconote"
 
-#. item "Amenities/Telephone" check "Notes"
-#. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2770 build/trans_presets.java:3044
+#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
+#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
+#: build/trans_presets.java:2779 build/trans_presets.java:3053
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
 
-#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
-#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2771 build/trans_presets.java:3045
+#. item "Amenities/Telephone" check "Debit cards"
+#. item "Shops/Vending machine" check "Debit cards"
+#: build/trans_presets.java:2780 build/trans_presets.java:3054
 msgid "Debit cards"
 msgstr "Carte di debito"
 
-#. item "Amenities/Telephone" check "Debit cards"
-#. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2772 build/trans_presets.java:3046
+#. item "Amenities/Telephone" check "Credit cards"
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:2781 build/trans_presets.java:3055
 msgid "Credit cards"
 msgstr "Carte di credito"
 
-#. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2773
+#. item "Amenities/Telephone" check "Telephone cards"
+#: build/trans_presets.java:2782
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
-#. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2775
+#. item "Amenities/Recycling"
+#: build/trans_presets.java:2784
 msgid "Recycling"
 msgstr "Riciclaggio"
 
-#. item "Amenities/Recycling"
 #. <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:2778
+#. item "Amenities/Recycling" label "Edit Recycling station"
+#: build/trans_presets.java:2787
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
 
-#. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2780
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2789
 msgid "Batteries"
 msgstr "Batterie"
 
-#. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2781
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2790
 msgid "Cans"
 msgstr "Lattine"
 
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2783
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2792
 msgid "Glass"
 msgstr "Vetro"
 
-#. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2784
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2793
 msgid "Paper"
 msgstr "Carta"
 
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2785
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2794
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2787
+#. item "Amenities/Waste Basket"
+#: build/trans_presets.java:2796
 msgid "Waste Basket"
 msgstr "Cestino della spazzatura"
 
-#. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2789
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#: build/trans_presets.java:2798
 msgid "Edit Waste Basket"
 msgstr "Modifica cestino della spazzatura"
 
-#. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2795
+#. item "Amenities/Bench" combo "Backrest"
+#: build/trans_presets.java:2804
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2796
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2805
 msgid "Material"
 msgstr "Materiale"
 
-#. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2805
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2805
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2797
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2806
 msgid "Colour"
 msgstr "Colore"
 
-#. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "brown"
 msgstr "marrone"
 
-#. color historic
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30582,5 +30655,5 @@
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
-#. color forest
+#. color green
 #. <icon src="misc/landmark/trees.png"/>
 #. <scale_min>1</scale_min>
@@ -30598,5 +30671,5 @@
 #. <rule>
 #. <condition k="landuse" v="grass"/>
-#. color cemetery
+#. color green
 #. <icon src="rendering/landuse/cemetery.png"/>
 #. <scale_min>1</scale_min>
@@ -30614,5 +30687,6 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2797 build/trans_style.java:3222
+#. color green
+#: build/trans_presets.java:2806 build/trans_style.java:3222
 #: build/trans_style.java:3230 build/trans_style.java:3238
 #: build/trans_style.java:3246 build/trans_style.java:3254
@@ -30622,1548 +30696,1577 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "gray"
 msgstr "grigio"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2806
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2798
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2807
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
-#. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2800
+#. item "Amenities/Hunting Stand"
+#: build/trans_presets.java:2809
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
-#. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2801
+#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
+#: build/trans_presets.java:2810
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
 
-#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Nature/Tree" text "Type"
-#: build/trans_presets.java:2803 build/trans_presets.java:3290
+#. item "Amenities/Hunting Stand" combo "Height"
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:2812 build/trans_presets.java:3316
 msgid "Height"
 msgstr "Modifica Albero"
 
-#. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2812
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2812
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2812
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2805
+#. item "Amenities/Hunting Stand" combo "Hide"
+#: build/trans_presets.java:2814
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2806
+#. item "Amenities/Hunting Stand" combo "Lock"
+#: build/trans_presets.java:2815
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2808
+#. item "Amenities/Fountain"
+#: build/trans_presets.java:2817
 msgid "Fountain"
 msgstr "Fontana"
 
-#. item "Amenities/Fountain"
 #. <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:2811
+#. item "Amenities/Fountain" label "Edit Fountain"
+#: build/trans_presets.java:2820
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
-#. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2815
+#. item "Amenities/Drinking Water"
+#: build/trans_presets.java:2824
 msgid "Drinking Water"
 msgstr "Acqua potabile"
 
-#. item "Amenities/Drinking Water"
 #. <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:2818
+#. item "Amenities/Drinking Water" label "Edit Drinking Water"
+#: build/trans_presets.java:2827
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
-#. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2822
+#. item "Amenities/Fire Hydrant"
+#: build/trans_presets.java:2831
 msgid "Fire Hydrant"
 msgstr "Pompa antincendio"
 
-#. item "Amenities/Fire Hydrant"
 #. <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:2825
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#: build/trans_presets.java:2834
 msgid "Edit Fire Hydrant"
 msgstr "Modifica pompa antincendio"
 
-#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2829
+#. group "Food"
+#: build/trans_presets.java:2838
 msgid "Food"
 msgstr "Cibo"
 
-#. group "Food"
-#: build/trans_presets.java:2830
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2839
 msgid "Supermarket"
 msgstr "Supermercato"
 
-#. item "Food/Supermarket"
-#: build/trans_presets.java:2831
+#. item "Food/Supermarket" label "Edit Supermarket"
+#: build/trans_presets.java:2840
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2836
+#. item "Food/Convenience Store"
+#: build/trans_presets.java:2845
 msgid "Convenience Store"
 msgstr "Drogheria"
 
-#. item "Food/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2838
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#: build/trans_presets.java:2847
 msgid "Edit Convenience Store"
 msgstr "Modifica drogheria"
 
-#: build/trans_presets.java:2843
+#. item "Food/Kiosk"
+#: build/trans_presets.java:2852
 msgid "Kiosk"
 msgstr "Chiosco"
 
-#. item "Food/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2845
+#. item "Food/Kiosk" label "Edit Kiosk"
+#: build/trans_presets.java:2854
 msgid "Edit Kiosk"
 msgstr "Modifica chiosco"
 
-#: build/trans_presets.java:2850
+#. item "Food/Butcher"
+#: build/trans_presets.java:2859
 msgid "Butcher"
 msgstr "Macellaio"
 
-#. item "Food/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2852
+#. item "Food/Butcher" label "Edit Butcher"
+#: build/trans_presets.java:2861
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
-#: build/trans_presets.java:2857
+#. item "Food/Baker"
+#: build/trans_presets.java:2866
 msgid "Baker"
 msgstr "Panificio"
 
-#. item "Food/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2859
+#. item "Food/Baker" label "Edit Baker"
+#: build/trans_presets.java:2868
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
-#: build/trans_presets.java:2864
+#. item "Food/Organic"
+#: build/trans_presets.java:2873
 msgid "Organic"
 msgstr "Prodotti biologici"
 
-#. item "Food/Organic"
-#: build/trans_presets.java:2865
+#. item "Food/Organic" label "Edit Organic Shop"
+#: build/trans_presets.java:2874
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
-#: build/trans_presets.java:2870
+#. item "Food/Alcohol"
+#: build/trans_presets.java:2879
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
 
-#. item "Food/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2872
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#: build/trans_presets.java:2881
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
-#: build/trans_presets.java:2877
+#. item "Food/Beverages"
+#: build/trans_presets.java:2886
 msgid "Beverages"
 msgstr "Bevande"
 
-#. item "Food/Beverages"
-#: build/trans_presets.java:2878
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#: build/trans_presets.java:2887
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
-#: build/trans_presets.java:2884
+#. group "Shops"
+#: build/trans_presets.java:2893
 msgid "Shops"
 msgstr "Negozi"
 
-#. group "Shops"
-#: build/trans_presets.java:2885
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2894
 msgid "Chemist"
 msgstr "Articoli di pulizia e bellezza"
 
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2886
+#. item "Shops/Chemist" label "Edit Chemist"
+#: build/trans_presets.java:2895
 msgid "Edit Chemist"
 msgstr "Modifica negozio di articoli di pulizia e bellezza"
 
-#: build/trans_presets.java:2891
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2900
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2892
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#: build/trans_presets.java:2901
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
-#: build/trans_presets.java:2897
+#. item "Shops/Optician"
+#: build/trans_presets.java:2906
 msgid "Optician"
 msgstr "Ottico"
 
-#. item "Shops/Optician"
-#: build/trans_presets.java:2898
+#. item "Shops/Optician" label "Edit Optician"
+#: build/trans_presets.java:2907
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
-#. item "Shops/Clothes"
-#: build/trans_presets.java:2905
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#: build/trans_presets.java:2914
 msgid "Edit Clothes Shop"
 msgstr "Modifica negozio di abbigliamento"
 
-#: build/trans_presets.java:2910
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2919
 msgid "Shoes"
 msgstr "Calzature"
 
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2911
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#: build/trans_presets.java:2920
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
-#: build/trans_presets.java:2916
+#. item "Shops/Outdoor"
+#: build/trans_presets.java:2925
 msgid "Outdoor"
 msgstr "Sport all''aperto"
 
-#. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2918
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#: build/trans_presets.java:2927
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all''aperto"
 
-#. item "Shops/Sports"
-#: build/trans_presets.java:2924
+#. item "Shops/Sports" label "Edit Sports Shop"
+#: build/trans_presets.java:2933
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#: build/trans_presets.java:2929
+#. item "Shops/Dry Cleaning"
+#: build/trans_presets.java:2938
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
 
-#. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2931
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#: build/trans_presets.java:2940
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
-#: build/trans_presets.java:2936
+#. item "Shops/Laundry"
+#: build/trans_presets.java:2945
 msgid "Laundry"
 msgstr "Lavanderia"
 
-#. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2938
+#. item "Shops/Laundry" label "Edit Laundry"
+#: build/trans_presets.java:2947
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
-#: build/trans_presets.java:2943
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2952
 msgid "Tailor"
 msgstr "Sarto"
 
-#. item "Shops/Tailor"
-#: build/trans_presets.java:2944
+#. item "Shops/Tailor" label "Edit Tailor"
+#: build/trans_presets.java:2953
 msgid "Edit Tailor"
 msgstr "Modifica sarto"
 
 #. <separator/>
-#: build/trans_presets.java:2950
+#. item "Shops/Computer"
+#: build/trans_presets.java:2959
 msgid "Computer"
 msgstr "Computer"
 
-#. item "Shops/Computer"
-#: build/trans_presets.java:2951
+#. item "Shops/Computer" label "Edit Computer Shop"
+#: build/trans_presets.java:2960
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
-#: build/trans_presets.java:2956
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2965
 msgid "Electronics"
 msgstr "Elettronica"
 
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2957
+#. item "Shops/Electronics" label "Edit Electronics Shop"
+#: build/trans_presets.java:2966
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
-#: build/trans_presets.java:2962
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2971
 msgid "Hifi"
 msgstr "Hi-Fi"
 
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2963
+#. item "Shops/Hifi" label "Edit Hifi Shop"
+#: build/trans_presets.java:2972
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
-#: build/trans_presets.java:2968
+#. item "Shops/Video"
+#: build/trans_presets.java:2977
 msgid "Video"
 msgstr "Videoteca"
 
-#. item "Shops/Video"
-#: build/trans_presets.java:2969
+#. item "Shops/Video" label "Edit Video Shop"
+#: build/trans_presets.java:2978
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
 #. <separator/>
-#: build/trans_presets.java:2975
+#. item "Shops/Florist"
+#: build/trans_presets.java:2984
 msgid "Florist"
 msgstr "Fiorista"
 
-#. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2977
+#. item "Shops/Florist" label "Edit Florist"
+#: build/trans_presets.java:2986
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
-#: build/trans_presets.java:2982
+#. item "Shops/Garden Centre"
+#: build/trans_presets.java:2991
 msgid "Garden Centre"
 msgstr "Giardinaggio"
 
-#. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2984
+#. item "Shops/Garden Centre" label "Edit Garden Centre"
+#: build/trans_presets.java:2993
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
-#: build/trans_presets.java:2989
+#. item "Shops/Hardware"
+#: build/trans_presets.java:2998
 msgid "Hardware"
 msgstr "Ferramenta"
 
-#. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2991
+#. item "Shops/Hardware" label "Edit Hardware Store"
+#: build/trans_presets.java:3000
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
-#: build/trans_presets.java:2996
+#. item "Shops/Do-it-yourself-store"
+#: build/trans_presets.java:3005
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
 
-#. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2998
+#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
+#: build/trans_presets.java:3007
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
-#: build/trans_presets.java:3003
+#. item "Shops/Furniture"
+#: build/trans_presets.java:3012
 msgid "Furniture"
 msgstr "Mobilia"
 
-#. item "Shops/Furniture"
-#: build/trans_presets.java:3004
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#: build/trans_presets.java:3013
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
-#: build/trans_presets.java:3009
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3018
 msgid "Stationery"
 msgstr "Cartoleria"
 
-#. item "Shops/Stationery"
-#: build/trans_presets.java:3010
+#. item "Shops/Stationery" label "Edit Stationery Shop"
+#: build/trans_presets.java:3019
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
-#: build/trans_presets.java:3015
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3024
 msgid "Book Store"
 msgstr "Libreria"
 
-#. item "Shops/Book Store"
-#: build/trans_presets.java:3016
+#. item "Shops/Book Store" label "Edit Book Store"
+#: build/trans_presets.java:3025
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
 
-#: build/trans_presets.java:3021
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3030
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:3022
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#: build/trans_presets.java:3031
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
-#: build/trans_presets.java:3027
+#. item "Shops/Toys"
+#: build/trans_presets.java:3036
 msgid "Toys"
 msgstr "Giocattoli"
 
-#. item "Shops/Toys"
-#: build/trans_presets.java:3028
+#. item "Shops/Toys" label "Edit Toy Shop"
+#: build/trans_presets.java:3037
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
 #. <separator/>
-#: build/trans_presets.java:3034
+#. item "Shops/Vending machine"
+#: build/trans_presets.java:3043
 msgid "Vending machine"
 msgstr "Distributore automatico"
 
-#. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:3036
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#: build/trans_presets.java:3045
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
 
-#. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:3038
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3047
 msgid "Vending products"
 msgstr "Distributore automatico"
 
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "public_transport_tickets"
 msgstr "biglietti per il trasporto pubblico"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "public_transport_plans"
 msgstr "orari del trasporto pubblico"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "parking_tickets"
 msgstr "biglietti per il parcheggio"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "food"
 msgstr "cibo"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "drinks"
 msgstr "bevande"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "sweets"
 msgstr "dolci"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "cigarettes"
 msgstr "sigarette"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "animal_food"
 msgstr "cibo per animali"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "news_papers"
 msgstr "giornali"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "SIM-cards"
 msgstr "schede SIM"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "telephone_vouchers"
 msgstr "ricariche telefoniche"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "bicycle_tube"
 msgstr "camere d''aria per biciclette"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3047
 msgid "excrement_bags"
 msgstr "sacchetti per escrementi"
 
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:3047
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3056
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:3050
+#. group "Cash"
+#: build/trans_presets.java:3059
 msgid "Cash"
 msgstr "Contanti"
 
-#. group "Cash"
-#: build/trans_presets.java:3051
+#. item "Cash/Bank"
+#: build/trans_presets.java:3060
 msgid "Bank"
 msgstr "Banca"
 
-#. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:3053
+#. item "Cash/Bank" label "Edit Bank"
+#: build/trans_presets.java:3062
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:3058 build/trans_presets.java:3067
+#. item "Cash/Bank" check "Automated Teller Machine"
+#. item "Cash/Automated Teller Machine"
+#: build/trans_presets.java:3067 build/trans_presets.java:3076
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:3060
+#. item "Cash/Money Exchange"
+#: build/trans_presets.java:3069
 msgid "Money Exchange"
 msgstr "Cambiavalute"
 
-#. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:3062
+#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#: build/trans_presets.java:3071
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
 
-#. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:3069
+#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
+#: build/trans_presets.java:3078
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:3074
+#. group "Health"
+#: build/trans_presets.java:3083
 msgid "Health"
 msgstr "Salute"
 
-#. group "Health"
-#: build/trans_presets.java:3075
+#. item "Health/Doctors"
+#: build/trans_presets.java:3084
 msgid "Doctors"
 msgstr "Ambulatorio"
 
-#. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:3077
+#. item "Health/Doctors" label "Edit Doctors"
+#: build/trans_presets.java:3086
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:3082
+#. item "Health/Dentist"
+#: build/trans_presets.java:3091
 msgid "Dentist"
 msgstr "Dentista"
 
-#. item "Health/Dentist"
-#: build/trans_presets.java:3083
+#. item "Health/Dentist" label "Edit Dentist"
+#: build/trans_presets.java:3092
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:3088
+#. item "Health/Pharmacy"
+#: build/trans_presets.java:3097
 msgid "Pharmacy"
 msgstr "Farmacia"
 
-#. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:3090
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#: build/trans_presets.java:3099
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
 
-#. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:3092
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:3101
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:3096
+#. item "Health/Hospital"
+#: build/trans_presets.java:3105
 msgid "Hospital"
 msgstr "Ospedale"
 
-#. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3098
+#. item "Health/Hospital" label "Edit Hospital"
+#: build/trans_presets.java:3107
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3102
+#. item "Health/Baby Hatch"
+#: build/trans_presets.java:3111
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
 
-#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:3104
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#: build/trans_presets.java:3113
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
-#. item "Health/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:3109
+#. item "Health/Emergency Access Point"
+#: build/trans_presets.java:3118
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
 
-#. item "Health/Emergency Access Point"
 #. <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:3112
+#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
+#: build/trans_presets.java:3121
 msgid "Edit Emergency Access Point"
 msgstr "Modifica colonnina SOS"
 
-#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3115
+#. item "Health/Emergency Access Point" text "Point Number"
+#: build/trans_presets.java:3124
 msgid "Point Number"
 msgstr "Numero del punto"
 
-#. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3116
+#. item "Health/Emergency Access Point" text "Point Name"
+#: build/trans_presets.java:3125
 msgid "Point Name"
 msgstr "Nome del punto"
 
-#. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3119
+#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
+#: build/trans_presets.java:3128
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
 
-#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3122
+#. item "Health/Veterinary"
+#: build/trans_presets.java:3131
 msgid "Veterinary"
 msgstr "Veterinario"
 
-#. item "Health/Veterinary"
 #. <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:3125
+#. item "Health/Veterinary" label "Edit Veterinary"
+#: build/trans_presets.java:3134
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#. item "Places/Locality" text "Name"
-#: build/trans_presets.java:3132 build/trans_presets.java:3238
+#. group "Geography"
+#: build/trans_presets.java:3141 build/trans_presets.java:3258
 msgid "Geography"
 msgstr "Geografia"
 
-#. group "Geography"
-#: build/trans_presets.java:3133
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3142
 msgid "Boundaries"
 msgstr "Confini"
 
-#. group "Geography/Boundaries"
-#: build/trans_presets.java:3134
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3143
 msgid "National"
 msgstr "Nazionale"
 
-#. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3135
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#: build/trans_presets.java:3144
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
-#. item "Geography/Boundaries/National" text "Name"
-#: build/trans_presets.java:3140
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3149
 msgid "Administrative"
 msgstr "Amministrativo"
 
-#. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3141
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#: build/trans_presets.java:3150
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
-#. item "Geography/Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3146
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3155
 msgid "Civil"
 msgstr "Civile"
 
-#. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3147
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#: build/trans_presets.java:3156
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
-#. item "Geography/Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3152
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3161
 msgid "Political"
 msgstr "Politico"
 
-#. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3153
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#: build/trans_presets.java:3162
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
-#. item "Geography/Boundaries/Political" text "Name"
-#: build/trans_presets.java:3158
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3167
 msgid "National park"
 msgstr "Parco nazionale"
 
-#. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3159
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#: build/trans_presets.java:3168
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
-#. item "Geography/Boundaries/National park" text "Name"
-#: build/trans_presets.java:3165
+#. group "Places"
+#: build/trans_presets.java:3174
 msgid "Places"
 msgstr "Luoghi"
 
-#. group "Places"
-#: build/trans_presets.java:3166
+#. item "Places/Continent"
+#: build/trans_presets.java:3175
 msgid "Continent"
 msgstr "Continente"
 
-#. item "Places/Continent"
-#: build/trans_presets.java:3167
+#. item "Places/Continent" label "Edit Continent"
+#: build/trans_presets.java:3176
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
-#. item "Places/Continent" text "Name"
-#: build/trans_presets.java:3172
+#. item "Places/Country"
+#: build/trans_presets.java:3182
 msgid "Country"
 msgstr "Nazione"
 
-#. item "Places/Country"
-#: build/trans_presets.java:3173
+#. item "Places/Country" label "Edit Country"
+#: build/trans_presets.java:3183
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
-#. item "Places/Country" text "Name"
-#: build/trans_presets.java:3178
+#. item "Places/State"
+#: build/trans_presets.java:3189
 msgid "State"
 msgstr "Regione"
 
-#. item "Places/State"
-#: build/trans_presets.java:3179
+#. item "Places/State" label "Edit State"
+#: build/trans_presets.java:3190
 msgid "Edit State"
 msgstr "Modifica regione"
 
-#. item "Places/State" text "Name"
-#: build/trans_presets.java:3184
+#. item "Places/Region"
+#: build/trans_presets.java:3196
 msgid "Region"
 msgstr "Provincia"
 
-#. item "Places/Region"
-#: build/trans_presets.java:3185
+#. item "Places/Region" label "Edit Region"
+#: build/trans_presets.java:3197
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
-#. item "Places/Region" text "Name"
-#: build/trans_presets.java:3190
+#. item "Places/County"
+#: build/trans_presets.java:3203
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
-#. item "Places/County"
-#: build/trans_presets.java:3191
+#. item "Places/County" label "Edit County"
+#: build/trans_presets.java:3204
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
 
-#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3197
+#. item "Places/City"
+#: build/trans_presets.java:3211
 msgid "City"
 msgstr "Città"
 
-#. item "Places/City"
-#: build/trans_presets.java:3198
+#. item "Places/City" label "Edit City"
+#: build/trans_presets.java:3212
 msgid "Edit City"
 msgstr "Modifica città"
 
-#. item "Places/City" text "Name"
-#: build/trans_presets.java:3203
+#. item "Places/Town"
+#: build/trans_presets.java:3218
 msgid "Town"
 msgstr "Paese"
 
-#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3205
+#. item "Places/Town" label "Edit Town"
+#: build/trans_presets.java:3220
 msgid "Edit Town"
 msgstr "Modifica paese"
 
-#. item "Places/Town" text "Name"
-#: build/trans_presets.java:3210
+#. item "Places/Suburb"
+#: build/trans_presets.java:3226
 msgid "Suburb"
 msgstr "Quartiere"
 
-#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3212
+#. item "Places/Suburb" label "Edit Suburb"
+#: build/trans_presets.java:3228
 msgid "Edit Suburb"
 msgstr "Modifica quartiere"
 
-#. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:3217
+#. item "Places/Village"
+#: build/trans_presets.java:3234
 msgid "Village"
 msgstr "Frazione"
 
-#. item "Places/Village"
-#: build/trans_presets.java:3218
+#. item "Places/Village" label "Edit Village"
+#: build/trans_presets.java:3235
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
-#. item "Places/Village" text "Name"
-#: build/trans_presets.java:3223
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3241
 msgid "Hamlet"
 msgstr "Borgo"
 
-#. item "Places/Hamlet"
-#: build/trans_presets.java:3224
+#. item "Places/Hamlet" label "Edit Hamlet"
+#: build/trans_presets.java:3242
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
 
-#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3230
+#. item "Places/Locality"
+#: build/trans_presets.java:3249
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
 
-#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3232
+#. item "Places/Locality" label "Edit Locality"
+#: build/trans_presets.java:3251
 msgid "Edit Locality"
 msgstr "Modifica località (luogo con nome, non popolato)"
 
-#. group "Geography"
-#: build/trans_presets.java:3239
+#. item "Geography/Peak"
+#: build/trans_presets.java:3259
 msgid "Peak"
 msgstr "Picco montuoso"
 
-#. item "Geography/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3241
+#. item "Geography/Peak" label "Edit Peak"
+#: build/trans_presets.java:3261
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
-#. item "Geography/Peak" text "Elevation"
-#: build/trans_presets.java:3246
+#. item "Geography/Glacier"
+#: build/trans_presets.java:3267
 msgid "Glacier"
 msgstr "Ghiacciaio"
 
-#. item "Geography/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3248
+#. item "Geography/Glacier" label "Edit Glacier"
+#: build/trans_presets.java:3269
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
-#. item "Geography/Glacier" text "Elevation"
-#: build/trans_presets.java:3253
+#. item "Geography/Volcano"
+#: build/trans_presets.java:3275
 msgid "Volcano"
 msgstr "Vulcano"
 
-#. item "Geography/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3255
+#. item "Geography/Volcano" label "Edit Volcano"
+#: build/trans_presets.java:3277
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
-#. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:3260
+#. item "Geography/Cave Entrance"
+#: build/trans_presets.java:3283
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
 
-#. item "Geography/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3262
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#: build/trans_presets.java:3285
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
-#. item "Geography/Cave Entrance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3267
+#. item "Geography/Island"
+#: build/trans_presets.java:3291
 msgid "Island"
 msgstr "Isola"
 
-#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3269
+#. item "Geography/Island" label "Edit Island"
+#: build/trans_presets.java:3293
 msgid "Edit Island"
 msgstr "Modifica isola"
 
-#. item "Geography/Island" text "Name"
-#: build/trans_presets.java:3274
+#. item "Geography/Islet"
+#: build/trans_presets.java:3299
 msgid "Islet"
 msgstr "Isoletta"
 
-#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3276
+#. item "Geography/Islet" label "Edit Islet"
+#: build/trans_presets.java:3301
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
 
-#. item "Geography/Islet" text "Name"
-#: build/trans_presets.java:3282
+#. group "Nature"
+#: build/trans_presets.java:3308
 msgid "Nature"
 msgstr "Natura"
 
-#. group "Nature"
-#: build/trans_presets.java:3283
+#. item "Nature/Tree"
+#: build/trans_presets.java:3309
 msgid "Tree"
 msgstr "Albero"
 
-#. 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:3286
+#. item "Nature/Tree" label "Edit Tree"
+#: build/trans_presets.java:3312
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
-#. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:3291
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3317
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
-#. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3293
+#. item "Nature/Wood"
+#: build/trans_presets.java:3319
 msgid "Wood"
 msgstr "Bosco"
 
-#. 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:3296
+#. item "Nature/Wood" label "Edit Wood"
+#: build/trans_presets.java:3322
 msgid "Edit Wood"
 msgstr "Modifica bosco"
 
-#. item "Nature/Wood" combo "Type"
-#. item "Nature/Forest" combo "Type"
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:3299 build/trans_presets.java:3308
+#: build/trans_presets.java:3325 build/trans_presets.java:3334
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:3301
+#. item "Nature/Forest"
+#: build/trans_presets.java:3327
 msgid "Forest"
 msgstr "Foresta"
 
-#. 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:3304
+#. item "Nature/Forest" label "Edit Forest Landuse"
+#: build/trans_presets.java:3330
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:3310
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3336
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
-#. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3311
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
+#: build/trans_presets.java:3337
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
 
-#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3316
+#. item "Nature/Scree"
+#: build/trans_presets.java:3342
 msgid "Scree"
 msgstr "Ghiaione"
 
-#. item "Nature/Scree"
-#: build/trans_presets.java:3317
+#. item "Nature/Scree" label "Edit Scree"
+#: build/trans_presets.java:3343
 msgid "Edit Scree"
 msgstr "Modifica ghiaione"
 
-#. item "Nature/Scree" text "Name"
-#: build/trans_presets.java:3321
+#. item "Nature/Fell"
+#: build/trans_presets.java:3347
 msgid "Fell"
 msgstr "Prato alpino"
 
-#. item "Nature/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3323
+#. item "Nature/Fell" label "Edit Fell"
+#: build/trans_presets.java:3349
 msgid "Edit Fell"
 msgstr "Modifica prato alpino"
 
-#. item "Nature/Fell" text "Name"
-#: build/trans_presets.java:3327
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3353
 msgid "Scrub"
 msgstr "Boscaglia"
 
-#. item "Nature/Scrub"
-#: build/trans_presets.java:3328
+#. item "Nature/Scrub" label "Edit Scrub"
+#: build/trans_presets.java:3354
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
-#. item "Nature/Scrub" text "Name"
-#: build/trans_presets.java:3332
+#. item "Nature/Heath"
+#: build/trans_presets.java:3358
 msgid "Heath"
 msgstr "Brughiera"
 
-#. item "Nature/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3334
+#. item "Nature/Heath" label "Edit Heath"
+#: build/trans_presets.java:3360
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
 
-#. item "Nature/Heath" text "Name"
-#: build/trans_presets.java:3339
+#. group "Land use"
+#: build/trans_presets.java:3365
 msgid "Land use"
 msgstr "Uso del terreno"
 
-#. group "Land use"
-#: build/trans_presets.java:3340
+#. item "Land use/Farmyard"
+#: build/trans_presets.java:3366
 msgid "Farmyard"
 msgstr "Aia"
 
-#. item "Land use/Farmyard"
 #. <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:3343
+#. item "Land use/Farmyard" label "Edit Farmyard Landuse"
+#: build/trans_presets.java:3369
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
-#. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3348
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3374
 msgid "Farmland"
 msgstr "Area agricola"
 
-#. item "Land use/Farmland"
-#: build/trans_presets.java:3349
+#. item "Land use/Farmland" label "Edit Farmland Landuse"
+#: build/trans_presets.java:3375
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
-#. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3354
+#. item "Land use/Meadow"
+#: build/trans_presets.java:3380
 msgid "Meadow"
 msgstr "Prato"
 
-#. item "Land use/Meadow"
-#: build/trans_presets.java:3355
+#. item "Land use/Meadow" label "Edit Meadow Landuse"
+#: build/trans_presets.java:3381
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
-#. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3360
+#. item "Land use/Vineyard"
+#: build/trans_presets.java:3386
 msgid "Vineyard"
 msgstr "Vigna"
 
-#. item "Land use/Vineyard"
-#: build/trans_presets.java:3361
+#. item "Land use/Vineyard" label "Edit Vineyard Landuse"
+#: build/trans_presets.java:3387
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
-#. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3366
+#. item "Land use/Allotments"
+#: build/trans_presets.java:3392
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
-#. item "Land use/Allotments"
-#: build/trans_presets.java:3367
+#. item "Land use/Allotments" label "Edit Allotments Landuse"
+#: build/trans_presets.java:3393
 msgid "Edit Allotments Landuse"
 msgstr ""
 "Modifica aree pubblica concessa ai cittadini per la realizzazione di orti"
 
-#. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3373
+#. item "Land use/Garden"
+#: build/trans_presets.java:3399
 msgid "Garden"
 msgstr "Giardino"
 
-#. item "Land use/Garden"
-#: build/trans_presets.java:3374
+#. item "Land use/Garden" label "Edit Garden"
+#: build/trans_presets.java:3400
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
-#. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3378
+#. item "Land use/Grass"
+#: build/trans_presets.java:3404
 msgid "Grass"
 msgstr "Erba"
 
-#. item "Land use/Grass"
-#: build/trans_presets.java:3379
+#. item "Land use/Grass" label "Edit Grass Landuse"
+#: build/trans_presets.java:3405
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
-#. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3384
+#. item "Land use/Village Green"
+#: build/trans_presets.java:3410
 msgid "Village Green"
 msgstr "Village Green"
 
-#. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3386
+#. item "Land use/Village Green" label "Edit Village Green Landuse"
+#: build/trans_presets.java:3412
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
-#. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3391
+#. item "Land use/Common"
+#: build/trans_presets.java:3417
 msgid "Common"
 msgstr "Area comune (UK)"
 
-#. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3393
+#. item "Land use/Common" label "Edit Common"
+#: build/trans_presets.java:3419
 msgid "Edit Common"
 msgstr "Modifica area comune (UK)"
 
-#. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3397
+#. item "Land use/Park"
+#: build/trans_presets.java:3423
 msgid "Park"
 msgstr "Parco"
 
-#. item "Land use/Park"
-#: build/trans_presets.java:3398
+#. item "Land use/Park" label "Edit Park"
+#: build/trans_presets.java:3424
 msgid "Edit Park"
 msgstr "Modifica parco"
 
-#. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3402
+#. item "Land use/Recreation Ground"
+#: build/trans_presets.java:3428
 msgid "Recreation Ground"
 msgstr "Area di svago"
 
-#. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3404
+#. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
+#: build/trans_presets.java:3430
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
 
-#. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3410
+#. item "Land use/Residential area"
+#: build/trans_presets.java:3436
 msgid "Residential area"
 msgstr "Area residenziale"
 
-#. item "Land use/Residential area"
-#: build/trans_presets.java:3411
+#. item "Land use/Residential area" label "Edit Residential Landuse"
+#: build/trans_presets.java:3437
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
-#. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3416
+#. item "Land use/Graveyard"
+#: build/trans_presets.java:3442
 msgid "Graveyard"
 msgstr "Cimitero"
 
-#. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3418
+#. item "Land use/Graveyard" label "Edit Graveyard"
+#: build/trans_presets.java:3444
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3424
+#. item "Land use/Cemetery"
+#: build/trans_presets.java:3450
 msgid "Cemetery"
 msgstr "Cimitero"
 
-#. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3426
+#. item "Land use/Cemetery" label "Edit Cemetery Landuse"
+#: build/trans_presets.java:3452
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3433
+#. item "Land use/Retail"
+#: build/trans_presets.java:3459
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
-#. item "Land use/Retail"
-#: build/trans_presets.java:3434
+#. item "Land use/Retail" label "Edit Retail Landuse"
+#: build/trans_presets.java:3460
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
-#. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3439
+#. item "Land use/Commercial"
+#: build/trans_presets.java:3465
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
-#. item "Land use/Commercial"
-#: build/trans_presets.java:3440
+#. item "Land use/Commercial" label "Edit Commercial Landuse"
+#: build/trans_presets.java:3466
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
-#. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3445
+#. item "Land use/Industrial"
+#: build/trans_presets.java:3471
 msgid "Industrial"
 msgstr "Industriale"
 
-#. item "Land use/Industrial"
-#: build/trans_presets.java:3446
+#. item "Land use/Industrial" label "Edit Industrial Landuse"
+#: build/trans_presets.java:3472
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
-#. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3451
+#. item "Land use/Railway land"
+#: build/trans_presets.java:3477
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
 
-#. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3453
+#. item "Land use/Railway land" label "Edit Railway Landuse"
+#: build/trans_presets.java:3479
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
-#. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3458
+#. item "Land use/Military"
+#: build/trans_presets.java:3484
 msgid "Military"
 msgstr "Militare"
 
-#. item "Land use/Military"
-#: build/trans_presets.java:3459
+#. item "Land use/Military" label "Edit Military Landuse"
+#: build/trans_presets.java:3485
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
 
-#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3465
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3491
 msgid "Construction area"
 msgstr "Area in costruzione"
 
-#. item "Land use/Construction area"
-#: build/trans_presets.java:3466
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#: build/trans_presets.java:3492
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3471
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3497
 msgid "Brownfield"
 msgstr "Ridestinazione d''uso"
 
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3472
+#. item "Land use/Brownfield" label "Edit Brownfield Landuse"
+#: build/trans_presets.java:3498
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d''uso"
 
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3477
+#. item "Land use/Greenfield"
+#: build/trans_presets.java:3503
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3478
+#. item "Land use/Greenfield" label "Edit Greenfield Landuse"
+#: build/trans_presets.java:3504
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3483
+#. item "Land use/Landfill"
+#: build/trans_presets.java:3509
 msgid "Landfill"
 msgstr "Discarica"
 
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3484
+#. item "Land use/Landfill" label "Edit Landfill Landuse"
+#: build/trans_presets.java:3510
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3489
+#. item "Land use/Quarry"
+#: build/trans_presets.java:3515
 msgid "Quarry"
 msgstr "Cava"
 
-#. item "Land use/Quarry"
-#: build/trans_presets.java:3490
+#. item "Land use/Quarry" label "Edit Quarry Landuse"
+#: build/trans_presets.java:3516
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:3497
+#. group "Annotation"
+#: build/trans_presets.java:3523
 msgid "Annotation"
 msgstr "Annotazione"
 
-#. group "Annotation"
-#: build/trans_presets.java:3498
+#. item "Annotation/Addresses"
+#: build/trans_presets.java:3524
 msgid "Addresses"
 msgstr "Indirizzi"
 
-#. 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:3501
+#. item "Annotation/Addresses" label "Edit Address Information"
+#: build/trans_presets.java:3527
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
 
-#. item "Annotation/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:3503
+#. item "Annotation/Addresses" text "House number"
+#: build/trans_presets.java:3529
 msgid "House number"
 msgstr "Numero civico"
 
-#. item "Annotation/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:3505
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3531
 msgid "House name"
 msgstr "Nome Casa"
 
-#. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:3506
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3532
 msgid "Street name"
 msgstr "Nome Strada"
 
-#. item "Annotation/Addresses" text "Street name"
-#: build/trans_presets.java:3507
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3533
 msgid "City name"
 msgstr "Nome città"
 
-#. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:3508
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3534
 msgid "Post code"
 msgstr "Codice postale"
 
-#. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:3509
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3535
 msgid "Country code"
 msgstr "Codice nazione"
 
-#. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "AT"
 msgstr "AT"
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "CH"
 msgstr "CH"
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "DE"
 msgstr "DE"
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "FR"
 msgstr "FR"
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "GB"
 msgstr "GB"
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "IT"
 msgstr "IT"
 
-#: build/trans_presets.java:3509
+#: build/trans_presets.java:3535
 msgid "US"
 msgstr "US"
 
-#. 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:3515
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#: build/trans_presets.java:3541
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
 
-#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:3517
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3543
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
-#. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:3517
+#: build/trans_presets.java:3543
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:3519
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3545
 msgid "Contact"
 msgstr "Contatto"
 
-#. item "Annotation/Contact"
-#: build/trans_presets.java:3520
+#. item "Annotation/Contact" label "Edit Contact information"
+#: build/trans_presets.java:3546
 msgid "Edit Contact information"
 msgstr "Modifica informazioni di contatto"
 
-#. item "Annotation/Contact" text "Email Address"
-#. <space />
-#: build/trans_presets.java:3528
-msgid "Wikipedia"
-msgstr "Wikipedia"
-
-#. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:3529
+#. item "Annotation/Contact" text "Image"
+#: build/trans_presets.java:3555
 msgid "Image"
 msgstr "Immagine"
 
-#. item "Relations/Multipolygon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3537
+#. item "Relations/Multipolygon" label "Edit Multipolygon"
+#: build/trans_presets.java:3563
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
 
-#. item "Relations/Multipolygon" text "Name"
 #. </optional>
 #. <roles>
-#. item "Relations/Boundary" combo "Administrative level"
+#. item "Relations/Multipolygon" role "outer segment"
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3543 build/trans_presets.java:3560
+#. item "Relations/Boundary" role "outer segment"
+#: build/trans_presets.java:3569 build/trans_presets.java:3586
 msgid "outer segment"
 msgstr "segmento esterno"
 
-#. item "Relations/Multipolygon" role "outer segment"
-#. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3544 build/trans_presets.java:3561
+#. item "Relations/Multipolygon" role "inner segment"
+#. item "Relations/Boundary" role "inner segment"
+#: build/trans_presets.java:3570 build/trans_presets.java:3587
 msgid "inner segment"
 msgstr "segmento interno"
 
-#. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3547
+#. item "Relations/Boundary"
+#: build/trans_presets.java:3573
 msgid "Boundary"
 msgstr "Confine"
 
-#. item "Relations/Boundary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3552
+#. item "Relations/Boundary" label "Edit Boundary"
+#: build/trans_presets.java:3578
 msgid "Edit Boundary"
 msgstr "Modifica confine"
 
-#. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3556
+#. item "Relations/Boundary" combo "Boundary type"
+#: build/trans_presets.java:3582
 msgid "Boundary type"
 msgstr "Tipo di confine"
 
-#. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "administrative"
 msgstr "amministrativo"
 
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "national"
 msgstr "nazionale"
 
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "civil"
 msgstr "civile"
 
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3582
 msgid "political"
 msgstr "circoscrizione elettorale"
 
-#: build/trans_presets.java:3557
+#. item "Relations/Boundary" combo "Administrative level"
+#: build/trans_presets.java:3583
 msgid "Administrative level"
 msgstr "Livello amministrativo"
 
-#. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3562
+#. item "Relations/Boundary" role "Sub area"
+#: build/trans_presets.java:3588
 msgid "Sub area"
 msgstr "Sotto-area"
 
-#. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3563
+#. item "Relations/Boundary" role "Administration centre"
+#: build/trans_presets.java:3589
 msgid "Administration centre"
 msgstr "Centro amministrativo"
 
-#. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3566
+#. item "Relations/Turn restriction"
+#: build/trans_presets.java:3592
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
 
-#. item "Relations/Turn restriction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3569
+#. item "Relations/Turn restriction" label "Edit Turn Restriction"
+#: build/trans_presets.java:3595
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
 
-#. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3571
+#. item "Relations/Turn restriction" combo "Restriction"
+#: build/trans_presets.java:3597
 msgid "Restriction"
 msgstr "Divieto"
 
-#. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3597
 msgid "only_straight_on"
 msgstr "solo diritto"
 
-#. item "Relations/Turn restriction" text "Name"
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3576
+#. item "Relations/Turn restriction" role "from way"
+#: build/trans_presets.java:3602
 msgid "from way"
 msgstr "dal percorso"
 
-#. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3577
+#. item "Relations/Turn restriction" role "via node or way"
+#: build/trans_presets.java:3603
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
-#. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3578
+#. item "Relations/Turn restriction" role "to way"
+#: build/trans_presets.java:3604
 msgid "to way"
 msgstr "verso il percorso"
 
-#. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3581
+#. item "Relations/Route"
+#: build/trans_presets.java:3607
 msgid "Route"
 msgstr "Itinerario"
 
-#. item "Relations/Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3584
+#. item "Relations/Route" label "Edit Route"
+#: build/trans_presets.java:3610
 msgid "Edit Route"
 msgstr "Modifica un itinerario"
 
-#. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3586
+#. item "Relations/Route" combo "Route type"
+#: build/trans_presets.java:3612
 msgid "Route type"
 msgstr "Tipo di itinerario"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "ski"
 msgstr "sci"
 
-#. color bicycle
 #. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -32179,5 +32282,5 @@
 #. <rule>
 #. <condition k="foot" v="designated"/>
-#. color bicycle
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32195,5 +32298,5 @@
 #. <rule>
 #. <condition k="highway" v="path"/>
-#. color bicycle
+#. color foot
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32211,5 +32314,5 @@
 #. <condition k="highway" v="path"/>
 #. <condition k="foot" v="official"/>
-#. color bicycle
+#. color foot
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32219,13 +32322,13 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="steps"/>
 #. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3586 build/trans_style.java:247
+#: build/trans_presets.java:3612 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
@@ -32235,13 +32338,12 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3612
 msgid "detour"
 msgstr "deviazione"
 
-#. color otherrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32251,74 +32353,75 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3586 build/trans_style.java:1233
+#. color subway
+#: build/trans_presets.java:3612 build/trans_style.java:1233
 msgid "subway"
 msgstr "metropolitana"
 
-#. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3589
+#. item "Relations/Route" text "Symbol description"
+#: build/trans_presets.java:3615
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
 
-#. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3592
+#. item "Relations/Route" text "Network"
+#: build/trans_presets.java:3618
 msgid "Network"
 msgstr "Rete"
 
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3594
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3620
 msgid "Route state"
 msgstr "Stato dell''itinerario"
 
-#. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3620
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3595
+#. item "Relations/Route" text "Color (hex)"
+#: build/trans_presets.java:3621
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
 
-#. item "Relations/Route" text "Color (hex)"
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3598
+#. item "Relations/Route" role "route segment"
+#: build/trans_presets.java:3624
 msgid "route segment"
 msgstr "segmento di itinerario"
 
-#. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3599
+#. item "Relations/Route" role "forward segment"
+#: build/trans_presets.java:3625
 msgid "forward segment"
 msgstr "segmento diretto"
 
-#. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3600
+#. item "Relations/Route" role "backward segment"
+#: build/trans_presets.java:3626
 msgid "backward segment"
 msgstr "segmento opposto"
 
-#. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3601
+#. item "Relations/Route" role "halt point"
+#: build/trans_presets.java:3627
 msgid "halt point"
 msgstr "punto di fermata"
 
-#. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3602
+#. item "Relations/Route" role "forward halt point"
+#: build/trans_presets.java:3628
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
-#. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3603
+#. item "Relations/Route" role "backward halt point"
+#: build/trans_presets.java:3629
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -32395,9 +32498,9 @@
 #. -->
 #.
+#. mappaint style named "standard"
 #: build/trans_style.java:72
 msgid "standard"
 msgstr "standard"
 
-#. mappaint style named "standard"
 #.
 #. <rule>
@@ -32459,5 +32562,5 @@
 #. <rule>
 #. <condition k="bridge" b="yes"/>
-#. color deprecated
+#. color bridge
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32487,4 +32590,5 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
+#. color bridge
 #: build/trans_style.java:132 build/trans_style.java:146
 #: build/trans_style.java:153 build/trans_style.java:160
@@ -32493,5 +32597,4 @@
 msgstr "ponte"
 
-#. color bridge
 #. <icon annotate="true" src="vehicle/viaduct.png"/>
 #. <scale_min>1</scale_min>
@@ -32500,5 +32603,5 @@
 #. <rule>
 #. <condition k="bridge" b="no"/>
-#. color bridge
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32521,5 +32624,5 @@
 #. <rule>
 #. <condition k="embankment" b="no"/>
-#. color street
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32529,5 +32632,5 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
-#. color sport
+#. color deprecated
 #. <icon annotate="true" src="sport/fishing.png"/>
 #. <scale_min>1</scale_min>
@@ -32543,4 +32646,5 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
+#. color deprecated
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
@@ -32549,5 +32653,4 @@
 msgstr "deprecato"
 
-#. color foot
 #. <icon annotate="true" src="vehicle/restriction/foot-designated.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -32577,5 +32680,5 @@
 #. <rule>
 #. <condition k="horse" v="designated"/>
-#. color service
+#. color horse
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32585,9 +32688,9 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
+#. color horse
 #: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "cavallo"
 
-#. color horse
 #. <icon src="vehicle/restriction/horse-designated.png" priority="-100"/>
 #. <scale_min>1</scale_min>
@@ -32716,5 +32819,4 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32736,5 +32838,4 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32756,5 +32857,4 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32777,5 +32877,4 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color barrier
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32790,5 +32889,4 @@
 #. <condition k="barrier" v="retaining_wall"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
-#. color barrier
 #. color barrier
 #. <scale_min>1</scale_min>
@@ -32815,5 +32913,4 @@
 msgstr "barriera"
 
-#. color barrier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32872,9 +32969,9 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
+#. color motorroad
 #: build/trans_style.java:548
 msgid "motorroad"
 msgstr "superstrada"
 
-#. color street
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32884,5 +32981,5 @@
 #. <rule>
 #. <condition k="highway" v="track"/>
-#. color bicycle
+#. color highway_track
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -32926,4 +33023,5 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
+#. color highway_track
 #: build/trans_style.java:649 build/trans_style.java:976
 #: build/trans_style.java:984 build/trans_style.java:992
@@ -32932,5 +33030,4 @@
 msgstr "tracciato stradale"
 
-#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33018,9 +33115,9 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#. color services
 #: build/trans_style.java:867
 msgid "services"
 msgstr "stazione di servizio"
 
-#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -33030,9 +33127,9 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#. color ford
 #: build/trans_style.java:875
 msgid "ford"
 msgstr "guado"
 
-#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -33049,9 +33146,9 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
+#. color turningcircle
 #: build/trans_style.java:890
 msgid "turningcircle"
 msgstr "slargo per inversione di marcia"
 
-#. color construction
 #. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
@@ -33062,9 +33159,9 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
+#. color emergency_access_point
 #: build/trans_style.java:914
 msgid "emergency_access_point"
 msgstr "punto di accesso di emergenza"
 
-#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33079,5 +33176,4 @@
 msgstr "sponda"
 
-#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33087,9 +33183,9 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
+#. color stream
 #: build/trans_style.java:1043
 msgid "stream"
 msgstr "torrente"
 
-#. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33099,9 +33195,9 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
+#. color dock
 #: build/trans_style.java:1066
 msgid "dock"
 msgstr "darsena"
 
-#. color dock
 #. <icon annotate="true" src="nautical/boatyard.png"/>
 #. <scale_min>1</scale_min>
@@ -33155,5 +33251,5 @@
 #. <condition k="waterway" v="weir"/>
 #. <icon annotate="true" src="nautical/weir.png"/>
-#. color rapids
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33164,5 +33260,4 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33172,5 +33267,5 @@
 #. <condition k="waterway" v="waterfall"/>
 #. <icon annotate="true" src="nautical/waterfall.png"/>
-#. color power
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33214,5 +33309,5 @@
 #. <condition k="man_made" v="lighthouse"/>
 #. <icon annotate="true" src="misc/landmark/lighthouse.png"/>
-#. color pipeline
+#. color manmade
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33302,4 +33397,5 @@
 #. <condition k="man_made" v="water_works"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
+#. color manmade
 #: build/trans_style.java:1089 build/trans_style.java:1118
 #: build/trans_style.java:1134 build/trans_style.java:1135
@@ -33315,5 +33411,4 @@
 msgstr "costruzioni umane"
 
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33323,9 +33418,9 @@
 #. <condition k="waterway" v="rapids"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
+#. color rapids
 #: build/trans_style.java:1126
 msgid "rapids"
 msgstr "rapide"
 
-#. color manmade
 #. <!-- it's not possible to have both line and area, line seems more likely -->
 #. <scale_min>1</scale_min>
@@ -33383,4 +33478,5 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
+#. color railwaypoint
 #: build/trans_style.java:1153 build/trans_style.java:1168
 #: build/trans_style.java:1183 build/trans_style.java:1191
@@ -33389,5 +33485,4 @@
 msgstr "punto ferroviario"
 
-#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33398,5 +33493,5 @@
 #. <condition k="railway" v="tram"/>
 #. <!-- prefer way types over tram - draw tram as overlay in joined cases -->
-#. color railover
+#. color otherrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33406,14 +33501,14 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
+#. color otherrail
 #: build/trans_style.java:1216 build/trans_style.java:1225
 msgid "otherrail"
 msgstr "altro ferrovia"
 
-#. color otherrail
+#. color railover
 #: build/trans_style.java:1217
 msgid "railover"
 msgstr "ferrovia (sopra)"
 
-#. color subway
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33433,5 +33528,4 @@
 #. <rule>
 #. <condition k="railway" v="disused"/>
-#. color oldrail
 #. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -33451,5 +33545,4 @@
 msgstr "vecchia ferrovia"
 
-#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -33483,5 +33576,4 @@
 #. <condition k="aeroway" v="aerodrome"/>
 #. color aeroway
-#. color aeroway_dark
 #. <icon annotate="true" src="transport/airport.png"/>
 #. <scale_min>1</scale_min>
@@ -33491,4 +33583,5 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
+#. color aeroway
 #: build/trans_style.java:1343 build/trans_style.java:1344
 #: build/trans_style.java:1376
@@ -33496,5 +33589,4 @@
 msgstr "aeroporto"
 
-#. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
 #. <scale_min>1</scale_min>
@@ -33512,9 +33604,9 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
+#. color aeroway_dark
 #: build/trans_style.java:1360 build/trans_style.java:1368
 msgid "aeroway_dark"
 msgstr "aeroporto (scuro)"
 
-#. color aeroway
 #. <icon annotate="true" src="transport/airport.png"/>
 #. <scale_min>1</scale_min>
@@ -33524,9 +33616,9 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
+#. color aeroway_light
 #: build/trans_style.java:1384
 msgid "aeroway_light"
 msgstr "aeroporto (chiaro)"
 
-#. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
 #. <scale_min>1</scale_min>
@@ -33600,4 +33692,5 @@
 #. <rule>
 #. <condition k="aerialway" v="goods"/>
+#. color aerialway
 #: build/trans_style.java:1408 build/trans_style.java:1416
 #: build/trans_style.java:1424 build/trans_style.java:1432
@@ -33607,5 +33700,4 @@
 msgstr "struttura_di_risalita"
 
-#. color aerialway
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -33622,5 +33714,4 @@
 msgstr "pista_facile"
 
-#. color piste_easy
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -33635,5 +33726,4 @@
 msgstr "pista_intermedia"
 
-#. color piste_intermediate
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -33648,5 +33738,4 @@
 msgstr "pista_avanzata"
 
-#. color piste_advanced
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -33661,5 +33750,4 @@
 msgstr "pista esperto"
 
-#. color piste_expert
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -33674,5 +33762,4 @@
 msgstr "pista libera"
 
-#. color piste_freeride
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -33687,5 +33774,4 @@
 msgstr "pista_principiante"
 
-#. color piste_novice
 #. <icon src="sport/skiing.png"/>
 #. <scale_min>1</scale_min>
@@ -33801,4 +33887,5 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
+#. color power
 #: build/trans_style.java:1523 build/trans_style.java:1537
 #: build/trans_style.java:1545 build/trans_style.java:1554
@@ -33811,5 +33898,4 @@
 msgstr "elettricità"
 
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33823,5 +33909,4 @@
 msgstr "pontile"
 
-#. color pier
 #. <icon annotate="true" src="nautical/pier.png"/>
 #. <scale_min>1</scale_min>
@@ -33831,9 +33916,9 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
+#. color pipeline
 #: build/trans_style.java:1684
 msgid "pipeline"
 msgstr "conduttura"
 
-#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33885,5 +33970,5 @@
 #. <condition k="leisure" v="water_park"/>
 #. <icon annotate="true" src="leisure/water_park.png"/>
-#. color marina
+#. color leisure
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33973,4 +34058,5 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
+#. color leisure
 #: build/trans_style.java:1782 build/trans_style.java:1790
 #: build/trans_style.java:1798 build/trans_style.java:1806
@@ -33985,5 +34071,4 @@
 msgstr "struttura per lo svago"
 
-#. color leisure
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33993,9 +34078,9 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
+#. color marina
 #: build/trans_style.java:1830
 msgid "marina"
 msgstr "porto turistico"
 
-#. color leisure
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34087,4 +34172,5 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
+#. color amenity
 #: build/trans_style.java:1928 build/trans_style.java:1936
 #: build/trans_style.java:1944 build/trans_style.java:1952
@@ -34096,5 +34182,4 @@
 msgstr "struttura di servizio"
 
-#. color amenity
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34200,4 +34285,5 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#. color amenity_traffic
 #: build/trans_style.java:2016 build/trans_style.java:2024
 #: build/trans_style.java:2032 build/trans_style.java:2040
@@ -34210,5 +34296,4 @@
 msgstr "servizio al traffico"
 
-#. color amenity_traffic
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34295,5 +34380,5 @@
 #. <condition k="amenity" v="community_centre"/>
 #. <icon annotate="true" src="service.png"/>
-#. color light_water
+#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34466,5 +34551,5 @@
 #. <condition k="amenity" v="driving_school"/>
 #. <icon annotate="true" src="education/driving_school.png"/>
-#. color health
+#. color amenity_light
 #. <icon annotate="true" src="health/veterinary.png"/>
 #. <scale_min>1</scale_min>
@@ -34642,4 +34727,5 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
+#. color amenity_light
 #: build/trans_style.java:2127 build/trans_style.java:2142
 #: build/trans_style.java:2150 build/trans_style.java:2158
@@ -34665,5 +34751,4 @@
 msgstr "struttura di servizio (chiaro)"
 
-#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34681,5 +34766,5 @@
 #. <condition k="amenity" v="fountain"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#. color military
+#. color light_water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34691,4 +34776,5 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
+#. color light_water
 #: build/trans_style.java:2205 build/trans_style.java:2213
 #: build/trans_style.java:3468
@@ -34696,5 +34782,4 @@
 msgstr "acqua (chiaro)"
 
-#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -34751,4 +34836,5 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
+#. color health
 #: build/trans_style.java:2391 build/trans_style.java:2399
 #: build/trans_style.java:2407 build/trans_style.java:2416
@@ -34758,5 +34844,4 @@
 msgstr "salute"
 
-#. color amenity_light
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35113,4 +35198,5 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
 #: build/trans_style.java:2625 build/trans_style.java:2633
 #: build/trans_style.java:2641 build/trans_style.java:2649
@@ -35138,5 +35224,4 @@
 msgstr "negozio"
 
-#. color shop
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35204,4 +35289,5 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
+#. color hotel
 #: build/trans_style.java:2980 build/trans_style.java:2988
 #: build/trans_style.java:2996 build/trans_style.java:3004
@@ -35211,5 +35297,4 @@
 msgstr "hotel"
 
-#. color hotel
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35260,5 +35345,4 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
-#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35306,4 +35390,5 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
+#. color tourism
 #: build/trans_style.java:3044 build/trans_style.java:3052
 #: build/trans_style.java:3060 build/trans_style.java:3068
@@ -35314,5 +35399,4 @@
 msgstr "turismo"
 
-#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35396,4 +35480,5 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
+#. color historic
 #: build/trans_style.java:3141 build/trans_style.java:3149
 #: build/trans_style.java:3157 build/trans_style.java:3165
@@ -35404,5 +35489,4 @@
 msgstr "attrazione storica"
 
-#. color green
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35411,9 +35495,9 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
+#. color quarry
 #: build/trans_style.java:3261
 msgid "quarry"
 msgstr "cava/miniera"
 
-#. color quarry
 #. <icon src="misc/landmark/mine.png"/>
 #. <scale_min>1</scale_min>
@@ -35423,9 +35507,9 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
+#. color landfill
 #: build/trans_style.java:3269
 msgid "landfill"
 msgstr "discarica"
 
-#. color landfill
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -35443,9 +35527,9 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
+#. color basin
 #: build/trans_style.java:3277 build/trans_style.java:3285
 msgid "basin"
 msgstr "bacino"
 
-#. color residential
 #. <icon src="misc/landuse/residential.png"/>
 #. <scale_min>1</scale_min>
@@ -35455,9 +35539,9 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
+#. color farmyard
 #: build/trans_style.java:3325
 msgid "farmyard"
 msgstr "aia"
 
-#. color farmyard
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -35476,9 +35560,9 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
+#. color retail
 #: build/trans_style.java:3334 build/trans_style.java:3342
 msgid "retail"
 msgstr "area commerciale (negozi)"
 
-#. color retail
 #. <icon src="misc/landuse/commercial.png"/>
 #. <scale_min>1</scale_min>
@@ -35488,9 +35572,9 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
+#. color industrial
 #: build/trans_style.java:3350
 msgid "industrial"
 msgstr "industriale"
 
-#. color industrial
 #. <icon src="misc/landmark/works.png"/>
 #. <scale_min>1</scale_min>
@@ -35500,9 +35584,9 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
+#. color brownfield
 #: build/trans_style.java:3358
 msgid "brownfield"
 msgstr "ridestinazione d''uso"
 
-#. color brownfield
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -35512,9 +35596,9 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
+#. color greenfield
 #: build/trans_style.java:3366
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
 
-#. color greenfield
 #. <icon src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -35524,9 +35608,9 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
+#. color railland
 #: build/trans_style.java:3374
 msgid "railland"
 msgstr "area ferroviaria"
 
-#. color construction
 #. <icon src="misc/construction.png"/>
 #. <scale_min>1</scale_min>
@@ -35536,5 +35620,5 @@
 #. <rule>
 #. <condition k="landuse" v="military"/>
-#. color green
+#. color military
 #. <icon src="leisure/common.png"/>
 #. <scale_min>1</scale_min>
@@ -35579,4 +35663,5 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
+#. color military
 #: build/trans_style.java:3391 build/trans_style.java:3426
 #: build/trans_style.java:3434 build/trans_style.java:3442
@@ -35585,5 +35670,4 @@
 msgstr "militare"
 
-#. color military
 #. <icon src="vehicle/tank.png"/>
 #. <scale_min>1</scale_min>
@@ -35593,9 +35677,9 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
+#. color cemetery
 #: build/trans_style.java:3399
 msgid "cemetery"
 msgstr "cimitero"
 
-#. color light_water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35604,9 +35688,9 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
+#. color peak
 #: build/trans_style.java:3475
 msgid "peak"
 msgstr "picco montuoso"
 
-#. color peak
 #. <icon annotate="true" src="misc/landmark/peak_small.png"/>
 #. <scale_min>1</scale_min>
@@ -35617,9 +35701,9 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
+#. color glacier
 #: build/trans_style.java:3484
 msgid "glacier"
 msgstr "ghiacciaio"
 
-#. color glacier
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35629,9 +35713,9 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
+#. color volcano
 #: build/trans_style.java:3492
 msgid "volcano"
 msgstr "vulcano"
 
-#. color volcano
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35642,5 +35726,4 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35650,5 +35733,5 @@
 #. <condition k="natural" v="scree"/>
 #. <icon src="misc/no_icon.png"/>
-#. color scrub
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35658,5 +35741,5 @@
 #. <condition k="natural" v="fell"/>
 #. <icon src="misc/no_icon.png"/>
-#. color beach
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35682,4 +35765,5 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="vehicle/tunnel.png"/>
+#. color natural
 #: build/trans_style.java:3500 build/trans_style.java:3501
 #: build/trans_style.java:3509 build/trans_style.java:3525
@@ -35689,5 +35773,4 @@
 msgstr "elemento naturale"
 
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35697,9 +35780,9 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
+#. color scrub
 #: build/trans_style.java:3517
 msgid "scrub"
 msgstr "boscaglia"
 
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35709,9 +35792,9 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
+#. color heath
 #: build/trans_style.java:3533
 msgid "heath"
 msgstr "brughiera"
 
-#. color heath
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35721,9 +35804,9 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
+#. color woodarea
 #: build/trans_style.java:3541
 msgid "woodarea"
 msgstr "area boschiva non gestita"
 
-#. color water
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35733,9 +35816,9 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
+#. color mud
 #: build/trans_style.java:3573
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
 
-#. color mud
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35745,9 +35828,9 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
+#. color beach
 #: build/trans_style.java:3581
 msgid "beach"
 msgstr "spiaggia"
 
-#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -35821,4 +35904,5 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
+#. color route
 #: build/trans_style.java:3621 build/trans_style.java:3629
 #: build/trans_style.java:3637 build/trans_style.java:3645
@@ -35828,5 +35912,4 @@
 msgstr "itinerario"
 
-#. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -35911,4 +35994,5 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
+#. color boundary
 #: build/trans_style.java:3687 build/trans_style.java:3695
 #: build/trans_style.java:3699 build/trans_style.java:3703
@@ -35922,5 +36006,4 @@
 msgstr "confine"
 
-#. color deprecated
 #. <icon src="misc/landmark/mountain_pass.png"/>
 #. <scale_min>1</scale_min>
@@ -36066,4 +36149,5 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
+#. color place
 #: build/trans_style.java:4240 build/trans_style.java:4248
 #: build/trans_style.java:4256 build/trans_style.java:4264
@@ -36076,5 +36160,4 @@
 msgstr "luogo"
 
-#. color place
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -36084,4 +36167,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
+#. color tiger_data
 #: build/trans_style.java:4344
 msgid "tiger_data"
@@ -36093,68 +36177,68 @@
 #. <!-- action class: either fully qualified classnames or if not found,
 #. package at.dallermassl.josm.plugin.surveyor.action is assumed -->
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #: build/trans_surveyor.java:6
 msgid "Tunnel Start"
 msgstr "Inizio galleria"
 
-#. <button label="Bridge" hotkey="B" type="toggle">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="bridge"/>
 #. </button>
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
 #: build/trans_surveyor.java:16
 msgid "Village/City"
 msgstr "Insediamento urbano"
 
-#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
 #. <!--action class="SetNodeAction" params="amenity=parking"/-->
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Parking"/>
 #. </button>
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #: build/trans_surveyor.java:29
 msgid "One Way"
 msgstr "Senso unico"
 
-#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="oneway=yes"/>
 #. </button>
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #: build/trans_surveyor.java:33
 msgid "Church"
 msgstr "Chiesa"
 
-#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
 #. <action class="SetWaypointAction" params="Church"/>
 #. </button>
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #: build/trans_surveyor.java:38
 msgid "Fuel Station"
 msgstr "Stazione di rifornimento"
 
-#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetNodeAction" params="amenity=restaurant"/>
 #. <action class="SetWaypointAction" params="Restaurant"/>
 #. </button>
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #: build/trans_surveyor.java:52
 msgid "Shopping"
 msgstr "Acquisti"
 
-#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #: build/trans_surveyor.java:56
 msgid "WC"
 msgstr "WC"
 
-#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
 #: build/trans_surveyor.java:60
 msgid "Camping"
 msgstr "Campeggio"
 
-#. <button label="Residential" hotkey="5">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Residential"/>
@@ -36165,4 +36249,5 @@
 #. <action class="SetWaypointAction" params="Test X"/>
 #. </button>
+#. <button label="Test" hotkey="F12">
 #: build/trans_surveyor.java:93 build/trans_surveyor.java:97
 msgid "Test"
@@ -36204,23 +36289,24 @@
 #.
 #. Empty lines and space signs are ignored
+#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
 #: build/trans_validator.java:38
 msgid "abbreviated street name"
 msgstr "abbreviazione del nome della strada"
 
-#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
+#. node : W : oneway == *
 #: build/trans_validator.java:40
 msgid "oneway tag on a node"
 msgstr "etichetta di senso unico presente su un nodo"
 
-#. node : W : oneway == *
+#. node : W : bridge == BOOLEAN_TRUE
 #: build/trans_validator.java:41
 msgid "bridge tag on a node"
 msgstr "nodo etichettato come ponte (bridge)"
 
-#. node : W : bridge == BOOLEAN_TRUE
 #. node : W : highway == tertiary
 #. node : W : highway == secondary
 #. node : W : highway == residential
 #. node : W : highway == unclassified
+#. node : W : highway == track
 #: build/trans_validator.java:42 build/trans_validator.java:43
 #: build/trans_validator.java:44 build/trans_validator.java:45
@@ -36229,12 +36315,12 @@
 msgstr "etichetta stradale errata su un nodo"
 
-#. node : W : highway == track
+#. way  : W : highway == unclassified && name != *
 #: build/trans_validator.java:47
 msgid "Unnamed unclassified highway"
 msgstr "Strada non classificata priva di nome"
 
-#. way  : W : highway == unclassified && name != *
 #. way  : I : highway == secondary && ref != *
 #. way  : I : highway == tertiary && ref != *
+#. way  : I : highway == motorway && nat_ref != *
 #: build/trans_validator.java:48 build/trans_validator.java:49
 #: build/trans_validator.java:50
@@ -36242,70 +36328,70 @@
 msgstr "strada senza un riferimento"
 
-#. way  : I : highway == motorway && nat_ref != *
+#. *    : W : highway == road
 #: build/trans_validator.java:51
 msgid "temporary highway type"
 msgstr "tipo di strada temporaneo"
 
-#. *    : W : highway == road
+#. *    : W : / *name
 #: build/trans_validator.java:52
 msgid "misspelled key name"
 msgstr "nome della chiave errata"
 
-#. *    : W : / *name */i == * && name != *
 #. The following could replace unnamed way check. Still at the moment we keep it as it is
 #. way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
+#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
 #: build/trans_validator.java:58
 msgid "cycleway with tag bicycle"
 msgstr "pista ciclabile con etichetta bicycle"
 
-#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
+#. way  : W : highway == footway && foot == BOOLEAN_FALSE
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
 msgstr "footway con etichetta foot"
 
-#. way  : W : highway == footway && foot == BOOLEAN_FALSE
 #. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
+#. way  : W : highway == cycleway && cycleway == lane
 #: build/trans_validator.java:62
 msgid "separate cycleway as lane on a cycleway"
 msgstr "cycleway separata come corsia su cycleway"
 
-#. way  : W : highway == cycleway && cycleway == lane
+#. way  : W : highway == * && barrier == *
 #: build/trans_validator.java:63
 msgid "barrier used on a way"
 msgstr "barriera usata su un percorso"
 
-#. way  : W : highway == * && barrier == *
 #. way  : I : waterway == * && layer != *                         # waterway without layer tag
 #. way  : I : highway == footway && maxspeed == *
+#. way  : I : highway == steps && maxspeed == *
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
 msgstr "velocità massima per footway"
 
-#. way  : I : highway == steps && maxspeed == *
+#. *    : W : layer == /\+.
 #: build/trans_validator.java:69
 msgid "layer tag with + sign"
 msgstr "etichetta del livello con il segno +"
 
-#. *    : W : layer == /\+.*/
+#. *    : I : name == /.*Strasse.
 #: build/trans_validator.java:71
 msgid "street name contains ss"
 msgstr "il nome della strada contiene ss"
 
-#. *    : I : name == /.*Strasse.*/i
+#. relation : E : type != *
 #: build/trans_validator.java:73
 msgid "relation without type"
 msgstr "relazione senza tipo"
 
-#. relation : E : type != *
+#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
 #: build/trans_validator.java:75
 msgid "restaurant without name"
 msgstr "ristorante senza nome"
 
-#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
 #. *    : W : natural == water && waterway == *                   # unusual tag combination
 #. *    : W : highway == * && waterway == *
+#. *    : W : highway == * && natural == *
 #: build/trans_validator.java:78 build/trans_validator.java:79
 msgid "unusual tag combination"
@@ -36316,132 +36402,133 @@
 #. NOTE: default items should be common and worldwide
 #.
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:5
 msgid "Landsat"
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
+#. http://irs.gis-lab.info/?layers=landsat&
 #: build/trans_wms.java:6
 msgid "Landsat (mirror)"
 msgstr "Landsat (mirror)"
 
-#. http://irs.gis-lab.info/?layers=landsat&
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #: build/trans_wms.java:7
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #.
 #. different forms for web access
 #. must be html:<url>
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:11
 msgid "Yahoo Sat"
 msgstr "Yahoo Satellite"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:12
 msgid "OpenStreetMap"
 msgstr "OpenStreetMap"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:13
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
 #: build/trans_wms.java:14
 msgid "TilesAtHome"
 msgstr "TilesAtHome"
 
-#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
 #.
 #.
 #. only for Germany
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
 #: build/trans_wms.java:18
 msgid "Streets NRW Geofabrik.de"
 msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
 #.
 #.
 #. only for North America
 #. Terraserver USCG - High resolution maps
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
 #: build/trans_wms.java:24
 msgid "Terraserver Urban"
 msgstr "Terraserver Urban"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
 #.
 #.
 #. only for Czech Republic
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
 #: build/trans_wms.java:28
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
-#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
+#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
 #: build/trans_wms.java:29
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
-#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
 #.
 #.
 #. only for GB
 #. fails with division by zero error
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:34
 msgid "NPE Maps"
 msgstr "Mappe NPE"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
+#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
 #: build/trans_wms.java:35
 msgid "NPE Maps (Tim)"
 msgstr "Mappe NPE (Tim)"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
+#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
 #: build/trans_wms.java:36
 msgid "7th Series (OS7)"
 msgstr "7a Serie (OS7)"
 
-#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
 #.
 #.
 #. only for Japan
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:40
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Giappone (ORTHO)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:41
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Giappone (ORTHO01)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:42
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Giappone (ORTHO02)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:43
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Giappone (ORTHO03)"
 
-#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #.
 #.
 #. only for Italy
+#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:47
 msgid "Lodi - Italy"
 msgstr "Lodi - Italia"
 
-#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
+#. 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:48
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
 
-#. 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&
+#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
@@ -38732,4 +38819,10 @@
 #~ msgstr "Nautica"
 
+#~ msgid "Seamark Editor"
+#~ msgstr "Editor delle caratteristiche nautiche"
+
+#~ msgid "Edit OpenSeaMap"
+#~ msgstr "Modifica OpenSeaMap"
+
 #~ msgid ""
 #~ "{0} will work but remote control is disabled.\n"