Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 19496)
+++ applications/editors/josm/i18n/po/it.po	(revision 19552)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 18:28+0100\n"
-"PO-Revision-Date: 2010-01-13 10:56+0000\n"
+"POT-Creation-Date: 2010-01-18 14:14-0500\n"
+"PO-Revision-Date: 2010-01-18 00:46-0500\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -17,5 +17,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:206
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -28,17 +28,17 @@
 msgstr "Aiuto"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:384
+#: ../core/src/org/openstreetmap/josm/Main.java:378
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:385
-#: ../core/src/org/openstreetmap/josm/Main.java:418
-#: ../core/src/org/openstreetmap/josm/Main.java:486
+#: ../core/src/org/openstreetmap/josm/Main.java:379
+#: ../core/src/org/openstreetmap/josm/Main.java:412
+#: ../core/src/org/openstreetmap/josm/Main.java:480
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126
@@ -57,15 +57,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
@@ -76,10 +76,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:160
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:240
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:454
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:497
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
@@ -89,9 +89,9 @@
 msgstr "Attenzione"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
+#: ../core/src/org/openstreetmap/josm/Main.java:411
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:485
+#: ../core/src/org/openstreetmap/josm/Main.java:479
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -112,8 +112,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:721
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:723
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:732
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:734
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -121,5 +121,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:69
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
 #, java-format
 msgid "Version {0}"
@@ -185,7 +185,7 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"ATTENZIONE: formato URL base dell'API inatteso. Il reindirizzamento alla "
+"ATTENZIONE: formato URL base dell''API inatteso. Il reindirizzamento alla "
 "pagina di informazioni o dello storico delle primitive OSM probabilmente "
-"fallirà. L'URL di base delle API è: \"{0}\""
+"fallirà. L''URL di base delle API è: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -195,16 +195,16 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"ATTENZIONE: formato URL base dell'API inatteso. Il reindirizzamento alla "
-"pagina utente OSM probabilmente fallirà. L'URL di base delle API è: \"{0}\""
+"ATTENZIONE: formato URL base dell''API inatteso. Il reindirizzamento alla "
+"pagina utente OSM probabilmente fallirà. L''URL di base delle API è: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
 #, java-format
 msgid ""
-"You''re about to launch {0} browser windows.<br>This may both clutter your "
+"You are about to launch {0} browser windows.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
 "Si è in procinto di avviare {0} finestre del browser.<br>Questa operazione "
 "potrebbe riempire lo schermo con le finestre del browser<br>e metterci un "
-"po' di tempo."
+"po'' di tempo."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
@@ -224,5 +224,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:158
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -240,7 +240,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112
@@ -254,13 +254,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
@@ -276,5 +275,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr "Click per annullare l'esecuzione dei visualizzatori esterni"
+msgstr "Click per annullare l''esecuzione dei visualizzatori esterni"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -292,5 +291,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
 msgid "Merge"
 msgstr "Unisci"
@@ -299,6 +298,6 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
 msgstr ""
 "<html>Non ci sono livelli al quale unire il livello sorgente ''{0}''.</html>"
@@ -348,5 +347,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103
 msgid "Negative values denote Western/Southern hemisphere."
-msgstr "Valori negativi denotano l'emisfero Occidentale/Meridionale."
+msgstr "Valori negativi denotano l''emisfero Occidentale/Meridionale."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:106
@@ -367,19 +366,20 @@
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
-"Per favore inserire un valore di latitudine valido nell'intervallo -90..90"
+"Per favore inserire un valore di latitudine valido nell''intervallo -90..90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:226
 msgid "Please enter a latitude in the range -90..90"
-msgstr "Per favore inserire un valore di latitudine nell'intervallo -90..90"
+msgstr "Per favore inserire un valore di latitudine nell''intervallo -90..90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:234
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr ""
-"Per favore inserire un valore di longitudine valido nell'intervallo -180..180"
+"Per favore inserire un valore di longitudine valido nell''intervallo -"
+"180..180"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:237
 msgid "Please enter a longitude in the range -180..180"
 msgstr ""
-"Per favore inserire un valore di longitudine nell'intervallo -180..180"
+"Per favore inserire un valore di longitudine nell''intervallo -180..180"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:273
@@ -387,9 +387,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
@@ -407,5 +407,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
-msgid "Close the dialog, don't create a new node"
+msgid "Close the dialog, do not create a new node"
 msgstr "Chiudi la finestra, ma non creare un nuovo nodo"
 
@@ -425,8 +425,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
@@ -435,5 +435,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -449,5 +449,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
 #: ../plugins/terracer/src/terracer/TerracerAction.java:55
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
 msgid "Tool: {0}"
@@ -467,5 +467,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
@@ -474,8 +474,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:754
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -567,5 +567,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:399
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:394
 msgid "Close open changesets"
 msgstr "Chiudi i gruppi di modifiche aperti"
@@ -578,5 +578,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43
@@ -590,10 +590,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
 msgid "There are no open changesets"
 msgstr "Non ci sono gruppi di modifiche aperti"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:83
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
 msgid "No open changesets"
 msgstr "Nessun gruppo di modifiche aperto"
@@ -653,5 +653,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
-msgstr "Copia gli oggetti selezionati all'interno del buffer"
+msgstr "Copia gli oggetti selezionati all''interno del buffer"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
@@ -683,18 +683,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -739,10 +739,10 @@
 msgstr "Scarica i dati della mappa dal server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 msgid "Download parent ways/relations..."
 msgstr "Scarica i percorsi/relazioni da cui dipende..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
@@ -750,56 +750,19 @@
 "selezionate"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "Era richiesto un Id > 0, ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:236
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:71
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:51
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:111
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1038
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:179
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:20
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:32
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:45
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Ci sono stati {0} conflitti durante l'importazione"
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
+#, fuzzy, java-format
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Ci sono stati {0} conflitti durante l''importazione"
+msgstr[1] "Ci sono stati {0} conflitti durante l''importazione"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-msgid "Conflicts during download"
-msgstr "Conflitti durante lo scaricamento"
+#, fuzzy
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflitti durante lo scaricamento"
+msgstr[1] "Conflitti durante lo scaricamento"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -820,5 +783,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
 msgstr "Duplica"
@@ -840,5 +803,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
-msgstr "Esci dall'applicazione."
+msgstr "Esci dall''applicazione."
 
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
@@ -855,107 +818,20 @@
 msgstr "Commuta la visualizzazione a schermo pieno"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269
 msgid "Export to GPX..."
 msgstr "Esporta in GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268
 msgid "Export the data to GPX file."
 msgstr "Esporta i dati in un file GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 msgid "Nothing to export. Get some data first."
 msgstr "Niente da esportare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:39
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:110
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:112
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:124
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:314
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:426
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:96
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:112
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:126
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:141
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:158
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:121
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:123
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61
-#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:135
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:341
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:54
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
-#, java-format
-msgid "Parameter ''{0}'' must not be null."
-msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
-#, java-format
-msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Esporta file GPX"
@@ -964,5 +840,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
-msgstr "Storico dell'oggetto"
+msgstr "Storico dell''oggetto"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
@@ -974,50 +850,57 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
-msgstr "Informazioni riguardanti l'elemento"
+msgstr "Informazioni riguardanti l''elemento"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
-"Visualizza le informazioni dell'oggetto OSM su nodi, percorsi o relazioni."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+"Visualizza le informazioni dell''oggetto OSM su nodi, percorsi o relazioni."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 msgid "Join overlapping Areas"
 msgstr "Unisci aree sovrapposte"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 msgid "Joins areas that overlap each other"
-msgstr "Unisci aree che si sovrappongono l'un l'altra"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125
+msgstr "Unisci aree che si sovrappongono l''un l''altra"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
 msgstr "Selezionare almeno un percorso chiuso che dovrebbe essere unito."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
 msgid "Only up to two areas can be joined at the moment."
 msgstr "Attualmente solo due aree possono essere unite."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138
-#, java-format
-msgid "\"{0}\" is not closed and therefore can't be joined."
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:139
+#, java-format
+msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" non è chiuso e quindi non può essere unito."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.\n"
-"This can lead to nodes being deleted accidentally.\n"
-"Are you really sure to continue?"
-msgstr ""
-"La/le strade selezionate hanno dei nodi fuori dalla zona dei dati "
-"scaricati.\n"
-"Alcuni nodi potrebbero essere cancellati accidentalmente.\n"
-"Sei veramente sicuro di continuare ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154
+#, fuzzy
+msgid "The selected way has nodes outside of the downloaded data region."
+msgid_plural ""
+"The selected ways have nodes outside of the downloaded data region."
+msgstr[0] "Il percorso selezionato non contiene il nodo selezionato."
+msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
+msgid "This can lead to nodes being deleted accidentally."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
+msgid "Are you really sure to continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:70
 msgid "Please abort if you are not sure"
 msgstr "Si prega di annullare se non si è sicuri"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
 msgid "No intersection found. Nothing was changed."
 msgstr ""
@@ -1025,25 +908,25 @@
 "modifica."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
 msgid "Added node on all intersections"
 msgstr "Nodo aggiunto su tutte le intersezioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Fix relations"
 msgstr "Correggi le relazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Joined self-overlapping area"
-msgstr "L'area auto-sovrapposta è stata unita"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228
+msgstr "L''area auto-sovrapposta è stata unita"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
 msgid "Joined overlapping areas"
 msgstr "Le aree sovrapposte sono state unite"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1053,33 +936,33 @@
 "favore verifica che non siano stati introdotti errori."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
 msgid "Enter values for all conflicts."
 msgstr "Inserire dei valori per tutti i conflitti."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
 msgid "Solve Conflicts"
 msgstr "Risolvi conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
 msgid "Fix tag conflicts"
 msgstr "Correggi i conflitti di etichette"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
 msgid "Removed Element from Relations"
 msgstr "Sono stati rimossi elementi dalle Relazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
 msgid "Join Areas: Remove Short Ways"
 msgstr "Unisi Aree: Elimina le way corte"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
 msgid "Closed Way"
 msgstr "Strada chiusa (anello)"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
 msgid "Remove tags from inner ways"
 msgstr "Rimuovi i tag dalle way interne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
 msgid "Join Areas Function"
 msgstr "Funzione di unione delle Aree"
@@ -1125,5 +1008,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "URL"
 msgstr "Indirizzo URL"
@@ -1141,5 +1024,5 @@
 msgstr ""
 "Non è possibile interpretare la latitudine, la longitudine o "
-"l'ingrandimento. Si prega di controllare."
+"l''ingrandimento. Si prega di controllare."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
@@ -1155,26 +1038,26 @@
 msgstr "Unisci il livello corrente con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Unisci nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Unisci i nuovi nodi in quello più vecchio."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Seleziona almeno due nodi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:127
 msgid "Abort Merging"
 msgstr "Annulla unione"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:129
 msgid "Click to abort merging nodes"
-msgstr "Cliccare per annullare l'unione dei nodi"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135
+msgstr "Cliccare per annullare l''unione dei nodi"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:136
 #, java-format
 msgid ""
@@ -1184,5 +1067,5 @@
 "quale è ancora utilizzato."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:229
 #, java-format
 msgid "Merge {0} nodes"
@@ -1284,14 +1167,16 @@
 msgstr "Apri file"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
 msgid "Opening 1 file..."
 msgstr "Apertura di 1 file..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:163
-#, java-format
-msgid "Opening {0} files..."
-msgstr "Apertura di {0} file..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
+#, fuzzy, java-format
+msgid "Opening {0} file..."
+msgid_plural "Opening {0} files..."
+msgstr[0] "Apertura di {0} file..."
+msgstr[1] "Apertura di {0} file..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1312,5 +1197,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-msgid "Select if the data should be downloaded in a new layer"
+msgid "Select if the data should be downloaded into a new layer"
 msgstr "Selezionare se i dati devono essere scaricati in un nuovo livello"
 
@@ -1342,4 +1227,13 @@
 msgid "Download Data"
 msgstr "Scarica dati"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+msgid ""
+"When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes.(Afterwards, you "
+"can undo the movement for certain nodes:<br>Select them and press the "
+"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1361,5 +1255,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Undo orthogonalization for certain nodes"
-msgstr "Annulla l'ortogonalizzazione per certi nodi"
+msgstr "Annulla l''ortogonalizzazione per certi nodi"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99
@@ -1388,5 +1282,5 @@
 msgstr ""
 "<html>Stai usando la proiezione EPSG:4326 che potrebbe portare<br>risultati "
-"inattesi durante l'allineamento rettangolare.<br>Cambia la proiezione per "
+"inattesi durante l''allineamento rettangolare.<br>Cambia la proiezione per "
 "disattivare questo messaggio.<br>Continuare?</html>"
 
@@ -1473,5 +1367,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
-msgstr "Rifa l'ultima azione annullata."
+msgstr "Rifa l''ultima azione annullata."
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
@@ -1490,6 +1384,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1500,11 +1394,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
@@ -1520,12 +1414,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:74
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:216
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:721
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
@@ -1547,6 +1440,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:290
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
@@ -1663,6 +1555,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid ""
-"Show status report with useful information that can be attached to bugs"
+msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Visualizza il rapporto dello stato contenente informazioni utili che possono "
@@ -1686,5 +1577,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1699,9 +1590,9 @@
 msgstr "Elimina i nodi non necessari dal percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 msgid "Please select at least one way to simplify."
 msgstr "Selezionare almeno un percorso da semplificare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89
 #, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
@@ -1713,9 +1604,9 @@
 "La selezione contiene {0} percorsi. Sei sicuro di volerli semplificare tutti?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:92
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:139
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66
 #, java-format
@@ -1752,9 +1643,9 @@
 "way also."
 msgstr[0] ""
-"C'è più di un percorso che utilizza il nodo selezionato. Selezionare anche "
+"C''è più di un percorso che utilizza il nodo selezionato. Selezionare anche "
 "il percorso."
 msgstr[1] ""
-"C'è più di un percorso che utilizza i nodi selezionati. Selezionare anche il "
-"percorso."
+"C''è più di un percorso che utilizza i nodi selezionati. Selezionare anche "
+"il percorso."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:172
@@ -1787,5 +1678,5 @@
 msgstr ""
 "<html>Una relazione di appartenenza basata su un ruolo è stata copiata su "
-"tutte le nuove strade<br>Verificare l'operazione e correggere dove "
+"tutte le nuove strade<br>Verificare l''operazione e correggere dove "
 "necessario.</html>"
 
@@ -1796,5 +1687,5 @@
 msgstr ""
 "<html>Una relazione di appartenenza è stata copiata su tutte le nuove "
-"strade<br>Verificare l'operazione e correggere dove necessario.</html>"
+"strade<br>Verificare l''operazione e correggere dove necessario.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
@@ -1817,48 +1708,47 @@
 msgstr "Commuta l''impostazione globale ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 msgid "UnGlue Ways"
 msgstr "Separa percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplica i nodi usati da più percorsi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
 msgid "This node is not glued to anything else."
 msgstr "Questo nodo non è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
 msgid "None of these nodes are glued to anything else."
 msgstr "Nessuno di questi nodi è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
-msgid "None of this way's nodes are glued to anything else."
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+msgid "None of this way''s nodes are glued to anything else."
 msgstr "Nessun nodo di questo percorso è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selezione corrente non può essere utilizzata per la separazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "Select either:"
 msgstr "Selezionare uno di questi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One tagged node, or"
 msgstr "* Un nodo etichettato, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo che è usato da più di un percorso, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
-msgid ""
-"* One node that is used by more than one way and one of those ways, or"
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1867,5 +1757,5 @@
 "oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1874,5 +1764,5 @@
 "percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1887,18 +1777,19 @@
 "e tutti i nodi saranno selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
 msgid "Unglued Node"
 msgstr "Nodo staccato"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplica in {0} nodi"
 
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "Duplica {0} nodi in {1} nodi"
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#, fuzzy, java-format
+msgid "Dupe {0} node into {1} nodes"
+msgid_plural "Dupe {0} nodes into {1} nodes"
+msgstr[0] "Duplica {0} nodi in {1} nodi"
+msgstr[1] "Duplica {0} nodi in {1} nodi"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1909,5 +1800,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
-msgstr "Annulla l'ultima azione."
+msgstr "Annulla l''ultima azione."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
@@ -1940,7 +1831,7 @@
 
 #. bounds defined? => use the bbox downloader
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:971
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
 msgid "Download data"
 msgstr "Scarica dati"
@@ -1964,5 +1855,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 #, java-format
-msgid "Didn''t find an object with id {0} in the current dataset"
+msgid "Did not find an object with id {0} in the current dataset"
 msgstr ""
 "Nell''insieme di dati corrente non è stato trovato un oggetto con id {0}"
@@ -2004,10 +1895,10 @@
 "resolve them first.</html>"
 msgstr ""
-"<html>Ci sono dei conflitti non risolti nel livello ''{0}''.<br>E' "
+"<html>Ci sono dei conflitti non risolti nel livello ''{0}''.<br>E'' "
 "necessario risolvere prima questi.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
 msgid "No changes to upload."
 msgstr "Nessun cambiamento da caricare."
@@ -2017,9 +1908,9 @@
 msgstr "Niente da caricare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Carica selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Carica sul server OSM tutte le modifiche nella selezione corrente"
@@ -2037,5 +1928,5 @@
 msgid "Checking for deleted parents in the local dataset"
 msgstr ""
-"Verifica degli elementi genitori eliminati nell'insieme di dati locale"
+"Verifica degli elementi genitori eliminati nell''insieme di dati locale"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
@@ -2068,50 +1959,56 @@
 msgstr "Riduci"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+msgctxt "audio"
 msgid "Back"
 msgstr "Indietro"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgctxt "audio"
 msgid "Jump back."
 msgstr "Torna indietro"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
 #, java-format
 msgid "Audio: {0}"
 msgstr "Audio: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+msgctxt "audio"
 msgid "Faster"
 msgstr "Più veloce"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgctxt "audio"
 msgid "Faster Forward"
 msgstr "Avanti più veloce"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+msgctxt "audio"
 msgid "Forward"
 msgstr "Avanti"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgctxt "audio"
 msgid "Jump forward"
 msgstr "Salta Avanti"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
+msgctxt "audio"
 msgid "Next Marker"
 msgstr "Contrassegno successivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgctxt "audio"
 msgid "Play next marker."
 msgstr "Esegui il contrassegno successivo"
@@ -2119,4 +2016,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgctxt "audio"
 msgid "Play/Pause"
 msgstr "Esegui/Pausa"
@@ -2124,21 +2022,25 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
 msgid "Play/pause audio."
-msgstr "Esegui/Metti in pausa l'audio"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgstr "Esegui/Metti in pausa l''audio"
+
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+msgctxt "audio"
 msgid "Previous Marker"
 msgstr "Contrassegno precedente"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgctxt "audio"
 msgid "Play previous marker."
 msgstr "Esegui contrassegno precedente"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
+msgctxt "audio"
 msgid "Slower"
 msgstr "Più lento"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgctxt "audio"
 msgid "Slower Forward"
 msgstr "Avanzamento lento"
@@ -2166,5 +2068,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144
 msgid "No data found in this area."
-msgstr "Non è stato trovato alcun dato in quest'area."
+msgstr "Non è stato trovato alcun dato in quest''area."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
@@ -2204,6 +2106,6 @@
 "deleted on the server. If you later try to delete or<br>update them the "
 "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click "
-"<strong>{2}</strong> to ignore.<br></html>"
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
 msgstr ""
 "<html>Ci sono {0} primitive nel proprio insieme di dati locale "
@@ -2233,13 +2135,13 @@
 msgstr "Errore durante lo scaricamento"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete Mode"
 msgstr "Modalità Cancella"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
 msgid "Delete nodes or ways."
 msgstr "Cancella nodi o percorsi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
@@ -2251,7 +2153,7 @@
 msgstr "Modalità: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:245
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:246
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
@@ -2316,9 +2218,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Start new way from last node."
-msgstr "Inizia un nuovo percorso dall'ultimo nodo."
+msgstr "Inizia un nuovo percorso dall''ultimo nodo."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
-msgstr "Continua un percorso dall'ultimo nodo."
+msgstr "Continua un percorso dall''ultimo nodo."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
@@ -2366,18 +2268,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
 msgstr ""
 "Trascinare la testina e rilasciarla in prossimità di un tracciato per "
-"riprodurre l'audio da quel punto; premere SHIFT ed in contemporanea "
-"rilasciare il tasto del mouse per sincronizzare l'audio in corrispondenza di "
-"quel punto."
+"riprodurre l''audio da quel punto; premere SHIFT ed in contemporanea "
+"rilasciare il tasto del mouse per sincronizzare l''audio in corrispondenza "
+"di quel punto."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:304
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
 msgid "Select"
@@ -2458,14 +2360,52 @@
 "move zoom with right button"
 msgstr ""
-"Cambiare il livello di ingrandimento mediante trascinamento o premendo "
-"Ctrl+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il "
-"livello di ingrandimento con il tasto destro"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+"Cambiare il livello di ingrandimento mediante trascinamento o premendo Ctrl"
+"+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il livello "
+"di ingrandimento con il tasto destro"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+#, fuzzy
+msgid "<not>"
+msgstr "nord"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+msgid "<or>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+msgid "<left parent>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+#, fuzzy
+msgid "<right parent>"
+msgstr "Parentesi chiusa mancante"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+msgid "<colon>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+msgid "<equals>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<key>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<question mark>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<end-of-file>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
 msgid "Search..."
 msgstr "Cerca..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search for objects."
@@ -2473,81 +2413,86 @@
 
 #. -- prepare the combo box with the search expressions
-#. 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#.
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
 msgid "Please enter a filter string."
 msgstr "Inserire una stringa di filtro."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
 msgid "Please enter a search string."
 msgstr "Inserire una stringa di ricerca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "Enter the search expression"
-msgstr "Inserire l'espressione di ricerca"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
+msgstr "Inserire l''espressione di ricerca"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
 msgid "replace selection"
 msgstr "Sostituisci la selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "add to selection"
 msgstr "Aggiungi alla selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 msgid "remove from selection"
 msgstr "Rimuovi dalla selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "find in selection"
 msgstr "cerca nella selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "case sensitive"
 msgstr "Distingui maiuscole"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "regular expression"
 msgstr "espressione regolare"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
-msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Via Nazionale</b> - ''Via'' e ''Nazionale'' in qualunque chiave o nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
-msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Via Nazionale\"</b> - ''Via Nazionale'' in qualunque chiave o nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
-msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Naz</b> - ''Naz'' in qualunque punto del nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
-msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
-"<b>type=route</b> - chiave 'type' che contiene esattamente il valore 'route'."
-
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
-msgid ""
-"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr ""
+"<b>type=route</b> - chiave ''type'' che contiene esattamente il valore "
+"''route''."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+msgid ""
+"<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - chiave 'type' contenente qualsiasi valore. Prova anche "
+"<b>type=*</b> - chiave ''type'' contenente qualsiasi valore. Prova anche "
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
-msgid "<b>-name:Bak</b> - not 'Bak' in the name."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Naz</b> - ''Naz'' non presente all''interno del nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - chiave=foot impostata con qualunque valore."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 msgid "<u>Special targets:</u>"
 msgstr "<u>Ricerche speciali:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2555,18 +2500,17 @@
 "<b>type:</b> - tipo dell''oggetto (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - tutti gli oggetti modificati dall''utente"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - tutti gli oggetti modificati da utenti anonimi"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
+msgstr "<b>user:anonymous</b> - tutti gli oggetti modificati da utenti anonimi"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - oggetto con un dato ID (0 per nuovi oggetti)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2576,5 +2520,5 @@
 "non è stata assegnata una versione)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2584,13 +2528,13 @@
 "di modifiche (0 oggetti a cui non è stato assegnato un gruppo di modifiche)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
-"nodes:min-max)"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
 msgstr ""
 "<b>nodes:</b>... - oggetto con un determinato numero di nodi (nodes:numero "
 "oppure nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2600,5 +2544,5 @@
 "etichette:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2608,35 +2552,35 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> oppure <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tutti gli oggetti modificati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tutti gli oggetti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tutti gli oggetti incompleti"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tutti gli oggetti provi di proprietà"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 "<b>figlio <i>espressione</i></b> - tutti i figli degli oggetti "
-"corrispondenti all'espressione"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
+"corrispondenti all''espressione"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 "<b>parent <i>espressione</i></b> - tutti gli elementi da cui dipendono gli "
-"oggetti corrispondenti all'espressione"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+"oggetti corrispondenti all''espressione"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2644,9 +2588,9 @@
 "logico ''or''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2654,11 +2598,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilizzare <b>(</b> e <b>)</b> per raggruppare le espressioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
@@ -2666,33 +2610,33 @@
 msgstr "Filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search"
 msgstr "Cerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Submit filter"
 msgstr "Invia filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Start Search"
 msgstr "Inizia Ricerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nessuna corrispondenza trovata per ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
@@ -2700,18 +2644,27 @@
 "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:293
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295
 #, java-format
 msgid "Found {0} matches"
 msgstr "Trovate {0} corrispondenze"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321
+#. case sensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
+#, fuzzy
+msgctxt "search"
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321
+#. case insensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#, fuzzy
+msgctxt "search"
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:322
+#. regex search
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#, fuzzy
+msgctxt "search"
 msgid "RX"
 msgstr "RX"
@@ -2729,5 +2682,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:234
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2735,11 +2688,10 @@
 "etichetta. Esempio di utilizzo: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:276
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-"Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:422
+msgstr "Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:440
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2748,26 +2700,27 @@
 "relazione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Token inaspettato: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:634
 msgid "Missing parameter for OR"
 msgstr "Parametro mancante per OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:643
-msgid "Missing right parenthesis"
-msgstr "Parentesi chiusa mancante"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#, fuzzy, java-format
+msgid "Unexpected token. Expected {0}, found {1}"
+msgstr "Token inaspettato: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 msgid "Missing operator for NOT"
 msgstr "Operatore mancante per NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Wrong number of parameters for tags operator."
-msgstr "Numero errato di parametri per l'operatore tags."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+msgstr "Numero errato di parametri per l''operatore tags."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 #, java-format
 msgid ""
@@ -2778,9 +2731,9 @@
 "il numero di etichette o un intervallo, per esempio tags:1 oppure tags:2-5"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Numero errato di parametri per operatore sui nodi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:724
 #, java-format
 msgid ""
@@ -2788,13 +2741,13 @@
 "nodes or range, for example nodes:10-20"
 msgstr ""
-"Valore non corretto per l''operatore sui nodi: {0}. L'operatore sui nodi "
+"Valore non corretto per l''operatore sui nodi: {0}. L''operatore sui nodi "
 "richiede un numero o un intervallo di nodi, per esempio nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:716
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr "Valore non corretto per l''operatore id: {0}. E' atteso un numero."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
+msgstr "Valore non corretto per l''operatore id: {0}. E'' atteso un numero."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:737
 #, java-format
 msgid "Incorrect value of changeset operator: {0}. Number is expected."
@@ -2803,5 +2756,5 @@
 "un numero."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:729
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:744
 #, java-format
 msgid "Incorrect value of version operator: {0}. Number is expected."
@@ -2850,10 +2803,10 @@
 msgid ""
 "<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
-"can''t upload them. Please edit the relations and remove the cyclic "
+"cannot upload them. Please edit the relations and remove the cyclic "
 "dependency.</html>"
 msgstr ""
 "<html>{0} relazioni sono in rapporto ciclico perché ognuna si riferisce "
-"all'altra.<br>JOSM non può caricarle. Modificare le relazioni e rimuovere la "
-"dipendenza ciclica.</html>"
+"all''altra.<br>JOSM non può caricarle. Modificare le relazioni e rimuovere "
+"la dipendenza ciclica.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -2885,7 +2838,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, java-format
-msgid "Added {0} objects"
-msgstr "Aggiunti {0} oggetti"
+#, fuzzy, java-format
+msgid "Added {0} object"
+msgid_plural "Added {0} objects"
+msgstr[0] "Aggiunti {0} oggetti"
+msgstr[1] "Aggiunti {0} oggetti"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2935,20 +2890,11 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#, fuzzy, java-format
+msgid "Remove \"{0}\" for {1} objects"
+msgstr "Rimuovi \"{0}\" per {1} {2}"
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "oggetto"
-msgstr[1] "oggetti"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, java-format
-msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Rimuovi \"{0}\" per {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, java-format
-msgid "Set {0}={1} for {2} {3}"
+#, fuzzy, java-format
+msgid "Set {0}={1} for {2} objects"
 msgstr "Imposta {0}={1} per {2} {3}"
 
@@ -2962,5 +2908,5 @@
 msgid ""
 "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
-"conflict can't be added.</html>"
+"conflict cannot be added.</html>"
 msgstr ""
 "<html>Il livello ''{0}'' possiede già un conflitto per la "
@@ -2968,5 +2914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
 msgid "Double conflict"
 msgstr "Doppio conflitto"
@@ -2975,5 +2921,5 @@
 #, java-format
 msgid ""
-"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
 "primitive ''{1}''."
 msgstr ""
@@ -2987,12 +2933,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:204
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
 #, java-format
 msgid ""
-"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-"Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è più "
-"presente"
+"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr ""
+"Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più "
+"disponibile"
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
@@ -3007,16 +2953,25 @@
 msgstr "Impossibile risolvere il conflitto irrisolto"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103
-#, java-format
-msgid "Parameter ''{0}'' must not be empty"
-msgstr "Il parametro ''''{0}'''' non deve essere vuoto"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
-"E' richiesta l'eliminazione di almeno un oggetto, ottenuta una collezione "
+"E'' richiesta l''eliminazione di almeno un oggetto, ottenuta una collezione "
 "vuota"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
+#, fuzzy, java-format
+msgid "Delete node {0}"
+msgstr "Modalità Cancella"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
+#, fuzzy, java-format
+msgid "Delete way {0}"
+msgstr "Elimina {0} percorso"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
+#, fuzzy, java-format
+msgid "Delete relation {0}"
+msgstr "Elimina {0} relazione"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -3050,16 +3005,15 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
-msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you don't "
-"see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"Stai per cancellare dei nodi fuori dall'area scaricata.<br>Questo potrebbe "
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
+msgstr ""
+"Stai per cancellare dei nodi fuori dall''area scaricata.<br>Questo potrebbe "
 "causare dei problemi poiché i nodi potrebbero far parte di altri oggetti "
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
 msgid "Delete confirmation"
 msgstr "Conferma di cancellazione"
@@ -3072,15 +3026,15 @@
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41
 #, java-format
-msgid "Set the 'modified' flag for node {0}"
+msgid "Set the ''modified'' flag for node {0}"
 msgstr "Imposta il contrassegno ''modificato'' per il nodo {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
 #, java-format
-msgid "Set the 'modified' flag for way {0}"
+msgid "Set the ''modified'' flag for way {0}"
 msgstr "Imposta il contrassegno ''modificato'' per il percorso {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
 #, java-format
-msgid "Set the 'modified' flag for relation {0}"
+msgid "Set the ''modified'' flag for relation {0}"
 msgstr "Imposta il contrassegno ''modificato'' per la relazione {0}"
 
@@ -3092,15 +3046,17 @@
 msgstr[1] "Sposta {0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:102
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr "Epurato oggetto ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
-#, java-format
-msgid "Purged {0} objects"
-msgstr "Epurati {0} oggetti"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
+#, fuzzy, java-format
+msgid "Purged {0} object"
+msgid_plural "Purged {0} objects"
+msgstr[0] "Epurati {0} oggetti"
+msgstr[1] "Epurati {0} oggetti"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
 #, java-format
 msgid ""
@@ -3111,5 +3067,5 @@
 "inferiore a 2. Al momento è {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -3148,21 +3104,23 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Ripristina {0} primitive"
+#, fuzzy, java-format
+msgid "Undelete {0} primitive"
+msgid_plural "Undelete {0} primitives"
+msgstr[0] "Ripristina {0} primitive"
+msgstr[1] "Ripristina {0} primitive"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, java-format
-msgid "Resolve version conflicts for node {0}"
+#, fuzzy, java-format
+msgid "Resolve version conflict for node {0}"
 msgstr "Risolvi i conflitti di versione per il nodo {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, java-format
-msgid "Resolve version conflicts for way {0}"
+#, fuzzy, java-format
+msgid "Resolve version conflict for way {0}"
 msgstr "Risolvi i conflitti di versione per il percorso {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, java-format
-msgid "Resolve version conflicts for relation {0}"
+#, fuzzy, java-format
+msgid "Resolve version conflict for relation {0}"
 msgstr "Risolvi i conflitti di versione per la relazione {0}"
 
@@ -3224,5 +3182,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Don't apply changes"
+msgid "Do not apply changes"
 msgstr "Non applicare cambiamenti"
 
@@ -3243,21 +3201,4 @@
 msgstr "Correzione automatica etichette"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:53
-#, java-format
-msgid "Expected array of length 4, got {0}"
-msgstr "Era atteso un vettore di lunghezza 4, ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:65
-#, java-format
-msgid "Exactly four doubles excpected in string, got {0}"
-msgstr ""
-"Erano attesi esattamente quattro numeri in doppia precisione nella stringa, "
-"ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:71
-#, java-format
-msgid "Illegal double value ''{0}''"
-msgstr "Valore in doppia precisione ''''{0}'''' non valido"
-
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:79
@@ -3272,10 +3213,4 @@
 msgstr "Valore ''''{0}'''' non valido per la longitudine"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:113
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:115
-#, java-format
-msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
-
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
@@ -3291,6 +3226,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-"isn't a directory."
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
+"not a directory."
 msgstr ""
 "Attenzione: è fallita l''inizializzazione delle preferenze. La cartella "
@@ -3300,6 +3235,6 @@
 #, java-format
 msgid ""
-"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-"isn't a directory.</html>"
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
+"not a directory.</html>"
 msgstr ""
 "<html>Fallita l''inizializzazione delle preferenze.<br>La cartella delle "
@@ -3353,6 +3288,6 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
 msgstr ""
 "<html>Il file delle preferenze contiene degli errori.<br> Salvataggio del "
@@ -3441,8 +3376,8 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
-msgid "Warning: the revision file '/REVISION' is missing."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3451,5 +3386,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3458,5 +3393,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3464,20 +3399,24 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:85
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+msgctxt "compass"
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+msgctxt "compass"
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:99
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+msgctxt "compass"
 msgid "W"
 msgstr "O"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+msgctxt "compass"
 msgid "E"
 msgstr "E"
@@ -3486,5 +3425,5 @@
 #, java-format
 msgid ""
-"Unable to add primitive {0} to the dataset because it's already included"
+"Unable to add primitive {0} to the dataset because it is already included"
 msgstr ""
 "Impossibile aggiungere la primitiva {0} all''insieme di dati perché è già "
@@ -3494,12 +3433,12 @@
 #, java-format
 msgid ""
-"JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 "Please report this  at http://josm.openstreetmap.de . This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
 "JOSM si aspettava di trovare la primitiva [{0} {1}] nell''insieme di dati, "
-"ma non c''è. Si prega di riportare questo errore al sito "
-"http://josm.openstreetmap.de . Questo non è un errore critico, si può "
-"probabilmente continuare a lavorare senza problemi."
+"ma non c''è. Si prega di riportare questo errore al sito http://josm."
+"openstreetmap.de . Questo non è un errore critico, si può probabilmente "
+"continuare a lavorare senza problemi."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
@@ -3531,10 +3470,10 @@
 
 #. should not happen
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278
 #, java-format
 msgid ""
 "Target object with id {0} and version {1} is visible although source object "
-"with lower version {2} is not visible. Can''t deal with this inconsistency. "
+"with lower version {2} is not visible. Cannot deal with this inconsistency. "
 "Keeping target object. "
 msgstr ""
@@ -3549,4 +3488,6 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+#, fuzzy
+msgctxt "filter"
 msgid "H"
 msgstr "H"
@@ -3554,4 +3495,5 @@
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
+msgctxt "filter"
 msgid "Text"
 msgstr "Testo"
@@ -3559,4 +3501,6 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
+#, fuzzy
+msgctxt "filter"
 msgid "C"
 msgstr "C"
@@ -3564,4 +3508,6 @@
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
+#, fuzzy
+msgctxt "filter"
 msgid "I"
 msgstr "I"
@@ -3569,4 +3515,6 @@
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
+#, fuzzy
+msgctxt "filter"
 msgid "M"
 msgstr "M"
@@ -3575,4 +3523,6 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
+#, fuzzy
+msgctxt "filter"
 msgid "R"
 msgstr "R"
@@ -3580,4 +3530,6 @@
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
+#, fuzzy
+msgctxt "filter"
 msgid "A"
 msgstr "A"
@@ -3585,4 +3537,6 @@
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
+#, fuzzy
+msgctxt "filter"
 msgid "D"
 msgstr "D"
@@ -3590,35 +3544,27 @@
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
+#, fuzzy
+msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:264
-#, java-format
-msgid "Expected ID >= 0. Got {0}."
-msgstr "Era atteso ID >= 0. Ottenuto {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:401
-msgid "A primitive with ID = 0 can't be invisible."
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Una primitiva con ID = 0 non può essere invisibile."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Era atteso un ID > 0 . Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "attesa versione > 0 . Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:652
-#, java-format
-msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-msgstr "Era atteso il parametro ''''{0}'''' >= 0, ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
-#, java-format
-msgid ""
-"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is "
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#, java-format
+msgid ""
+"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
 "{0}"
 msgstr ""
@@ -3626,28 +3572,17 @@
 "nuova primitiva. Il valore dell''identificativo del gruppo di modifiche è {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
-msgid ""
-"Can't merge because either of the participating primitives is new and the "
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+msgid ""
+"Cannot merge because either of the participating primitives is new and the "
 "other is not"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1042
-#, java-format
-msgid ""
-"Can''t merge primitives with different ids. This id is {0}, the other is {1}"
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#, java-format
+msgid ""
+"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
 "Impossibile unire le primitive con identificativi differenti. Questo id è "
 "{0}, l''altro è {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
-#, java-format
-msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-msgstr "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:55
-#, java-format
-msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-msgstr "Il parametro ''{0}'' non è una classe accettata. Ottenuto ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
@@ -3656,5 +3591,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"Tag collection can't be applied to a primitive because there are keys with "
+"Tag collection cannot be applied to a primitive because there are keys with "
 "multiple values."
 msgstr ""
@@ -3668,36 +3603,11 @@
 msgstr "Impossibile aggiungere il nodo {0} al percorso incompleto {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected, got {1}"
-msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
-#, java-format
-msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-msgstr ""
-"Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo "
-"0..{1}. Ottenuto ''{2}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:88
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:115
-#, java-format
-msgid ""
-"Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
-"Impossibile confrontare la primitiva con ID ''''{0}'''' alla primitiva con "
-"ID ''''{1}''''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#, java-format
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr ""
+"Impossibile confrontare la primitiva con ID ''{0}'' alla primitiva con ID "
+"''{1}''."
+
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
@@ -3711,14 +3621,14 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266
 msgid "More than one \"from\" way found."
-msgstr "E' stato trovato più di un percorso \"from\"."
+msgstr "E'' stato trovato più di un percorso \"from\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272
 msgid "More than one \"to\" way found."
-msgstr "E' stato trovato più di un percorso \"to\"."
+msgstr "E'' stato trovato più di un percorso \"to\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292
 msgid "More than one \"via\" found."
-msgstr "E' stata trovata più di una \"via\"."
+msgstr "E'' stata trovata più di una \"via\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283
@@ -3746,17 +3656,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
+msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-msgid "The \"to\" way doesn't start or end at a \"via\" node."
+msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
-msgid "The \"to\" way doesn't start or end at the \"via\" way."
+msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
@@ -3834,5 +3744,5 @@
 #. darker blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
@@ -3870,6 +3780,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"Attenzione: è fallita l''apertura del flusso di entrata per la risorsa "
-"''''/data/{0}''''. Impossibile caricare la griglia NTF<->RGF93"
+"Attenzione: è fallita l''apertura del flusso di entrata per la risorsa ''''/"
+"data/{0}''''. Impossibile caricare la griglia NTF<->RGF93"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -3966,9 +3876,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Impossibile leggere i segnalibri da<br>''{0}''<br>Errore generato: "
-"{1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Impossibile leggere i segnalibri da<br>''{0}''<br>Errore generato: {1}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4002,5 +3911,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "railway"
 msgstr "ferrovia"
@@ -4009,5 +3918,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
-msgstr "corso d'acqua"
+msgstr "corso d''acqua"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
@@ -4019,5 +3928,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
@@ -4046,33 +3955,33 @@
 msgstr "Gruppo di modifiche {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:75
 msgid "Precondition violation"
 msgstr "Violazione della precondizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 msgid "Security exception"
 msgstr "Eccezione di sicurezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:127
 msgid "Network exception"
 msgstr "Eccezione di rete"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:145
 msgid "IO Exception"
 msgstr "Eccezione di IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:178
 msgid "Internal Server Error"
 msgstr "Errore interno del server"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:194
 msgid "Bad Request"
 msgstr "Richiesta errata"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:210
 msgid "Not Found"
 msgstr "Non trovato"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
@@ -4080,17 +3989,22 @@
 msgstr "Conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249
 msgid "Authentication Failed"
 msgstr "Autenticazione fallita"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
 msgid "Authorisation Failed"
 msgstr "Autorizzazione fallita"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:282
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
+#, fuzzy
+msgid "Authenticationi failed"
+msgstr "Autenticazione fallita"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299
 msgid "Unknown host"
 msgstr "Host sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:385
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:407
 msgid "Object deleted"
 msgstr "Oggetto eliminato"
@@ -4115,6 +4029,5 @@
 msgstr "Cliccare per chiudere la finestra"
 
-#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:84
-#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:102
+#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
@@ -4140,5 +4053,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 msgid "Name of the user."
-msgstr "Nome dell'utente."
+msgstr "Nome dell''utente."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
@@ -4149,5 +4062,5 @@
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
-"Ridimensiona l'applet alla geometria data (formato: LARGHEZZAxALTEZZA)"
+"Ridimensiona l''applet alla geometria data (formato: LARGHEZZAxALTEZZA)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
@@ -4221,5 +4134,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr "Scarica la zona indicata dall'URL (interpretando lat=x&lon=y&zoom=z)"
+msgstr "Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
@@ -4278,5 +4191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
-"Parameters --download, --downloadgps and --selection are processed in this "
+"Parameters --download, --downloadgps, and --selection are processed in this "
 "order."
 msgstr ""
@@ -4286,34 +4199,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inizializzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
 msgid "Creating main GUI"
-msgstr "Creazione dell'interfaccia principale"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+msgstr "Creazione dell''interfaccia principale"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:224
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4328,14 +4241,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
 msgid "Edit"
 msgstr "Modifica"
@@ -4406,52 +4319,52 @@
 msgstr "scala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitudine geografica del puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The name of the object at the mouse pointer."
-msgstr "Il nome dell'oggetto sul puntatore del mouse."
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+msgstr "Il nome dell''oggetto sul puntatore del mouse."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitudine geografica del puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The angle between the previous and the current way segment."
-msgstr "L'angolo tra il segmento di percorso corrente e quello precedente."
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+msgstr "L''angolo tra il segmento di percorso corrente e quello precedente."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Direzione della bussola del segmento che si sta disegnando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr "Lunghezza del segmento di percorso che si sta disegnando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
 "this list with the mouse.<hr>"
 msgstr ""
-"Cliccare con il tasto centrale nuovamente per proseguire nel "
-"ciclo.<br>Tenere premuto CTRL per selezionare direttamente da questa lista "
-"con il mouse.<hr>"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
+"Cliccare con il tasto centrale nuovamente per proseguire nel ciclo."
+"<br>Tenere premuto CTRL per selezionare direttamente da questa lista con il "
+"mouse.<hr>"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
 msgid "(no object)"
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
 msgstr "Utente:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:371
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:376
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:393
 msgid "Layer not in list."
 msgstr "livello non in lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:619
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:628
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4460,5 +4373,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
 msgid "Click to cancel the current operation"
-msgstr "Cliccare per annullare l'operazione corrente"
+msgstr "Cliccare per annullare l''operazione corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4534,5 +4447,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:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4543,14 +4456,14 @@
 msgid "Click to close the dialog and remove the object from the relations"
 msgstr ""
-"Cliccare per chiudere la finestra ed eliminare l'oggetto dalle relazioni"
+"Cliccare per chiudere la finestra ed eliminare l''oggetto dalle relazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365
 msgid "Click to close the dialog and to abort deleting the objects"
 msgstr ""
-"Cliccare per chiudere la finestra ed annullare l'eliminazione degli oggetti"
+"Cliccare per chiudere la finestra ed annullare l''eliminazione degli oggetti"
 
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4559,15 +4472,15 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
-msgstr "Il mio con l'unione"
+msgstr "Il mio con l''unione"
 
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
-msgstr "Il loro con l'unione"
+msgstr "Il loro con l''unione"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
@@ -4576,14 +4489,14 @@
 msgstr "il ruolo {0} non partecipa nella comparazione {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4591,6 +4504,6 @@
 msgstr "Etichette"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:243
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4598,49 +4511,53 @@
 msgstr "Nodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
 msgstr "Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:166
 msgid "No pending tag conflicts to be resolved"
-msgstr "Non c'è alcun conflitto di etichette in attesa di risoluzione"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
-#, java-format
-msgid "Tags({0} conflicts)"
-msgstr "Etichette({0} conflitti)"
+msgstr "Non c''è alcun conflitto di etichette in attesa di risoluzione"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr "{0} conflitti di etichette in attesa di risoluzione"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
+#, fuzzy, java-format
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etichette({0} conflitti)"
+msgstr[1] "Etichette({0} conflitti)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
+#, fuzzy, java-format
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} conflitti di etichette in attesa di risoluzione"
+msgstr[1] "{0} conflitti di etichette in attesa di risoluzione"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid "Nodes(resolved)"
 msgstr "Nodi(risolti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 "Lista di nodi uniti bloccata. Nella lista dei nodi di questo percorso non "
-"c'è alcun conflitto in attesa"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
+"c''è alcun conflitto in attesa"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Nodes(with conflicts)"
 msgstr "Nodi(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:182
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflitti in attesa nella lista di nodi di questo percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid "Members(resolved)"
 msgstr "Membri(risolti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4648,72 +4565,66 @@
 msgstr ""
 "Lista dei membri uniti bloccata. Nella lista dei membri di questa relazione "
-"non c'è alcun conflitto in attesa"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
+"non c''è alcun conflitto in attesa"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Members(with conflicts)"
 msgstr "Membri(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflitti in attesa nella lista di membri di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
 msgid "No pending property conflicts"
-msgstr "Non c'è alcun conflitto di proprietà in attesa"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+msgstr "Non c''è alcun conflitto di proprietà in attesa"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Properties(with conflicts)"
 msgstr "Proprietà(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:203
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflitti di proprietà in attesa di essere risolti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Risoluzione conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:374
-#, java-format
-msgid "Parameter current out of range. Got {0}."
-msgstr "parametro attualmente fuori scala: ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:610
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
 #, java-format
 msgid "Item {0} not found in list."
 msgstr "elemento {0} non trovato nella lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
 msgid "lock scrolling"
 msgstr "blocca scorrimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
 msgid "Compare "
 msgstr "Confronta "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
 msgid "My version"
 msgstr "Versione personale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
-"Lista di elementi nell'insieme di dati personale, cioè l'insieme di dati "
+"Lista di elementi nell''insieme di dati personale, cioè l''insieme di dati "
 "locale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
@@ -4721,5 +4632,5 @@
 msgstr "Versione unita"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -4727,31 +4638,31 @@
 msgstr ""
 "Lista degli elementi uniti. Questi sostituiranno gli elementi personali non "
-"appena saranno applicate le decisioni sull'unione."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272
+"appena saranno applicate le decisioni sull''unione."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
 msgid "Their version"
 msgstr "La loro versione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
-"Lista di elementi nel loro insieme di dati, cioè l'insieme dei dati del "
+"Lista di elementi nel loro insieme di dati, cioè l''insieme dei dati del "
 "server"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
 msgid "> top"
 msgstr "> inizio"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
-"Copia i nodi personali selezionati all'inizio della lista dei nodi uniti"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432
+"Copia i nodi personali selezionati all''inizio della lista dei nodi uniti"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
 msgid "> bottom"
 msgstr "> fine"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
 msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
@@ -4759,5 +4670,5 @@
 "elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -4767,5 +4678,5 @@
 "selezionato nella lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -4775,18 +4686,17 @@
 "nella lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
 msgstr ""
-"Copia il loro elemento selezionato all'inizio della lista degli elementi "
+"Copia il loro elemento selezionato all''inizio della lista degli elementi "
 "uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copia i loro elementi selezionati alla fine della lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -4796,5 +4706,5 @@
 "lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -4804,23 +4714,23 @@
 "lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Up"
 msgstr "Su"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
 msgid "Move up the selected elements by one position."
 msgstr "Sposta in su gli elementi selezionati di una posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Down"
 msgstr "Giù"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
 msgid "Move down the selected entries by one position."
 msgstr "Sposta in giù le voci selezionate di una posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
@@ -4831,45 +4741,45 @@
 msgstr "Elimina"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
 msgid "Remove the selected entries from the list of merged elements."
 msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
 msgid "Freeze"
 msgstr "Blocca"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
 msgid "Freeze the current list of merged elements."
 msgstr "Blocca la lista attuale degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
 msgid "Unfreeze"
 msgstr "Sblocca"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
 msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Sblocca la lista degli elementi uniti ed inizia l'unione"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778
-#, java-format
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Clicca <strong>{0}</strong> per iniziare l'unione tra le voci "
+msgstr "Sblocca la lista degli elementi uniti ed inizia l''unione"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:779
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
+msgstr ""
+"<html>Clicca <strong>{0}</strong> per iniziare l''unione tra le voci "
 "personali e le loro</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783
-#, java-format
-msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Clicca <strong>{0}</strong> per terminare l'unione tra le voci "
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:784
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr ""
+"<html>Clicca <strong>{0}</strong> per terminare l''unione tra le voci "
 "personali e le loro</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:802
 #, java-format
 msgid "My version ({0} entry)"
@@ -4878,5 +4788,5 @@
 msgstr[1] "Versione personale ({0} voci)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:805
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4885,5 +4795,5 @@
 msgstr[1] "Versione unita ({0} voci)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:808
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4892,9 +4802,9 @@
 msgstr[1] "Loro versione ({0} voci)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:871
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
 #, java-format
 msgid ""
-"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
 "adjustment."
 msgstr ""
@@ -4902,5 +4812,5 @@
 "partecipazione nella variazione sincronizzata."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:886
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
 #, java-format
@@ -4912,21 +4822,15 @@
 msgstr "Nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70
-msgid "Merged nodes not frozen yet. Can't build resolution command."
-msgstr ""
-"L'unione dei nodi non è stata ancora bloccata. Non è possibile costruire il "
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+msgid "Merged nodes not frozen yet. Cannot build resolution command."
+msgstr ""
+"L''unione dei nodi non è stata ancora bloccata. Non è possibile costruire il "
 "comando di risoluzione"
 
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:180
-#, java-format
-msgid "Unexpected column index. Got {0}."
-msgstr "indice di colonna non atteso. Ottenuto {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 "<html>E'' stato generato un errore durante la comunicazione con il "
@@ -4938,37 +4842,48 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
 msgid "Yes, undelete them too"
 msgstr "Si, ripristina anche questo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:500
 msgid "No, cancel operation"
-msgstr "No, annulla l'operazione"
+msgstr "No, annulla l''operazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, java-format
-msgid ""
-"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
-"the server.<br><br>Do you want to undelete these nodes too?</html>"
-msgstr ""
+#, fuzzy, java-format
+msgid ""
+"There is {0} additional node used by way {1}<br>which is deleted on the "
+"server.<br><br>Do you want to undelete this node too?"
+msgid_plural ""
+"There are {0} additional nodes used by way {1}<br>which are deleted on the "
+"server.<br><br>Do you want to undelete these nodes too?"
+msgstr[0] ""
 "<html>Ci sono {0} nodi aggiuntivi usati dalla via {1}<br>che sono stati "
 "cancellati sul server.<br><br>Vuoi recuperare anche questi nodi?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475
+msgstr[1] ""
+"<html>Ci sono {0} nodi aggiuntivi usati dalla via {1}<br>che sono stati "
+"cancellati sul server.<br><br>Vuoi recuperare anche questi nodi?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
 msgid "Undelete additional nodes?"
 msgstr "Ripristina i nodi addizionali?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
-#, java-format
-msgid ""
-"<html>There are {0} additional primitives referred to by relation "
-"{1}<br>which are deleted on the server.<br><br>Do you want to undelete them "
-"too?</html>"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
+#, fuzzy, java-format
+msgid ""
+"There is {0} additional primitive referred to by relation {1}<br>which is "
+"deleted on the server.<br><br>Do you want to undelete this too?"
+msgid_plural ""
+"There are {0} additional primitives referred to by relation {1}<br>which are "
+"deleted on the server.<br><br>Do you want to undelete these too?"
+msgstr[0] ""
 "<html>Ci sono {0} primitive addizionali collegate alla relazione {1}<br>che "
 "sono state eliminate sul server.<br><br>Si desidera ripristinarle?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
+msgstr[1] ""
+"<html>Ci sono {0} primitive addizionali collegate alla relazione {1}<br>che "
+"sono state eliminate sul server.<br><br>Si desidera ripristinarle?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
 msgid "Undelete dependent primitives?"
 msgstr "Ripristina le primitive dipendenti?"
@@ -4977,5 +4892,5 @@
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
-"Proprietà nell'insieme di dati personale, cioè l'insieme di dati locale"
+"Proprietà nell''insieme di dati personale, cioè l''insieme di dati locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
@@ -4984,11 +4899,10 @@
 "elements when merge decisions are applied."
 msgstr ""
-"Proprietà nell'elemento unito. Queste sostituiranno le proprietà degli "
+"Proprietà nell''elemento unito. Queste sostituiranno le proprietà degli "
 "elementi personali non appena saranno applicate le decisioni."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Proprietà nel loro insieme di dati, cioè l'insieme di dati del server"
+msgstr "Proprietà nel loro insieme di dati, cioè l''insieme di dati del server"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107
@@ -5035,5 +4949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
 msgid "Physically delete from local dataset"
-msgstr "Elimina fisicamente dall'insieme di dati locale"
+msgstr "Elimina fisicamente dall''insieme di dati locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471
@@ -5067,5 +4981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576
 msgid "Yes, reset the id"
-msgstr "Si, reimposta l'id"
+msgstr "Si, reimposta l''id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
@@ -5088,5 +5002,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
 msgid "Reset id to 0"
-msgstr "Reimposta l'id a 0"
+msgstr "Reimposta l''id a 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602
@@ -5104,10 +5018,10 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM dovrà eliminare la tua primitiva locale con identificativo "
-"{0}<br>dall'insieme di dati.<br>Si è d'accordo?</html>"
+"<html>JOSM dovrà eliminare la tua primitiva locale con identificativo {0}"
+"<br>dall''insieme di dati.<br>Si è d''accordo?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
 msgid "Remove from dataset"
-msgstr "Elimina dall'insieme di dati"
+msgstr "Elimina dall''insieme di dati"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641
@@ -5120,6 +5034,6 @@
 msgstr "Primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
 "Nodi uniti non ancora bloccati. Non è possibile costruire il comando di "
@@ -5144,5 +5058,6 @@
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
-"L'unione dell'insieme dei dati non includerà una etichetta con la chiave {0}"
+"L''unione dell''insieme dei dati non includerà una etichetta con la chiave "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
@@ -5156,6 +5071,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:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -5169,6 +5084,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:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5181,13 +5096,7 @@
 msgstr "Valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99
 msgid "Cannot apply undecided tag merge item."
-msgstr "Impossibile marcare come irrisolto l'elemento oggetto di unione"
-
-#. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
-#, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}."
-msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
+msgstr "Impossibile marcare come irrisolto l''elemento oggetto di unione"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
@@ -5199,18 +5108,13 @@
 msgstr "Loro versione (insieme dei dati del server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284
-msgid ">"
-msgstr ">"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
-"Mantieni la coppia chiave/valore selezionata dall'insieme di dati locale"
+"Mantieni la coppia chiave/valore selezionata dall''insieme di dati locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
-"Mantieni la coppia chiave/valore selezionata dall'insieme di dati del server"
+"Mantieni la coppia chiave/valore selezionata dall''insieme di dati del server"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378
@@ -5230,5 +5134,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
 msgid "Conflicts when combining primitives"
-msgstr "Conflitti durante l'unione delle primitive"
+msgstr "Conflitti durante l''unione delle primitive"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135
@@ -5261,10 +5165,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
 msgid "Apply"
 msgstr "Applica"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
@@ -5272,5 +5176,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "all"
 msgstr "tutti"
@@ -5303,25 +5207,13 @@
 "come ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
-#, java-format
-msgid "Parameter ''{0}'' must not be empty."
-msgstr "il parametro ''{0}'' non deve essere vuoto."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
-#, java-format
-msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-msgstr ""
-"Era atteso il parametro ''''{0}'''' con etichette per una sola chiave. "
-"Ottenuto {1}."
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "Tag collection doesn't include the selected value ''{0}''."
-msgstr ""
-"La collezione di etichette non include il valore selezionato ''''{0}''''."
+#, java-format
+msgid "Tag collection does not include the selected value ''{0}''."
+msgstr "La collezione di etichette non include il valore selezionato ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
 msgid "Not decided yet."
 msgstr "Non ancora deciso."
@@ -5366,5 +5258,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
@@ -5376,5 +5268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
@@ -5400,5 +5292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
 msgid "Keep this relation member for the target object"
-msgstr "Mantieni questo membro della relazione per l'oggetto in esame"
+msgstr "Mantieni questo membro della relazione per l''oggetto in esame"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -5427,5 +5319,5 @@
 "modified relations.</html>"
 msgstr ""
-"<html>Selezionare per abilitare l'inserimento di una etichetta che sarà "
+"<html>Selezionare per abilitare l''inserimento di una etichetta che sarà "
 "applicata<br>a tutte le relazioni modificate.</html>"
 
@@ -5438,6 +5330,6 @@
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
-"<html>Inserire una chiave per l'etichetta, es. "
-"<strong><tt>fixme</tt></strong></html>"
+"<html>Inserire una chiave per l''etichetta, es. <strong><tt>fixme</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5449,5 +5341,5 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Inserire un valore per l'etichetta, es. <strong><tt>controllare i "
+"<html>Inserire un valore per l''etichetta, es. <strong><tt>controllare i "
 "membri</tt></strong></html>"
 
@@ -5463,8 +5355,8 @@
 "<html>Le strade che sono state combinate sono membri di una o più relazioni. "
 "Decidere se si vuole <strong>mantenere</strong> queste appartenenze o se "
-"desidera <strong>rimuoverle</strong>.<br>Il default è di "
-"<strong>mantenere</strong> la prima strada e <strong>rimuovere</strong> le "
-"altre strade che sono membri della stessa relazione: la combinazione delle "
-"strade rimpiazzerà la strada originale nella relazione.</html>"
+"desidera <strong>rimuoverle</strong>.<br>Il default è di <strong>mantenere</"
+"strong> la prima strada e <strong>rimuovere</strong> le altre strade che "
+"sono membri della stessa relazione: la combinazione delle strade rimpiazzerà "
+"la strada originale nella relazione.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5503,13 +5395,13 @@
 msgstr "Visualizza solamente le etichette con valori multipli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
 msgid "For selected objects only"
 msgstr "Solamente per gli oggetti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:167
-msgid ""
-"<html>Select to show changesets for the currently selected objects "
-"only.<br>Unselect to show all changesets for objects in the current data "
-"layer.</html>"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
+msgid ""
+"<html>Select to show changesets for the currently selected objects only."
+"<br>Unselect to show all changesets for objects in the current data layer.</"
+"html>"
 msgstr ""
 "<html>Selezionare per visualizzare i gruppi di modifiche relativi solamente "
@@ -5518,14 +5410,14 @@
 "corrente.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
 msgstr "Gruppi di modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
 msgid "Open the list of changesets in the current layer."
 msgstr "Apri la lista dei gruppi di modifiche nel livello corrente."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
@@ -5533,5 +5425,5 @@
 "selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
@@ -5539,29 +5431,28 @@
 msgstr "Scarica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:365
-msgid ""
-"Download information about the selected changesets from the OSM server"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360
+msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
 "Scarica dal server OSM le informazioni riguardanti i gruppi di modifiche "
 "selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:400
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395
 msgid "Closes the selected open changesets"
 msgstr "Chiude i gruppi di modifiche aperti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:431
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:426
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180
 msgid "Show info"
 msgstr "Mostra informazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427
 msgid "Open a web page for each selected changeset"
 msgstr "Apri una pagina web per ogni gruppo di modifiche selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:466
 msgid "Details"
 msgstr "Dettagli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr ""
@@ -5582,11 +5473,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5608,9 +5499,9 @@
 msgstr "Risolvi i conflitti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
 msgid "Resolve"
 msgstr "Risolvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5618,11 +5509,10 @@
 "sopra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
-msgstr ""
-"Seleziona sulla mappa gli elementi selezionati nella lista qui sopra."
+msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167
@@ -5649,10 +5539,9 @@
 #, java-format
 msgid ""
-"<html>You didn''t finish to merge the differences in this "
-"conflict.<br>Conflict resolutions won't be applied unless all "
-"differences<br>are resolved.Click <strong>{0}</strong> to close "
-"anyway.<strong>Already<br>resolved differences won't be "
-"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
-"conflicts.</html>"
+"<html>You did not finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
 
@@ -5670,17 +5559,17 @@
 msgstr "Risolvi i conflitti per ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
 msgid "Filter objects and hide/disable them."
 msgstr "Filtra oggetti e nascondili/disabilitali."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5727,18 +5616,18 @@
 msgstr "Modalità filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 msgid "History"
 msgstr "Cronologia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
 msgid "Display the history of all selected items."
 msgstr "Visualizza la cronologia di tutti gli oggetti selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
 msgid "Object with history"
 msgstr "Oggetto con storico"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
@@ -5748,59 +5637,55 @@
 msgstr "Ricarica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Carica nuovamente tutti gli oggetti selezionati e aggiorna la lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
 msgid "Show"
 msgstr "Visualizza"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
 msgid "Display the history of the selected objects."
 msgstr "Visualizza lo storico degli oggetti selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr "Finestra non ancora creata. Invocare prima createInstance()"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
 msgid "Layers"
 msgstr "Livelli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Open a list of all loaded layers."
 msgstr "Apre la lista di tutti i livelli caricati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
 msgid "Delete the selected layers."
 msgstr "Elimina i livelli selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
 msgid "Show/Hide"
 msgstr "Mostra/Nascondi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
 msgid "Toggle visible state of the selected layer."
 msgstr "Commuta la visibilità del livello selezionato."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Attiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
 msgid "Activate the selected layer"
 msgstr "Attiva il livello selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
 msgid "Merge this layer into another layer"
 msgstr "Unisci questo livello con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:536
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Move the selected layer one row up."
 msgstr "Sposta il livello selezionato in su."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
 msgid "Move the selected layer one row down."
 msgstr "Sposta il layer selezionato in giù."
@@ -5815,5 +5700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3016
 msgid "Relations"
 msgstr "Relazioni"
@@ -5841,13 +5726,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
-"Crea una copia di questa relazione e aprila in un'altra finestra dell'editor"
+"Crea una copia di questa relazione e aprila in un''altra finestra "
+"dell''editor"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
-msgstr ""
-"Imposta la selezione corrente con la lista delle relazioni selezionate"
+msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
@@ -5884,25 +5769,25 @@
 msgstr "Ingrandisci visuale sulla selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
 msgstr "Selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:357
 msgid "Undock the panel"
 msgstr "Stacca il pannello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5911,5 +5796,5 @@
 "degli strumenti a sinistra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:382
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello"
@@ -5917,5 +5802,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:143
 msgid "Authors"
 msgstr "Autori"
@@ -5927,5 +5812,5 @@
 "selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
 #, java-format
 msgid "{0} Author"
@@ -5934,13 +5819,13 @@
 msgstr[1] "{0} Autori"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:150
 msgid "Select primitives submitted by this user"
 msgstr "Seleziona le primitive caricate da questo utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 msgid "Launches a browser with information about the user"
-msgstr "Avvia un browser con le informazioni dell'utente"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:189
+msgstr "Avvia un browser con le informazioni dell''utente"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:193
 #, java-format
 msgid ""
@@ -5950,5 +5835,5 @@
 "utenti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
 #, java-format
 msgid ""
@@ -5959,17 +5844,17 @@
 "''''{0}''''<br>su questo sistema.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:218
 msgid "Missing encoding"
 msgstr "Codifica mancante"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:268
 msgid "<new object>"
 msgstr "<nuovo oggetto>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
 msgid "Author"
 msgstr "Autore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
 msgid "# Objects"
 msgstr "N. di oggetti"
@@ -6004,5 +5889,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
 msgid "Launch the dialog for querying changesets"
-msgstr "Apri la finestra per l'interrogazione dei gruppi di modifiche"
+msgstr "Apri la finestra per l''interrogazione dei gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381
@@ -6049,5 +5934,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
 msgid ""
-"<html>JOSM is currently running with an anonymous user. It can't "
+"<html>JOSM is currently running with an anonymous user. It cannot "
 "download<br>your changesets from the OSM server unless you enter your OSM "
 "user name<br>in the JOSM preferences.</html>"
@@ -6063,10 +5948,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
-msgctxt "changeset.open"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
+msgctxt "changeset.state"
 msgid "Open"
-msgstr "Apri"
+msgstr "Aperto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
-msgctxt "changeset.open"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
+msgctxt "changeset.state"
 msgid "Closed"
 msgstr "Chiuso"
@@ -6074,5 +5961,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:154
 msgid "anonymous"
 msgstr "anonimo"
@@ -6087,5 +5974,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
 msgid "User"
 msgstr "Utente"
@@ -6099,26 +5986,18 @@
 msgstr "Chiuso il"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:109
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179
 msgid "Downloading changeset content"
 msgstr "Scaricamento del contenuto del gruppo di modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:96
-#, java-format
-msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-msgstr ""
-"Era atteso un valore intero > 0 per il parametro ''''{0}'''', ottenuto "
-"''''{1}''''"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
 msgstr "({0}/{1}) Scaricamento del gruppo di modifiche {2}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
@@ -6171,5 +6050,5 @@
 #, java-format
 msgid ""
-"<html>The selected object isn''t available in the current<br>edit layer "
+"<html>The selected object is not available in the current<br>edit layer "
 "''{0}''.</html>"
 msgid_plural ""
@@ -6253,4 +6132,7 @@
 #. <space />
 #. <key key="highway" value="living_street" />
+#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
+#. <space />
+#. <key key="highway" value="pedestrian" />
 #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #. <space />
@@ -6276,81 +6158,41 @@
 #. <key key="highway" value="construction" />
 #. <optional>
-#. item "Ways/Bridleway" label "Edit Bridleway"
-#. <space />
-#. <key key="highway" value="bridleway" />
-#. <optional>
-#. item "Ways/Cycleway" label "Edit Cycleway"
-#. <space />
-#. <key key="highway" value="cycleway" />
-#. <optional>
-#. item "Ways/Footway" label "Edit Footway"
-#. <space />
-#. <key key="highway" value="footway" />
-#. <optional>
-#. item "Ways/Pedestrian" label "Edit Pedestrian Street"
-#. <space />
-#. <key key="highway" value="pedestrian" />
-#. item "Ways/Steps" label "Edit Flight of Steps"
-#. <space />
-#. <key key="highway" value="steps" />
-#. <optional>
 #. item "Ways/Track" label "Edit Track"
 #. <space />
 #. <key key="highway" value="track" />
 #. <optional>
-#. item "Ways/Track Grade 1" label "Edit Track of grade 1"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade1" />
-#. <optional>
-#. item "Ways/Track Grade 2" label "Edit Track of grade 2"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade2" />
-#. <optional>
-#. item "Ways/Track Grade 3" label "Edit Track of grade 3"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade3" />
-#. <optional>
-#. item "Ways/Track Grade 4" label "Edit Track of grade 4"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade4" />
-#. <optional>
-#. item "Ways/Track Grade 5" label "Edit Track of grade 5"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade5" />
-#. <optional>
-#. item "Ways/Hiking" label "Edit Hiking"
+#. item "Ways/Path" label "Edit Path"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="hiking" />
 #. <optional>
-#. item "Ways/Mountain Hiking" label "Edit Mountain Hiking"
+#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
+#. <space />
+#. <key key="highway" value="bridleway" />
+#. <optional>
+#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="cycleway" />
+#. <optional>
+#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="mountain_hiking" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="yes" />
 #. <optional>
-#. item "Ways/Demanding Mountain Hiking" label "Edit Demanding Mountain Hiking"
+#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="demanding_mountain_hiking" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="no" />
 #. <optional>
-#. item "Ways/Alpine Hiking" label "Edit Alpine Hiking"
+#. item "Ways/Dedicated Footway" label "Edit Footway"
 #. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="alpine_hiking" />
+#. <key key="highway" value="footway" />
 #. <optional>
-#. item "Ways/Demanding Alpine Hiking" label "Edit Demanding Alpine Hiking"
+#. item "Ways/Steps" label "Edit Flight of Steps"
 #. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="demanding_alpine_hiking" />
-#. <optional>
-#. item "Ways/Difficult Alpine Hiking" label "Edit Difficult Alpine Hiking"
-#. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="difficult_alpine_hiking" />
+#. <key key="highway" value="steps" />
 #. <optional>
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
@@ -6969,5 +6811,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6975,149 +6817,144 @@
 #: build/trans_presets.java:211 build/trans_presets.java:229
 #: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:284 build/trans_presets.java:317
-#: build/trans_presets.java:363 build/trans_presets.java:383
-#: build/trans_presets.java:398 build/trans_presets.java:415
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:475 build/trans_presets.java:494
-#: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:555 build/trans_presets.java:576
-#: build/trans_presets.java:597 build/trans_presets.java:618
-#: build/trans_presets.java:639 build/trans_presets.java:670
-#: build/trans_presets.java:691 build/trans_presets.java:704
-#: build/trans_presets.java:717 build/trans_presets.java:730
-#: build/trans_presets.java:743 build/trans_presets.java:756
-#: build/trans_presets.java:767 build/trans_presets.java:776
-#: build/trans_presets.java:823 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:913
-#: build/trans_presets.java:1064 build/trans_presets.java:1072
-#: build/trans_presets.java:1080 build/trans_presets.java:1088
-#: build/trans_presets.java:1098 build/trans_presets.java:1106
-#: build/trans_presets.java:1111 build/trans_presets.java:1118
-#: build/trans_presets.java:1125 build/trans_presets.java:1130
-#: build/trans_presets.java:1138 build/trans_presets.java:1147
-#: build/trans_presets.java:1153 build/trans_presets.java:1159
-#: build/trans_presets.java:1164 build/trans_presets.java:1170
-#: build/trans_presets.java:1176 build/trans_presets.java:1185
-#: build/trans_presets.java:1194 build/trans_presets.java:1201
-#: build/trans_presets.java:1209 build/trans_presets.java:1222
-#: build/trans_presets.java:1228 build/trans_presets.java:1237
-#: build/trans_presets.java:1243 build/trans_presets.java:1249
-#: build/trans_presets.java:1257 build/trans_presets.java:1313
-#: build/trans_presets.java:1360 build/trans_presets.java:1366
-#: build/trans_presets.java:1372 build/trans_presets.java:1378
-#: build/trans_presets.java:1384 build/trans_presets.java:1395
-#: build/trans_presets.java:1404 build/trans_presets.java:1419
-#: build/trans_presets.java:1425 build/trans_presets.java:1433
-#: build/trans_presets.java:1440 build/trans_presets.java:1449
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1551
-#: build/trans_presets.java:1558 build/trans_presets.java:1574
-#: build/trans_presets.java:1581 build/trans_presets.java:1586
-#: build/trans_presets.java:1592 build/trans_presets.java:1598
-#: build/trans_presets.java:1603 build/trans_presets.java:1609
-#: build/trans_presets.java:1615 build/trans_presets.java:1623
-#: build/trans_presets.java:1631 build/trans_presets.java:1639
-#: build/trans_presets.java:1646 build/trans_presets.java:1652
-#: build/trans_presets.java:1659 build/trans_presets.java:1666
-#: build/trans_presets.java:1674 build/trans_presets.java:1681
-#: build/trans_presets.java:1689 build/trans_presets.java:1696
-#: build/trans_presets.java:1702 build/trans_presets.java:1709
-#: build/trans_presets.java:1716 build/trans_presets.java:1723
-#: build/trans_presets.java:1740 build/trans_presets.java:1748
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:1785 build/trans_presets.java:1792
-#: build/trans_presets.java:1798 build/trans_presets.java:1808
-#: build/trans_presets.java:1813 build/trans_presets.java:1821
-#: build/trans_presets.java:1828 build/trans_presets.java:1834
-#: build/trans_presets.java:1840 build/trans_presets.java:1846
-#: build/trans_presets.java:1851 build/trans_presets.java:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1868
-#: build/trans_presets.java:1874 build/trans_presets.java:1879
-#: build/trans_presets.java:1888 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1930
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2029
-#: build/trans_presets.java:2038 build/trans_presets.java:2046
-#: build/trans_presets.java:2052 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2156 build/trans_presets.java:2162
-#: build/trans_presets.java:2168 build/trans_presets.java:2175
-#: build/trans_presets.java:2182 build/trans_presets.java:2190
-#: build/trans_presets.java:2197 build/trans_presets.java:2203
-#: build/trans_presets.java:2210 build/trans_presets.java:2216
-#: build/trans_presets.java:2222 build/trans_presets.java:2228
-#: build/trans_presets.java:2236 build/trans_presets.java:2243
-#: build/trans_presets.java:2250 build/trans_presets.java:2257
-#: build/trans_presets.java:2265 build/trans_presets.java:2297
-#: build/trans_presets.java:2302 build/trans_presets.java:2312
-#: build/trans_presets.java:2317 build/trans_presets.java:2323
-#: build/trans_presets.java:2329 build/trans_presets.java:2346
-#: build/trans_presets.java:2352 build/trans_presets.java:2358
-#: build/trans_presets.java:2364 build/trans_presets.java:2370
-#: build/trans_presets.java:2380 build/trans_presets.java:2387
-#: build/trans_presets.java:2482 build/trans_presets.java:2489
-#: build/trans_presets.java:2504 build/trans_presets.java:2512
-#: build/trans_presets.java:2517 build/trans_presets.java:2523
-#: build/trans_presets.java:2530 build/trans_presets.java:2537
-#: build/trans_presets.java:2543 build/trans_presets.java:2549
-#: build/trans_presets.java:2571 build/trans_presets.java:2578
-#: build/trans_presets.java:2585 build/trans_presets.java:2591
-#: build/trans_presets.java:2598 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2616
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2642
-#: build/trans_presets.java:2649 build/trans_presets.java:2655
-#: build/trans_presets.java:2661 build/trans_presets.java:2667
-#: build/trans_presets.java:2673 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2693
-#: build/trans_presets.java:2700 build/trans_presets.java:2706
-#: build/trans_presets.java:2712 build/trans_presets.java:2722
-#: build/trans_presets.java:2731 build/trans_presets.java:2746
-#: build/trans_presets.java:2752 build/trans_presets.java:2760
-#: build/trans_presets.java:2767 build/trans_presets.java:2787
-#: build/trans_presets.java:2798 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2816
-#: build/trans_presets.java:2822 build/trans_presets.java:2829
-#: build/trans_presets.java:2836 build/trans_presets.java:2843
-#: build/trans_presets.java:2849 build/trans_presets.java:2855
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2877 build/trans_presets.java:2884
-#: build/trans_presets.java:2890 build/trans_presets.java:2897
-#: build/trans_presets.java:2904 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2937
-#: build/trans_presets.java:2946 build/trans_presets.java:2956
-#: build/trans_presets.java:2965 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3003 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:3046
-#: build/trans_presets.java:3052 build/trans_presets.java:3057
-#: build/trans_presets.java:3064 build/trans_presets.java:3071
-#: build/trans_presets.java:3077 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3100
-#: build/trans_presets.java:3106 build/trans_presets.java:3113
-#: build/trans_presets.java:3119 build/trans_presets.java:3126
-#: build/trans_presets.java:3132 build/trans_presets.java:3138
-#: build/trans_presets.java:3144 build/trans_presets.java:3150
-#: build/trans_presets.java:3163 build/trans_presets.java:3177
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:282 build/trans_presets.java:302
+#: build/trans_presets.java:335 build/trans_presets.java:381
+#: build/trans_presets.java:401 build/trans_presets.java:416
+#: build/trans_presets.java:433 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:548
+#: build/trans_presets.java:570 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:628
+#: build/trans_presets.java:637 build/trans_presets.java:684
+#: build/trans_presets.java:705 build/trans_presets.java:714
+#: build/trans_presets.java:774 build/trans_presets.java:925
+#: build/trans_presets.java:933 build/trans_presets.java:941
+#: build/trans_presets.java:949 build/trans_presets.java:959
+#: build/trans_presets.java:967 build/trans_presets.java:972
+#: build/trans_presets.java:979 build/trans_presets.java:986
+#: build/trans_presets.java:991 build/trans_presets.java:999
+#: build/trans_presets.java:1008 build/trans_presets.java:1014
+#: build/trans_presets.java:1020 build/trans_presets.java:1025
+#: build/trans_presets.java:1031 build/trans_presets.java:1037
+#: build/trans_presets.java:1046 build/trans_presets.java:1055
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1083 build/trans_presets.java:1089
+#: build/trans_presets.java:1098 build/trans_presets.java:1104
+#: build/trans_presets.java:1110 build/trans_presets.java:1118
+#: build/trans_presets.java:1174 build/trans_presets.java:1221
+#: build/trans_presets.java:1227 build/trans_presets.java:1233
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1256 build/trans_presets.java:1265
+#: build/trans_presets.java:1280 build/trans_presets.java:1286
+#: build/trans_presets.java:1294 build/trans_presets.java:1301
+#: build/trans_presets.java:1310 build/trans_presets.java:1318
+#: build/trans_presets.java:1329 build/trans_presets.java:1339
+#: build/trans_presets.java:1349 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_presets.java:1392
+#: build/trans_presets.java:1412 build/trans_presets.java:1419
+#: build/trans_presets.java:1435 build/trans_presets.java:1442
+#: build/trans_presets.java:1447 build/trans_presets.java:1453
+#: build/trans_presets.java:1459 build/trans_presets.java:1464
+#: build/trans_presets.java:1470 build/trans_presets.java:1476
+#: build/trans_presets.java:1484 build/trans_presets.java:1492
+#: build/trans_presets.java:1500 build/trans_presets.java:1507
+#: build/trans_presets.java:1513 build/trans_presets.java:1520
+#: build/trans_presets.java:1527 build/trans_presets.java:1535
+#: build/trans_presets.java:1542 build/trans_presets.java:1550
+#: build/trans_presets.java:1557 build/trans_presets.java:1563
+#: build/trans_presets.java:1570 build/trans_presets.java:1577
+#: build/trans_presets.java:1584 build/trans_presets.java:1601
+#: build/trans_presets.java:1609 build/trans_presets.java:1624
+#: build/trans_presets.java:1634 build/trans_presets.java:1646
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1669 build/trans_presets.java:1674
+#: build/trans_presets.java:1682 build/trans_presets.java:1689
+#: build/trans_presets.java:1695 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1712
+#: build/trans_presets.java:1717 build/trans_presets.java:1722
+#: build/trans_presets.java:1729 build/trans_presets.java:1735
+#: build/trans_presets.java:1740 build/trans_presets.java:1749
+#: build/trans_presets.java:1758 build/trans_presets.java:1767
+#: build/trans_presets.java:1776 build/trans_presets.java:1785
+#: build/trans_presets.java:1791 build/trans_presets.java:1799
+#: build/trans_presets.java:1805 build/trans_presets.java:1811
+#: build/trans_presets.java:1817 build/trans_presets.java:1823
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1890 build/trans_presets.java:1899
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:1931 build/trans_presets.java:1937
+#: build/trans_presets.java:1943 build/trans_presets.java:1949
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2036 build/trans_presets.java:2043
+#: build/trans_presets.java:2051 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2097
+#: build/trans_presets.java:2104 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2126
+#: build/trans_presets.java:2158 build/trans_presets.java:2163
+#: build/trans_presets.java:2173 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2190
+#: build/trans_presets.java:2207 build/trans_presets.java:2213
+#: build/trans_presets.java:2219 build/trans_presets.java:2225
+#: build/trans_presets.java:2231 build/trans_presets.java:2241
+#: build/trans_presets.java:2248 build/trans_presets.java:2343
+#: build/trans_presets.java:2350 build/trans_presets.java:2365
+#: build/trans_presets.java:2373 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2391
+#: build/trans_presets.java:2398 build/trans_presets.java:2404
+#: build/trans_presets.java:2410 build/trans_presets.java:2432
+#: build/trans_presets.java:2439 build/trans_presets.java:2446
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2583 build/trans_presets.java:2592
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2621 build/trans_presets.java:2628
+#: build/trans_presets.java:2648 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2690 build/trans_presets.java:2697
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2724
+#: build/trans_presets.java:2731 build/trans_presets.java:2738
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2758 build/trans_presets.java:2765
+#: build/trans_presets.java:2774 build/trans_presets.java:2780
+#: build/trans_presets.java:2786 build/trans_presets.java:2792
+#: build/trans_presets.java:2798 build/trans_presets.java:2807
+#: build/trans_presets.java:2817 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2864
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2882 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:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2932 build/trans_presets.java:2938
+#: build/trans_presets.java:2947 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2974 build/trans_presets.java:2980
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3024
+#: build/trans_presets.java:3038 build/trans_presets.java:3052
 msgid "Name"
 msgstr "Nome"
@@ -7146,14 +6983,4 @@
 msgid "Closed on:"
 msgstr "Chiuso il:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
-msgctxt "changeset.state"
-msgid "Open"
-msgstr "Aperto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
-msgctxt "changeset.state"
-msgid "Closed"
-msgstr "Chiuso"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
@@ -7228,5 +7055,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
 msgid ""
-"The current value isn't a valid changeset ID. Please enter an integer value "
+"The current value is not a valid changeset ID. Please enter an integer value "
 "> 0"
 msgstr ""
@@ -7288,28 +7115,28 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
-msgstr "Solo i changesets dell'utente con il seguente ID utente"
+msgstr "Solo i changesets dell''utente con il seguente ID utente"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
-msgstr "Solo i changeset dell'utente con il seguente user name"
+msgstr "Solo i changeset dell''utente con il seguente user name"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
-"Can't restrict changeset query to the current user because the current user "
+"Cannot restrict changeset query to the current user because the current user "
 "is anonymous"
 msgstr ""
-"Non è possibile restringere l'interrogazione all'utente corrente perchè "
-"l'attuale utente è anonimo"
+"Non è possibile restringere l''interrogazione all''utente corrente perchè "
+"l''attuale utente è anonimo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
-msgid "Current value ''{0}'' for user ID isn''t valid"
-msgstr ""
-"Il valore corrente ''''{0}'''' non è valido per l'identificativo utente"
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+"Il valore corrente ''''{0}'''' non è valido per l''identificativo utente"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
-msgid "Can''t restrict the changeset query to the user name ''{0}''"
-msgstr "Non è possibile restringere l'interrogazione all' utente ''{0}''"
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Non è possibile restringere l''interrogazione all'' utente ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
@@ -7358,8 +7185,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
-"Can't build changeset query with time based restrictions. Input isn't valid."
-msgstr ""
-"Impossibile costruire l'interrogazione sui gruppi di modifiche con le "
-"restrizioni temporali. L'inserimento non è valido."
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Impossibile costruire l''interrogazione sui gruppi di modifiche con le "
+"restrizioni temporali. L''inserimento non è valido."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
@@ -7369,5 +7197,5 @@
 msgstr ""
 "<html>Si prega di inserire dei valori data/ora validi per "
-"limitare<br>l'interrogazione ad uno specifico intervallo temporale.</html>"
+"limitare<br>l''interrogazione ad uno specifico intervallo temporale.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
@@ -7377,7 +7205,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
-"Can't restrict the changeset query to a specific bounding box. The input is "
+"Cannot restrict the changeset query to a specific bounding box. The input is "
 "invalid."
-msgstr ""
+msgstr "Non è possibile restringere l''interrogazione all'' utente ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -7397,5 +7225,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
-"The current value isn't a valid user ID. Please enter an integer value > 0"
+"The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
 "Il valore corrente non è un identificativo utente valido. Si prega di "
@@ -7404,5 +7232,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
-"<html>The  current value isn't a valid user name.<br>Please enter an non-"
+"<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
@@ -7417,9 +7245,9 @@
 #, java-format
 msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Immetere una data nel formato usato dal tuo settaggio locale.<br>Esempio: "
-"{0}<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Immetere una data nel formato usato dal tuo settaggio locale.<br>Esempio: {0}"
+"<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
@@ -7441,7 +7269,7 @@
 "include all changesets in the query.</html>"
 msgstr ""
-"<html>Selezionare per limitare l'interrogazione solamente sui propri gruppi "
+"<html>Selezionare per limitare l''interrogazione solamente sui propri gruppi "
 "di modifiche.<br>Deselezionare per includere tutti i gruppi di modifiche "
-"nell'interrogazione.</html>"
+"nell''interrogazione.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7455,5 +7283,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:174
 msgid "Basic"
 msgstr "Di base"
@@ -7466,5 +7294,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr "Dall'indirizzo URL"
+msgstr "Dall''indirizzo URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
@@ -7497,11 +7325,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
-"Indirizzo URL di una interrogazione sui gruppi di modifiche non valido"
+msgstr "Indirizzo URL di una interrogazione sui gruppi di modifiche non valido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
-msgstr ""
-"Chiudi la finestra e annulla l'interrogazione sui gruppi di modifiche"
+msgstr "Chiudi la finestra e annulla l''interrogazione sui gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
@@ -7512,5 +7338,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr "Determinazione identificativo dell'utente corrente..."
+msgstr "Determinazione identificativo dell''utente corrente..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
@@ -7543,7 +7369,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
 msgid "This changeset query URL is invalid"
-msgstr "L'URL per l'interrogazione sui changesets non è valido"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
+msgstr "L''URL per l''interrogazione sui changesets non è valido"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 #, java-format
 msgid "This will change {0} object."
@@ -7552,22 +7378,22 @@
 msgstr[1] "Questo modificherà fino a {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
 msgid "An empty value deletes the tag."
 msgstr "Un campo vuoto cancellerà il tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:363
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:296
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7576,5 +7402,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 #, java-format
 msgid "This will change up to {0} object."
@@ -7583,89 +7409,89 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:437
 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:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
 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:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:564
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:566
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
 #, 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:893
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 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:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 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:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 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:974
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
 msgid "Select relation"
 msgstr "Selezionare la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation in main selection."
 msgstr "Selezionare la relazione nella selezione principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
@@ -7673,22 +7499,22 @@
 "correntemente selezionato."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
 msgid "Download all child relations (recursively)"
 msgstr "Scarica tutte le relazioni figlie (in modo ricorsivo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
 msgid "Download All Children"
 msgstr "Scarica tutti i figli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
 msgid "Download selected relations"
 msgstr "Scarica le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
 msgid "Download Selected Children"
 msgstr "Scarica il figlio selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:449
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:40
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:47
@@ -7696,13 +7522,17 @@
 msgstr "Scarica i membri della relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
-msgid "Conflicts in data"
-msgstr "Conflitto nei dati"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
-#, java-format
-msgid ""
-"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
+#, fuzzy
+msgid "Conflict in data"
+msgid_plural "Conflicts in data"
+msgstr[0] "Conflitto nei dati"
+msgstr[1] "Conflitto nei dati"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
 "loaded"
 msgstr ""
@@ -7710,18 +7540,18 @@
 "essere caricata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:354
 msgid "Relation is deleted"
 msgstr "La relazione è eliminata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:522
 #, java-format
 msgid "Downloading relation {0}"
 msgstr "Scaricamento della relazione {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:532
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:110
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:110
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7737,60 +7567,60 @@
 msgstr[1] "Trasferimento di {0} figli incompleti della relazione \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
 msgid "Download relations"
 msgstr "Trasferimento delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
 #, java-format
 msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "({0}/{1}): Scaricamento relazione ''''{2}''''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
 msgid "Tags and Members"
 msgstr "Etichette e Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
 msgid "Parent Relations"
 msgstr "Relazioni da cui dipende"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
 msgid "Child Relations"
 msgstr "Relazioni figlie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
 msgid "Apply Role:"
 msgstr "Applica ruolo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
 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:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
-msgstr ""
-"<html>C'è almeno un membro in questa relazione che si riferisce<br>alla "
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>C''è almeno un membro in questa relazione che si riferisce<br>alla "
 "stessa relazione.<br>Questo crea delle dipendenze circolari e ne è "
-"scoraggiato l'utilizzo.<br>Come si desidera procedere con le dipendenze "
+"scoraggiato l''utilizzo.<br>Come si desidera procedere con le dipendenze "
 "circolari?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
 msgid "Remove them, clean up relation"
 msgstr "Rimuovili, ripulisci la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorali, mantieni la relazione com'è"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
 #, java-format
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
 msgstr ""
 "<html>Questa relazione contiene già uno o più membri che si "
@@ -7798,9 +7628,9 @@
 "aggiungere un altro membro alla relazione?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
 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:629
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
 #, java-format
 msgid ""
@@ -7813,35 +7643,35 @@
 "''''{0}'''' omessa.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
-"Aggiungi tutte le primitive selezionate nell'insieme di dati corrente prima "
+"Aggiungi tutte le primitive selezionate nell''insieme di dati corrente prima "
 "del primo membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
-"Aggiungi tutte le primitive selezionate nell'insieme di dati corrente dopo "
-"l'ultimo membro"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
+"Aggiungi tutte le primitive selezionate nell''insieme di dati corrente dopo "
+"l''ultimo membro"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
 "member"
 msgstr ""
-"Aggiungi tutte le primitive selezionate nell'insieme di dati corrente prima "
+"Aggiungi tutte le primitive selezionate nell''insieme di dati corrente prima "
 "del primo membro selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
 "member"
 msgstr ""
-"Aggiungi tutte le primitive selezionate nell'insieme di dati corrente dopo "
-"l'ultimo membro selezionato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
+"Aggiungi tutte le primitive selezionate nell''insieme di dati corrente dopo "
+"l''ultimo membro selezionato"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
@@ -7849,10 +7679,10 @@
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor delle relazioni: Rimuovi selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
 msgid ""
 "Select relation members which refer to primitives in the current selection"
@@ -7861,5 +7691,5 @@
 "selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
 #, java-format
 msgid ""
@@ -7870,103 +7700,98 @@
 "selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
 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:880
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
 msgid "Sort the relation members"
 msgstr "Ordina i membri della relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Sort"
 msgstr "Ordina"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
 msgid "Relation Editor: Sort"
 msgstr "Editor delle relazioni: Ordina"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 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:905
+msgstr "Inverti l''ordine dei membri della relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Reverse"
 msgstr "Inverti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Relation Editor: Reverse"
 msgstr "Editor delle relazioni: Inverti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
 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:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
 msgid "Relation Editor: Move Up"
 msgstr "Editor delle relazioni: Sposta in alto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
 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:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
 msgid "Relation Editor: Move Down"
 msgstr "Editor delle relazioni: Sposta in basso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
 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:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 msgid "Relation Editor: Remove"
 msgstr "Editor delle relazioni: Rimuovi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
 msgid "Delete the currently edited relation"
 msgstr "Elimina la relazione correntemente modificata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074
 msgid "Yes, create a conflict and close"
 msgstr "Si, crea un conflitto e chiudi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
 msgid "No, continue editing"
 msgstr "No, continua la modifica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
-"Cliccare per ritornare all'editor delle relazioni e per ripristinare la "
+"Cliccare per ritornare all''editor delle relazioni e per ripristinare la "
 "modifica della relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
-msgid ""
-"<html>This relation has been changed outside of the editor.<br>You can't "
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You cannot "
 "apply your changes and continue editing.<br><br>Do you want to create a "
 "conflict and close the editor?</html>"
 msgstr ""
-"<html>Questa relazione è stata modificata fuori dall'editor.<br>Non si "
+"<html>Questa relazione è stata modificata fuori dall''editor.<br>Non si "
 "possono applicare le proprie modifiche e continuare a modificare.<br><br>Si "
-"desidera creare un conflitto e chiudere l'editor?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
-msgid "Conflict in data"
-msgstr "Conflitto nei dati"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
+"desidera creare un conflitto e chiudere l''editor?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
 "<html>Il livello ''''{0}'''' contiene già un conflitto per la "
@@ -7974,70 +7799,75 @@
 "riprovare.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
 msgid "Apply the current updates"
 msgstr "Applica gli aggiornamenti correnti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 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:1186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 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:1203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1204
 msgid "Add an empty tag"
 msgstr "Aggiungi una etichetta vuota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
 msgstr "Scarica tutti i membri incompleti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Relation Editor: Download Members"
 msgstr "Editor delle relazioni: Scarica membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
 msgid "Download selected incomplete members"
 msgstr "Scarica i membri incompleti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291
 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:1292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
 msgid "Apply Role"
 msgstr "Applica Ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
-#, java-format
-msgid ""
-"<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-"deleting the roles of these primitives.<br>Do you really want to apply the "
-"new role?</html>"
-msgstr ""
-"<html>Si sta impostando un ruolo vuoto su {0} primitive.<br>Questo è "
-"equivalente all'eliminazione dei ruoli di queste primitive.<br>Si desidera "
-"veramente applicare il nuovo ruolo?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307
+#, java-format
+msgid "You are setting an empty role on {0} primitive."
+msgid_plural "You are setting an empty role on {0} primitives."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+msgid "This is equal to deleting the roles of these primitives."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
+#, fuzzy
+msgid "Do you really want to apply the new role?"
+msgstr "Si vuole permettere questo?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
 msgid "Yes, apply it"
 msgstr "Si, applica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
-msgid "No, don't apply"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
+msgid "No, do not apply"
 msgstr "No, non applicare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
 msgid "Confirm empty role"
 msgstr "Conferma ruolo vuoto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -8053,5 +7883,5 @@
 msgid "Zoom to the object the first selected member refers to"
 msgstr ""
-"Ingrandisci la visuale sull'oggetto a cui si riferisce il primo membro "
+"Ingrandisci la visuale sull''oggetto a cui si riferisce il primo membro "
 "selezionato"
 
@@ -8065,5 +7895,5 @@
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
-"Ingrandimento della visuale disabilitato perché non c'è alcun membro "
+"Ingrandimento della visuale disabilitato perché non c''è alcun membro "
 "selezionato"
 
@@ -8072,14 +7902,14 @@
 msgstr "Fa riferimento a"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
 msgstr "Scarica le relazioni collegate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "Value of child.getId() > 0 expected. Got {1}."
-msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:187
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Ci sono stati {0} conflitti durante l''importazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:195
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -8104,5 +7934,5 @@
 msgstr "Modifica la relazione correntemente selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 msgid "Apply Changes"
 msgstr "Applica cambiamenti"
@@ -8128,9 +7958,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: "
+#, fuzzy, java-format
+msgid ""
+"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 "Attenzione: eccezione ignorata perché il lavoro è stato annullato. "
-"L'eccezione è stata: "
+"L''eccezione è stata: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -8176,5 +8007,5 @@
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
-"Aggiungi un segnalibro per l'area di scarico correntemente selezionata"
+"Aggiungi un segnalibro per l''area di scarico correntemente selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
@@ -8183,10 +8014,10 @@
 msgstr ""
 "Al momento non è stata selezionata alcuna area di scarico. Selezionare prima "
-"un'area."
+"un''area."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
 msgid "Please enter a name for the bookmarked download area."
-msgstr "Inserire un nome per il segnalibro dell'area di scarico."
+msgstr "Inserire un nome per il segnalibro dell''area di scarico."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
@@ -8225,5 +8056,5 @@
 msgstr ""
 "Indirizzo URL ottenuto da www.openstreetmap.org (si può incollare un "
-"indirizzo URL qui per scaricare l'area)"
+"indirizzo URL qui per scaricare l''area)"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
@@ -8236,16 +8067,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
 #, java-format
-msgid "The string ''{0}'' isn''t a valid double value."
-msgstr "La stringa ''''{0}'''' non è un valore in doppia precisione valido."
+msgid "The string ''{0}'' is not a valid double value."
+msgstr "La stringa ''{0}'' non è un valore in doppia precisione valido."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
-msgstr "Per la latitudine è richiesto un valore nell'intervallo [-90,90]."
+msgstr "Per la latitudine è richiesto un valore nell''intervallo [-90,90]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
-msgstr "Per la longitudine è richiesto un valore nell'intervallo [-180,180]."
+msgstr "Per la longitudine è richiesto un valore nell''intervallo [-180,180]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
@@ -8266,5 +8097,5 @@
 msgid "Select to download OSM data in the selected download area."
 msgstr ""
-"Selezionare per scaricare i dati OSM presenti nell'area di scarico "
+"Selezionare per scaricare i dati OSM presenti nell''area di scarico "
 "selezionata."
 
@@ -8276,5 +8107,5 @@
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
-"Selezionare per scaricare i tracciati GPS presenti nell'area di scarico "
+"Selezionare per scaricare i tracciati GPS presenti nell''area di scarico "
 "selezionata."
 
@@ -8288,7 +8119,7 @@
 "into the currently active data layer.</html>"
 msgstr ""
-"<html>Seleziona per scaricare i dati in un nuovo livello dei "
-"dati.<br>Deselezionare per scaricare nel livello dei dati correntemente "
-"attivo.</html>"
+"<html>Seleziona per scaricare i dati in un nuovo livello dei dati."
+"<br>Deselezionare per scaricare nel livello dei dati correntemente attivo.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:124
@@ -8316,20 +8147,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
 msgid "Click do download the currently selected area"
-msgstr "Cliccare per scaricare l'area correntemente selezionata"
+msgstr "Cliccare per scaricare l''area correntemente selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
 msgid "Please select a download area first."
-msgstr "Selezionare prima un'area di scarico."
+msgstr "Selezionare prima un''area di scarico."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>Né <strong>{0}</strong> né <strong>{1}</strong> sono "
-"abilitati.<br>Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure "
-"entrambi.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>Né <strong>{0}</strong> né <strong>{1}</strong> sono abilitati."
+"<br>Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure entrambi.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
@@ -8391,8 +8221,4 @@
 #. <space />
 #. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
@@ -8407,45 +8233,38 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2337
-#: build/trans_presets.java:2379 build/trans_presets.java:2405
-#: build/trans_presets.java:2947 build/trans_presets.java:2957
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:379 build/trans_presets.java:661
+#: build/trans_presets.java:1009 build/trans_presets.java:1267
+#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2266 build/trans_presets.java:2808
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "Type"
 msgstr "Tipo"
 
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
+#. item "Ways/Path" combo "Wheelchairs"
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
+#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:58
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:139
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:461
-#: build/trans_presets.java:481 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:785
-#: build/trans_presets.java:800 build/trans_presets.java:1344
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2473
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:646
+#: build/trans_presets.java:661 build/trans_presets.java:1205
+#: build/trans_presets.java:1272 build/trans_presets.java:1273
+#: build/trans_presets.java:1274 build/trans_presets.java:2334
+#: build/trans_presets.java:2335 build/trans_presets.java:2336
 msgid "unknown"
 msgstr "sconosciuto"
@@ -8495,5 +8314,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
 msgid "JOSM Help Browser"
-msgstr "Browser dell'aiuto di JOSM"
+msgstr "Browser dell''aiuto di JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
@@ -8505,6 +8324,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information.You can both edit the <a href=\"{2}\">help topic in your "
-"local language ({1})</a> and the <a href=\"{3}\">help topic in "
-"english</a>.</p></html>"
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
 msgstr ""
 "<html><p class=\"warning-header\">Manca il contenuto per questo argomento di "
@@ -8521,6 +8340,6 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is "
-"(untranslated):<br><tt>{1}</tt></p></html>"
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
 msgstr ""
 "<html><p class=\"error-header\">Errore durante l''ottenimento delle "
@@ -8535,11 +8354,11 @@
 "network problem, please check your<br>your internet connection</html>"
 msgstr ""
-"<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url "
-"{0}.<br>Tipicamente questo è dovuto a qualche problema di rete, controllare "
-"la propria<br>connessione ad internet</html>"
+"<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url {0}."
+"<br>Tipicamente questo è dovuto a qualche problema di rete, controllare la "
+"propria<br>connessione ad internet</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354
 msgid "Failed to open URL"
-msgstr "Fallita l'apertura dell'indirizzo URL"
+msgstr "Fallita l''apertura dell''indirizzo URL"
 
 #. putValue(NAME, tr("Open in Browser"));
@@ -8584,17 +8403,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Attenzione: posizione errata nel documento HTML. L'eccezione è stata: "
+#, fuzzy, java-format
+msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgstr ""
+"Attenzione: posizione errata nel documento HTML. L''eccezione è stata: "
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
 msgid "Failed to open help page. The target URL is empty."
 msgstr ""
-"Fallita l'apertura della pagina di aiuto. L'indirizzo URL di destinazione è "
-"vuoto."
+"Fallita l''apertura della pagina di aiuto. L''indirizzo URL di destinazione "
+"è vuoto."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562
 msgid "Failed to open help page"
-msgstr "Fallita l'apertura della pagina di aiuto"
+msgstr "Fallita l''apertura della pagina di aiuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
@@ -8629,12 +8449,12 @@
 msgstr "Ricarica lo storico dal server"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
-"Storico non ancora inizializzato. Fallita l'impostazione della primitiva di "
+"Storico non ancora inizializzato. Fallita l''impostazione della primitiva di "
 "riferimento."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306
 #, java-format
 msgid ""
@@ -8644,5 +8464,5 @@
 "corrisponde allo storico con ID {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279
 #, java-format
 msgid ""
@@ -8652,11 +8472,11 @@
 "è disponibile nello storico."
 
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+"storico non ancora inizializzato. E'' fallito il tentativo di impostare la "
+"primitiva corrente."
+
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-"storico non ancora inizializzato. E' fallito il tentativo di impostare la "
-"primitiva corrente."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314
 #, java-format
 msgid ""
@@ -8667,35 +8487,20 @@
 "non è disponibile nello storico."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:54
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 msgid "Load history"
 msgstr "Carica storico"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:80
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-msgstr "Atteso parametro ''{0}'' > 0. Valore attuale {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
-#, java-format
-msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-msgstr "atteso id nel parametro ''{0}'' > 0, valore attuale {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:195
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
 #, java-format
 msgid "Loading history for node {0}"
 msgstr "Caricamento dello storico per il nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
 msgstr "Caricamento dello storico per il percorso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:197
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
@@ -8735,17 +8540,17 @@
 msgstr "non presente"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55
 msgid "Changeset"
 msgstr "Insieme di modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
 #, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
-"<html>Versione <strong>{0}</strong> attualmente editata nel layer "
-"''{1}''</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
+"<html>Versione <strong>{0}</strong> attualmente editata nel layer ''{1}''</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #, java-format
 msgid ""
@@ -8781,5 +8586,5 @@
 #, java-format
 msgid "Version {0} in editor"
-msgstr "Versione {0} nell' editor"
+msgstr "Versione {0} nell'' editor"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
@@ -8807,5 +8612,5 @@
 #, java-format
 msgid ""
-"Failed to update primitive with id {0} because current edit layer doesn't "
+"Failed to update primitive with id {0} because current edit layer does not "
 "include such a primitive"
 msgstr ""
@@ -8831,5 +8636,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154
 msgid "Synchronize entire dataset"
-msgstr "Sincronizza l'intero dataset"
+msgstr "Sincronizza l''intero dataset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118
@@ -8839,19 +8644,18 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Caricamento <strong>fallito</strong> perché il server possiede una "
 "versione più recente di uno<br>dei tuoi nodi, percorsi, o relazioni.<br>Il "
-"conflitto è stato causato da <strong>{0}</strong> con identificativo "
-"<strong>{1}</strong>,<br>il server possiede la versione {2}, la tua versione "
-"è {3}.<br><br>Cliccare <strong>{4}</strong> per sincronizzare solamente la "
+"conflitto è stato causato da <strong>{0}</strong> con identificativo <strong>"
+"{1}</strong>,<br>il server possiede la versione {2}, la tua versione è {3}."
+"<br><br>Cliccare <strong>{4}</strong> per sincronizzare solamente la "
 "primitiva che causa il conflitto.<br>Cliccare <strong>{5}</strong> per "
 "sincronizzare tutto l''insieme di dati locale con il server.<br>Cliccare "
-"<strong>{6}</strong> per annullare e continuare ad apportare delle "
-"modifiche.<br></html>"
+"<strong>{6}</strong> per annullare e continuare ad apportare delle modifiche."
+"<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8865,19 +8669,18 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Caricamento <strong>fallito</strong> perché il server possiede una "
-"versione più recente di uno<br>dei tuoi nodi, percorsi, o "
-"relazioni.<br><br>Cliccare <strong>{0}</strong> per sincronizzare tutto "
-"l''insieme di dati locale con il server.<br>Cliccare <strong>{1}</strong> "
-"per annullare e continuare ad apportare delle modifiche.<br></html>"
+"versione più recente di uno<br>dei tuoi nodi, percorsi, o relazioni."
+"<br><br>Cliccare <strong>{0}</strong> per sincronizzare tutto l''insieme di "
+"dati locale con il server.<br>Cliccare <strong>{1}</strong> per annullare e "
+"continuare ad apportare delle modifiche.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
 #, java-format
 msgid ""
-"<html>Uploading <strong>failed</strong> because you''ve been "
+"<html>Uploading <strong>failed</strong> because you have been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
 "again with a new or an existing open changeset.</html>"
@@ -8979,20 +8782,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143
 msgid "Close changeset after upload"
-msgstr "Chiudi l'insieme di modifiche dopo il caricamento"
+msgstr "Chiudi l''insieme di modifiche dopo il caricamento"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:144
 msgid "Select to close the changeset after the next upload"
 msgstr ""
-"Selezionare per chiudere l'insieme di modifiche dopo il prossimo caricamento"
+"Selezionare per chiudere l''insieme di modifiche dopo il prossimo caricamento"
 
 #. putValue(NAME, tr("Reload"));
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:297
 msgid "Load the list of your open changesets from the server"
-msgstr ""
-"Carica dal server la lista degli insiemi di modifiche personali aperti"
+msgstr "Carica dal server la lista degli insiemi di modifiche personali aperti"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:315
 msgid "Close the currently selected open changeset"
-msgstr "Chiudi l'insieme di modifiche aperto correntemente selezionato"
+msgstr "Chiudi l''insieme di modifiche aperto correntemente selezionato"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
@@ -9057,9 +8859,9 @@
 #, java-format
 msgid ""
-"<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-"username and a valid password.</html>"
-msgstr ""
-"<html>Autenticazione fallita nelle OSM API ''{0}'' . Immettere un nome "
-"utente ed una password valida.</html>"
+"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
+"and a valid password."
+msgstr ""
+"Autenticazione fallita nelle OSM API ''{0}'' . Immettere un nome utente ed "
+"una password valida."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -9070,5 +8872,5 @@
 msgid "Please enter the user name for authenticating at your proxy server"
 msgstr ""
-"Si prega di inserire un nome utente per l'autenticazione con il proprio "
+"Si prega di inserire un nome utente per l''autenticazione con il proprio "
 "server proxy"
 
@@ -9076,23 +8878,23 @@
 msgid "Please enter the password for authenticating at your proxy server"
 msgstr ""
-"Si prega di inserire una password per l'autenticazione con il proprio server "
-"proxy"
+"Si prega di inserire una password per l''autenticazione con il proprio "
+"server proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
 #, java-format
 msgid ""
-"<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
-"username and a valid password.</html>"
-msgstr ""
-"<html>Fallita l''autenticazione al server proxy HTTP ''''{0}'''' . Si prega "
-"di inserire un nome utente ed una password validi.</html>"
+"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
+"username and a valid password."
+msgstr ""
+"Fallita l''autenticazione al server proxy HTTP ''''{0}'''' . Si prega di "
+"inserire un nome utente ed una password validi."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
 msgid ""
-"<html>Warning: depending on the authentication method the proxy server uses "
-"the password may be transferred unencrypted.</html>"
-msgstr ""
-"<html>Attenzione: in base al metodo di autenticazione utilizzato dal server "
-"proxy la password potrebbe essere trasferita in chiaro.</html>"
+"Warning: depending on the authentication method the proxy server uses the "
+"password may be transferred unencrypted."
+msgstr ""
+"Attenzione: in base al metodo di autenticazione utilizzato dal server proxy "
+"la password potrebbe essere trasferita in chiaro."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -9110,15 +8912,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
 msgid ""
-"<html>Could not retrieve the list of your open changesets because<br>JOSM "
-"doesn't know your identity.<br>You've either chosen to work anonymously or "
-"you are not entitled<br>to know the identity of the user on whose behalf you "
-"are working.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:69
+"Could not retrieve the list of your open changesets because<br>JOSM does not "
+"know your identity.<br>You have either chosen to work anonymously or you are "
+"not entitled<br>to know the identity of the user on whose behalf you are "
+"working."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
 msgid "Missing user identity"
 msgstr "Identità utente mancante"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:122
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:121
 #, java-format
 msgid ""
@@ -9150,6 +8952,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "Il livello ''''{0}'''' contiene delle modifiche che dovrebbero essere "
@@ -9198,6 +8999,5 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
-"Selezionare per caricare il livello ''''{0}'''' sul server ''''{1}''''"
+msgstr "Selezionare per caricare il livello ''''{0}'''' sul server ''''{1}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
@@ -9244,6 +9044,6 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a "
-"file:</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
 msgstr[0] ""
 "<html>{0} livello ha la necessità di essere salvato ma non possiede alcun "
@@ -9260,11 +9060,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, java-format
-msgid ""
-"<html>{0} layer needs saving but has an associated file<br>which can't be "
-"written.<br>Either select another file for this layer or discard the "
-"changes.<br>Layer with a non-writable file:</html>"
+#, fuzzy, java-format
+msgid ""
+"<html>{0} layer needs saving but has an associated file<br>which cannot be "
+"written.<br>Either select another file for this layer or discard the changes."
+"<br>Layer with a non-writable file:</html>"
 msgid_plural ""
-"<html>{0} layers need saving but have associated files<br>which can't be "
+"<html>{0} layers need saving but have associated files<br>which cannot be "
 "written.<br>Either select another file for each of them or discard the "
 "changes.<br>Layers with non-writable files:</html>"
@@ -9330,8 +9130,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
+#, fuzzy, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
 "cancelled or has failed.</html>"
-msgstr ""
+msgid_plural ""
+"<html>Upload and/or save operations of {0} layers with modifications<br>were "
+"cancelled or have failed.</html>"
+msgstr[0] ""
+"<html>Una operazione di caricamento e/o salvataggio di un livello con "
+"modifiche<br>è stata annullata oppure è fallita.</html>"
+msgstr[1] ""
 "<html>Una operazione di caricamento e/o salvataggio di un livello con "
 "modifiche<br>è stata annullata oppure è fallita.</html>"
@@ -9359,4 +9166,5 @@
 #. 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"
@@ -9365,8 +9173,8 @@
 #. item "Highways/Streets/Tunnel" text "Name"
 #. item "Ways/Construction" check "Embankment"
-#. item "Ways/Bridleway" check "Embankment"
-#. item "Ways/Pedestrian" check "Embankment"
+#. item "Ways/Dedicated Bridleway" check "Embankment"
+#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Steps" check "Embankment"
-#. item "Ways/Path" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
 #. item "Water/Water/Stream" text "Name"
@@ -9380,16 +9188,15 @@
 #: build/trans_presets.java:192 build/trans_presets.java:212
 #: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:290
-#: build/trans_presets.java:323 build/trans_presets.java:369
-#: build/trans_presets.java:384 build/trans_presets.java:399
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:462 build/trans_presets.java:482
-#: build/trans_presets.java:501 build/trans_presets.java:520
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:645
-#: build/trans_presets.java:676 build/trans_presets.java:1073
-#: build/trans_presets.java:1081 build/trans_presets.java:1089
-#: build/trans_presets.java:1099 build/trans_presets.java:1319
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:387 build/trans_presets.java:402
+#: build/trans_presets.java:417 build/trans_presets.java:439
+#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:511 build/trans_presets.java:532
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:934 build/trans_presets.java:942
+#: build/trans_presets.java:950 build/trans_presets.java:960
+#: build/trans_presets.java:1180
 msgid "Layer"
 msgstr "Layer"
@@ -9434,6 +9241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117
 msgid "Decide how to upload the data and which changeset to use"
-msgstr ""
-"Decidere come caricare i dati e quale insieme di modifiche utilizzare"
+msgstr "Decidere come caricare i dati e quale insieme di modifiche utilizzare"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
@@ -9444,5 +9250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
 msgid "Apply tags to the changeset data is uploaded to"
-msgstr "Applica le etichette ai dati dell'insieme di modifiche caricato"
+msgstr "Applica le etichette ai dati dell''insieme di modifiche caricato"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
@@ -9497,6 +9303,6 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
 msgid ""
@@ -9507,5 +9313,5 @@
 "questa primitiva e riprovare a caricare."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing primitives to upload ..."
 msgstr "Preparazione delle primitive da caricare ..."
@@ -9514,6 +9320,6 @@
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
 msgstr ""
-"Gli oggetti saranno caricati su un <strong>nuovo gruppo di "
-"modifiche</strong>."
+"Gli oggetti saranno caricati su un <strong>nuovo gruppo di modifiche</"
+"strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9523,10 +9329,9 @@
 "comment ''{1}''."
 msgstr ""
-"Gli oggetti sono stati caricati sul <strong>gruppo di modifiche "
-"aperto</strong> {0} con il commento ''''{1}''''."
+"Gli oggetti sono stati caricati sul <strong>gruppo di modifiche aperto</"
+"strong> {0} con il commento ''''{1}''''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
-msgid ""
-"The changeset is going to be <strong>closed</strong> after this upload"
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 "Il gruppo di modifiche sarà <strong>chiuso</strong> dopo questo caricamento"
@@ -9591,13 +9396,13 @@
 msgstr ""
 "{0} oggetti superano il limite massimo consentito di {1} oggetti in un "
-"gruppo di modifiche sul server ''''{2}''''. Si prega di <a "
-"href=\"urn:advanced-configuration\">scegliere</a> la modalità con "
-"<strong>gruppi di modifiche multipli</strong>"
+"gruppo di modifiche sul server ''''{2}''''. Si prega di <a href=\"urn:"
+"advanced-configuration\">scegliere</a> la modalità con <strong>gruppi di "
+"modifiche multipli</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple "
-"changesets</strong> using <strong>{1} requests</strong>"
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
 msgstr ""
 "Caricamento di <strong>{0} oggetti</strong> su <strong>più gruppi di "
@@ -9643,7 +9448,7 @@
 "on the server ''{1}''."
 msgstr ""
-"Il server ha segnalato che il gruppo di modifiche corrente è stato "
-"chiuso.<br>Questo perché probabilmente la dimensione del gruppo di modifiche "
-"supera il limite massimo<br>di {0} oggetti sul server ''''{1}''''."
+"Il server ha segnalato che il gruppo di modifiche corrente è stato chiuso."
+"<br>Questo perché probabilmente la dimensione del gruppo di modifiche supera "
+"il limite massimo<br>di {0} oggetti sul server ''''{1}''''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
@@ -9658,7 +9463,7 @@
 msgid ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
-"map editing.<br>"
+"changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
+"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
+"editing.<br>"
 msgstr ""
 "Cliccare ''<strong>{0}</strong>'' per continuare il caricamento su nuovi "
@@ -9672,5 +9477,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193
 #, java-format
@@ -9694,8 +9499,7 @@
 msgstr "Caricamento di {0} oggetti ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
-#, java-format
-msgid ""
-"Ignoring caught exception because upload is canceled. Exception is: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "L''eccezione che è stata generata verrà ignorata perché il caricamento è "
@@ -9758,6 +9562,6 @@
 msgstr ""
 "<html>Sono necessari <strong>più gruppi di modifiche</strong> per permettere "
-"il caricamento di  {0} oggetti. Quale strategia si desidera "
-"utilizzare?</html>"
+"il caricamento di  {0} oggetti. Quale strategia si desidera utilizzare?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
@@ -9778,5 +9582,5 @@
 #, java-format
 msgid ""
-"<html>Can''t upload {0} objects in one request because the<br>max. changeset "
+"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
@@ -9872,5 +9676,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "punto GPS"
@@ -9932,19 +9735,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
 msgid "Import Audio"
-msgstr "Importa l'audio"
+msgstr "Importa l''audio"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with audio data.</html>"
-msgstr ""
-"<html>Sono stati scaricati dal server i dati nel livello GPX "
-"''''{0}''''.<br>Siccome i suoi punti non includono una marcatura temporale "
-"non è possibile correlarli con la traccia audio.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
+"<br>Siccome i suoi punti non includono una marcatura temporale non è "
+"possibile correlarli con la traccia audio.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
 msgid "Import not possible"
 msgstr "Importazione non possibile"
@@ -9959,20 +9762,20 @@
 msgstr "Marcatori audio da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
 msgid "Import images"
 msgstr "Importa immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with images.</html>"
-msgstr ""
-"<html>Sono stati scaricati dal server i dati nel livello GPX "
-"''''{0}''''.<br>Siccome i suoi punti non includono una marcatura temporale "
-"non è possibile correlarli con le immagini.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
+"<br>Siccome i suoi punti non includono una marcatura temporale non è "
+"possibile correlarli con le immagini.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9980,5 +9783,5 @@
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9986,5 +9789,5 @@
 msgstr "Descrizione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
 #, java-format
 msgid "{0} track"
@@ -9994,23 +9797,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3055
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 msgid "Timespan"
 msgstr "Differenza temporale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Length"
 msgstr "Lunghezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
 msgid "Length: "
 msgstr "Lunghezza: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:436
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
 #, java-format
 msgid "{0} route, "
@@ -10019,5 +9822,5 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} waypoint"
@@ -10026,13 +9829,13 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Il caricamento di dati GPS non elaborati assunti come dati "
@@ -10040,10 +9843,10 @@
 "tracciati, vedere qui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
@@ -10054,29 +9857,29 @@
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:959
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
 msgid "Download from OSM along this track"
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:952
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
 #, java-format
 msgid ""
@@ -10087,18 +9890,18 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1063
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
 msgid "No GPX track available in layer to associate audio with."
-msgstr "Nessuna traccia GPX da associare con l'audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1232
+msgstr "Nessuna traccia GPX da associare con l''audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
 "the end were omitted or moved to the start."
 msgstr ""
-"Alcuni punti del percorso con marcature temporali precedenti l'inizio o "
+"Alcuni punti del percorso con marcature temporali precedenti l''inizio o "
 "successivi alla fine del tracciato sono stati omessi o posizionati "
-"all'inizio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1239
+"all''inizio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10115,5 +9918,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
 msgid "outside downloaded area"
-msgstr "al di fuori dell'area scaricata"
+msgstr "al di fuori dell''area scaricata"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
@@ -10125,5 +9928,5 @@
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
-"Attenzione: l'uso contemporaneo di dati nelle versioni 0.5 e 0.6 risulterà "
+"Attenzione: l''uso contemporaneo di dati nelle versioni 0.5 e 0.6 risulterà "
 "nella versione 0.5"
 
@@ -10214,6 +10017,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
 msgstr ""
 "<html>Il caricamento di dati GPS non elaborati assunti come dati "
@@ -10255,4 +10058,9 @@
 msgstr[1] "{0} punti"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#, fuzzy
+msgid "GPS point"
+msgstr "Punti GPS"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10276,10 +10084,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Fotografa il tuo ricevitore GPS mentre indica l'ora.<br>Visualizza qui "
-"la foto.<br>Copia l'ora dalla foto e seleziona la fascia oraria<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Fotografa il tuo ricevitore GPS mentre indica l''ora.<br>Visualizza "
+"qui la foto.<br>Copia l''ora dalla foto e seleziona la fascia oraria<hr></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
@@ -10296,5 +10105,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
-msgid "I'm in the timezone of: "
+msgid "I am in the timezone of: "
 msgstr "Mi trovo nel fuso orario di: "
 
@@ -10305,10 +10114,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
-msgid "Open an other photo"
-msgstr "Apri un'altra fotografia"
+msgid "Open another photo"
+msgstr "Apri un''altra fotografia"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
 msgid "Synchronize time from a photo of the GPS receiver"
-msgstr "Sincronizza l'ora da una fotografia del ricevitore GPS"
+msgstr "Sincronizza l''ora da una fotografia del ricevitore GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
@@ -10317,5 +10126,5 @@
 "Please use the requested format"
 msgstr ""
-"Errore nell'interpretazione della data.\n"
+"Errore nell''interpretazione della data.\n"
 "Si prega di usare il formato richiesto"
 
@@ -10383,48 +10192,51 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
 #, java-format
-msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:669
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
+msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
+msgid_plural ""
+"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
 msgid "Correlate images with GPX track"
 msgstr "Correla le immagini al tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
 msgid "Correlate"
 msgstr "Correla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:697
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
 msgid "Invalid timezone"
 msgstr "Fuso orario non valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
 msgid "Invalid offset"
 msgstr "Compensazione non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Try Again"
 msgstr "Riprova"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "No images could be matched!"
 msgstr "Non è stato possibile correlare alcuna immagine!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuso orario: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:864
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10433,49 +10245,50 @@
 msgstr[1] "Differenza temporale di {0} giorni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
 msgstr ""
-"E' stato generato un errore durante il tentativo di correlare le foto con il "
-"tracciato GPX. Si possono regolare le barre di scorrimento per correlare "
+"E'' stato generato un errore durante il tentativo di correlare le foto con "
+"il tracciato GPX. Si possono regolare le barre di scorrimento per correlare "
 "manualmente le foto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
 msgid "Matching photos to track failed"
-msgstr "E' fallita la correlazione delle foto al tracciato"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:928
+msgstr "E'' fallita la correlazione delle foto al tracciato"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
 msgid "Adjust timezone and offset"
 msgstr "Regola fuso orario e differenza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
-msgid "The selected photos don't contain time information."
-msgstr "Le foto selezionate non contengono informazioni sull'ora."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
-msgid "Photos don't contain time information"
-msgstr "Le foto non contengono informazioni sull'ora"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:977
-msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+msgid "The selected photos do not contain time information."
+msgstr "Le foto selezionate non contengono informazioni sull''ora."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgid "Photos do not contain time information"
+msgstr "Le foto non contengono informazioni sull''ora"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+msgid ""
+"The selected GPX track does not contain timestamps. Please select another "
+"one."
 msgstr ""
 "Il tracciato GPX selezionato non contiene le marcature temporali. "
 "Selezionarne un altro."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:978
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid "GPX Track has no time information"
-msgstr "Il tracciato GPX non contiene alcuna informazione sull'ora"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1073
+msgstr "Il tracciato GPX non contiene alcuna informazione sull''ora"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
 msgid "You should select a GPX track"
 msgstr "Selezionare un tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1074
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "No selected GPX track"
 msgstr "Nessun tracciato GPX selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
 #, java-format
 msgid ""
@@ -10486,5 +10299,5 @@
 "Formato atteso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1317
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
 #, java-format
 msgid ""
@@ -10492,5 +10305,5 @@
 "Expected format: {0}"
 msgstr ""
-"Errore durante l'analisi dell'offset.\n"
+"Errore durante l''analisi dell''offset.\n"
 "Formato atteso: {0}."
 
@@ -10547,13 +10360,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-msgid "image"
-msgid_plural "images"
-msgstr[0] "immagine"
-msgstr[1] "immagini"
+#, fuzzy, java-format
+msgid "{0} image loaded."
+msgid_plural "{0} images loaded."
+msgstr[0] "{0} nodi intermedi."
+msgstr[1] "{0} nodi intermedi."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, java-format
-msgid "{0} were found to be gps tagged."
-msgstr "{0} sono stati trovati etichettati dal gps"
+#, fuzzy, java-format
+msgid "{0} was found to be GPS tagged."
+msgid_plural "{0} were found to be GPS tagged."
+msgstr[0] "{0} sono stati trovati etichettati dal gps"
+msgstr[1] "{0} sono stati trovati etichettati dal gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
@@ -10573,5 +10389,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
-msgstr "Il file dell'immagine non può essere eliminato."
+msgstr "Il file dell''immagine non può essere eliminato."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
@@ -10601,5 +10417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
 msgid "Show previous Image"
-msgstr "Visualizza l'immagine precedente"
+msgstr "Visualizza l''immagine precedente"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -10626,5 +10442,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
 msgid "Show next Image"
-msgstr "Visualizza l'immagine successiva"
+msgstr "Visualizza l''immagine successiva"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
@@ -10681,5 +10497,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
 msgid "Synchronize Audio"
-msgstr "Sincronizza l'audio"
+msgstr "Sincronizza l''audio"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -10701,5 +10517,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:258
 msgid "Make Audio Marker at Play Head"
-msgstr "Esegui il marcatore audio all'inizio del brano"
+msgstr "Esegui il marcatore audio all''inizio del brano"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
@@ -10726,5 +10542,5 @@
 "track you were playing (after the first marker)."
 msgstr ""
-"E' necessario spostare la testina di riproduzione in prossimità del "
+"E'' necessario spostare la testina di riproduzione in prossimità del "
 "tracciato GPX a cui è associata la traccia audio che si vuole riprodurre "
 "(dopo il primo marcatore)."
@@ -10735,5 +10551,5 @@
 "point where you want to synchronize."
 msgstr ""
-"Sposta (premendo SHIFT) l'inizio dell'audio sopra un marcatore audio o sul "
+"Sposta (premendo SHIFT) l''inizio dell''audio sopra un marcatore audio o sul "
 "tracciato da sincronizzare."
 
@@ -10744,5 +10560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "Impossibile mostrare l'URL per questo marcatore"
+msgstr "Impossibile mostrare l''URL per questo marcatore"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
@@ -10752,5 +10568,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 msgid "Error displaying URL"
-msgstr "Impossibile visualizzare l'URL"
+msgstr "Impossibile visualizzare l''URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
@@ -10763,17 +10579,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, java-format
-msgid ""
-"Warning: failed to load Mappaint-Styles from ''{0}''. Exception was: {1}"
-msgstr ""
+#, fuzzy, java-format
+msgid ""
+"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Attenzione: fallita la lettura del messaggio del giorno da ''''{0}''''. "
+"L''eccezione è stata: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, java-format
-msgid ""
-"Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}"
-msgstr ""
+#, fuzzy, java-format
+msgid ""
+"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Attenzione: fallita la lettura del messaggio del giorno da ''''{0}''''. "
+"L''eccezione è stata: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:68
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
 msgid "Access Token Key:"
@@ -10781,5 +10601,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:82
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
 msgid "Access Token Secret:"
@@ -10817,5 +10637,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
 msgid "Authorise URL:"
 msgstr ""
@@ -10839,25 +10659,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
 msgid "Fully automatic"
 msgstr "Completamente automatico"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
 msgid "Semi-automatic"
 msgstr "Semi-automatico"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
 msgid "Manual"
 msgstr "Manuale"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
 msgid ""
 "<html>Run a fully automatic procedure to get an access token from the OSM "
 "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-"fully<br>automatically authorises the user and retrieves an Access "
-"Token.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
 msgid ""
 "<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -10868,5 +10688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
 msgid ""
 "<html>Enter an Access Token manually if it was generated and retrieved "
@@ -10874,41 +10694,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:112
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
 msgid "Username: "
 msgstr "Nome utente: "
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:127
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
 msgid "Password: "
 msgstr "Password: "
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175
 msgid "Granted rights"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176
 msgid "Advanced OAuth properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:357
 msgid "Accept Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
-#, java-format
-msgid ""
-"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237
+#, java-format
+msgid ""
+"<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
 "website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
 msgid "Authorise now"
 msgstr "Autorizza adesso"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
 msgid "Click to redirect you to the authorisation form on the JOSM web site"
 msgstr ""
@@ -10916,16 +10736,21 @@
 "di JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274
+msgid "Back"
+msgstr "Indietro"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366
 msgid "Run the automatic authorisation steps again"
-msgstr "Esegui nuovamente i passaggi dell'autorizzazione automatica"
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+msgstr "Esegui nuovamente i passaggi dell''autorizzazione automatica"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:231
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:436
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
 msgid "Test Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:409
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
@@ -10933,28 +10758,28 @@
 msgstr "Si prega di inserire il proprio nome utente OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:411
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
-msgid "The user name can't be empty. Please enter your OSM user name"
+msgid "The user name cannot be empty. Please enter your OSM user name"
 msgstr ""
 "Il nome utente non può essere vuoto. Si prega di inserire il proprio nome "
 "utente OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:430
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
 msgid "Please enter your OSM password"
 msgstr "Si prega di inserire la propria password OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
-msgid "The password can't be empty. Please enter your OSM password"
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:432
+msgid "The password cannot be empty. Please enter your OSM password"
 msgstr ""
 "La password non può essere vuota. Si prega di inserire la propria password "
 "OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442
 msgid "Authorise JOSM to access the OSM API"
 msgstr "Autorizza JOSM ad accedere alle API di OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10963,28 +10788,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
 msgid "OAuth authorisation failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
+#, java-format
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"OSM server failed because JOSM was not able to build<br>a valid login URL "
 "from the OAuth Authorise Endpoint URL ''{0}''.<br><br>Please check your "
 "advanced setting and try again.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496
 #, java-format
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user "
-"{1}.<br><br>Please check username and password and try again.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
+#, java-format
+msgid ""
+"Please enter an OAuth Access Token which is authorised to access the OSM "
+"server ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
+msgid "Advanced OAuth parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
 #, java-format
 msgid ""
@@ -10993,38 +10845,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
-msgid "Save Access Token to preferences"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
-msgid "Access Token"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
-msgid "Advanced OAuth parameters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
-msgid "Enter the OAuth Access Token"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
-msgid "Enter advanced OAuth properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
 msgid ""
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
 msgid ""
 "The Access Token Secret must not be empty. Please enter an Access Token "
@@ -11032,78 +10864,77 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
 msgid "Please select an authorisation procedure: "
 msgstr "Si prega di selezionare una procedura di autorizzazione: "
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
 #, java-format
 msgid "Get an Access Token for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
 msgid "Close the dialog and cancel authorisation"
-msgstr "Chiudi la finestra ed annulla l'autorizzazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgstr "Chiudi la finestra ed annulla l''autorizzazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:105
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:129
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:162
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
-#, java-format
-msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
-#, java-format
-msgid ""
-"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:299
+#, java-format
+msgid "OSM website did not return a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437
 #, java-format
 msgid "Failed to authorise OAuth request  ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484
 #, java-format
 msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486
 msgid "Initializing a session at the OSM website..."
 msgstr "Inizializzazione della sessione sul sito web OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:492
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Autenticazione della sessione per l''utente ''''{0}''''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
 #, java-format
 msgid "Authorising request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11175,15 +11006,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
 msgid "Display Advanced OAuth Parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
 msgid "Retrieve Request Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
 #, java-format
 msgid ""
@@ -11192,57 +11023,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
 msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
-#, java-format
-msgid ""
-"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
-"launching an authorisation page in an external browser. Please login with "
-"your OSM username and password and follow the instructions to authorise the "
-"Request Token. Then switch back to this dialog and click on "
-"<strong>{0}</strong><br><br>If launching the external browser fails you can "
-"copy the following authorise URL and paste it into the address field of your "
-"browser."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
+#, java-format
+msgid ""
+"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
+"authorisation page in an external browser. Please login with your OSM "
+"username and password and follow the instructions to authorise the Request "
+"Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
-msgid ""
-"<html><body>JOSM has successfully retrieved an Access Token. You can now "
-"accept this token. JOSM will used it the future for authentication and "
-"authorisation at the OSM server.<br><br>The access token is: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
+msgid ""
+"<html>JOSM has successfully retrieved an Access Token. You can now accept "
+"this token. JOSM will use it in the future for authentication and "
+"authorisation to the OSM server.<br><br>The access token is: </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
 msgid "Restart"
 msgstr "Riavvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
 msgid "Click to retrieve a Request Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
 msgstr ""
@@ -11259,5 +11090,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
 #, java-format
-msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
 msgstr ""
 
@@ -11266,5 +11097,5 @@
 msgid ""
 "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
-"at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with id "
+"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
 "''{3}''.</html>"
 msgstr ""
@@ -11293,9 +11124,9 @@
 #, java-format
 msgid ""
-"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
-"test to retrieve the user details for this token failed, "
-"though.<br>Depending on what rights are granted to this token you may "
-"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
-"other protected resources.</html>"
+"<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
 msgstr ""
 
@@ -11307,5 +11138,5 @@
 #, java-format
 msgid ""
-"<html>Failed to retrieve information about the current userfrom the OSM "
+"<html>Failed to retrieve information about the current user from the OSM "
 "server ''{0}''.<br>This is probably not a problem caused by the tested "
 "Access Token, but<br>rather a problem with the server configuration. "
@@ -11321,9 +11152,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-msgid ""
-"<html>The test failed because the server responded with an internal "
-"error.<br>JOSM couldn''t decide whether the token is valid. Please try again "
-"later.</html>"
-msgstr ""
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM could not decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>Il server OSM<br>''''{0}''''<br>ha riportato un errore interno al "
+"server.<br>Solitamente questo è un problema temporaneo. Riprovare più tardi."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11357,9 +11192,10 @@
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
-"Il valore di default è sconosciuto (l'impostazione non è stata ancora usata)."
+"Il valore di default è sconosciuto (l''impostazione non è stata ancora "
+"usata)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
 msgid "Please select the row to edit."
 msgstr "Scegli la riga da modificare."
@@ -11373,5 +11209,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11441,5 +11277,5 @@
 "button icons."
 msgstr ""
-"Inserisci il testo dell'etichetta (e dell'immagine e del web) rispetto al "
+"Inserisci il testo dell''etichetta (e dell''immagine e del web) rispetto al "
 "marcatore audio come icona del tasto."
 
@@ -11454,5 +11290,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
 msgid "When importing audio, make markers from..."
-msgstr "Quando importi l'audio, crea marcatori da ..."
+msgstr "Quando importi l''audio, crea marcatori da ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
@@ -11460,5 +11296,5 @@
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
-"Quando si importa l'audio, applicalo ad ogni punto del percorso nel livello "
+"Quando si importa l''audio, applicalo ad ogni punto del percorso nel livello "
 "GPX."
 
@@ -11478,5 +11314,5 @@
 msgstr ""
 "Crea i marcatori audio nella posizione del tracciato corrispondente "
-"all'orario di modifica di ogni file audio WAV importato."
+"all''orario di modifica di ogni file audio WAV importato."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
@@ -11494,9 +11330,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Valore dell'aumento della velocità per l'avanzamento veloce"
+msgstr "Valore dell''aumento della velocità per l''avanzamento veloce"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
 msgid "Fast forward multiplier"
-msgstr "Incrementazione dell'avanzamento veloce"
+msgstr "Incrementazione dell''avanzamento veloce"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
@@ -11605,5 +11441,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1249
 msgid "Car"
 msgstr "Automobile"
@@ -11625,17 +11461,16 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:336 build/trans_presets.java:662
-#: build/trans_presets.java:869 build/trans_presets.java:888
-#: build/trans_presets.java:902 build/trans_presets.java:924
-#: build/trans_presets.java:961 build/trans_presets.java:974
-#: build/trans_presets.java:986 build/trans_presets.java:998
-#: build/trans_presets.java:1010 build/trans_presets.java:1022
-#: build/trans_presets.java:1032 build/trans_presets.java:1041
-#: build/trans_presets.java:1050 build/trans_presets.java:1444
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:354 build/trans_presets.java:487
+#: build/trans_presets.java:730 build/trans_presets.java:749
+#: build/trans_presets.java:763 build/trans_presets.java:785
+#: build/trans_presets.java:822 build/trans_presets.java:835
+#: build/trans_presets.java:847 build/trans_presets.java:859
+#: build/trans_presets.java:871 build/trans_presets.java:883
+#: build/trans_presets.java:893 build/trans_presets.java:902
+#: build/trans_presets.java:911 build/trans_presets.java:1305
+#: build/trans_presets.java:1371
 msgid "Bicycle"
 msgstr "Bicicletta"
 
-#. item "Ways/Path" label "Type"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11665,12 +11500,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:337 build/trans_presets.java:661
-#: build/trans_presets.java:868 build/trans_presets.java:887
-#: build/trans_presets.java:901 build/trans_presets.java:923
-#: build/trans_presets.java:960 build/trans_presets.java:973
-#: build/trans_presets.java:985 build/trans_presets.java:997
-#: build/trans_presets.java:1009 build/trans_presets.java:1021
-#: build/trans_presets.java:1031 build/trans_presets.java:1040
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:355 build/trans_presets.java:486
+#: build/trans_presets.java:729 build/trans_presets.java:748
+#: build/trans_presets.java:762 build/trans_presets.java:784
+#: build/trans_presets.java:821 build/trans_presets.java:834
+#: build/trans_presets.java:846 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:892 build/trans_presets.java:901
+#: build/trans_presets.java:910
 msgid "Foot"
 msgstr "Pedone"
@@ -11696,9 +11531,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
-msgstr "Solo sull'estremità di un percorso."
+msgstr "Solo sull''estremità di un percorso."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
-msgstr "Disegna i numeri d'ordine dei segmenti"
+msgstr "Disegna i numeri d''ordine dei segmenti"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
@@ -11724,11 +11559,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
-"Maximum length (in meters) to draw lines for local files. Set to '-1' to "
+"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr ""
 "Massima lunghezza (in metri) per il tracciamento di linee in files locali. "
-"Usare '-1' per disegnare qualsiasi linea.\r\n"
-"Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-"draw all lines."
+"Usare ''-1'' per disegnare qualsiasi linea."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11738,7 +11571,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
-"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-msgstr ""
-"Lunghezza massima (in metri) per disegnare le linee. Impostare a '-1' per "
+"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
+msgstr ""
+"Lunghezza massima (in metri) per disegnare le linee. Impostare a ''-1'' per "
 "permettere qualsiasi lunghezza."
 
@@ -11762,6 +11595,5 @@
 #. drawGpsArrowsFast
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
-msgid ""
-"Draw the direction arrows using table lookups instead of complex math."
+msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Disegna le frecce di direzione usando riferimenti tabellari piuttosto che "
@@ -11771,5 +11603,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
-"Don't draw arrows if they are not at least this distance away from the last "
+"Do not draw arrows if they are not at least this distance away from the last "
 "one."
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
@@ -11801,5 +11633,5 @@
 msgstr ""
 "Colora i punti e i segmenti del tracciato in base alla diluizione della "
-"precisione in orizzontale (HDOP). E' necessario che il proprio dispositivo "
+"precisione in orizzontale (HDOP). E'' necessario che il proprio dispositivo "
 "di acquisizione registri queste informazioni."
 
@@ -11826,12 +11658,12 @@
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
-"Disegna i numeri d'ordine per tutti i segmenti all'interno del loro percorso."
+"Disegna i numeri d''ordine per tutti i segmenti all''interno del loro "
+"percorso."
 
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
-msgid ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Applicando l'antialiasing alla mappa, la visualizzazione risulterà migliore."
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Applicando l''antialiasing alla mappa, la visualizzazione risulterà migliore."
 
 #. downloaded area
@@ -11866,5 +11698,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84
 msgid "Show object ID in selection lists"
-msgstr "Mostra l'ID dell'oggetto nelle liste di selezione"
+msgstr "Mostra l''ID dell''oggetto nelle liste di selezione"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
@@ -11875,5 +11707,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93
 msgid "Draw rubber-band helper line"
-msgstr "Disegna la linea d'aiuto ad elastico"
+msgstr "Disegna la linea d''aiuto ad elastico"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42
@@ -11907,5 +11739,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
-msgstr "Abilita lo stile predefinito 'incorporato'"
+msgstr "Abilita lo stile predefinito ''incorporato''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
@@ -11921,13 +11753,12 @@
 msgstr "Stili di disegno della mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
-#, java-format
-msgid ""
-"The following plugin has been downloaded <strong>successfully</strong>:"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68
+#, java-format
+msgid "The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural "The following {0} plugins have been downloaded successfully:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
 #, java-format
 msgid "Downloading the following plugin has <strong>failed</strong>:"
@@ -11937,64 +11768,65 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
 msgid "Enter a search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:166
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
 msgid "Add JOSM Plugin description URL."
-msgstr "Aggiungi indirizzo URL di descrizione dell'estensione JOSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:179
+msgstr "Aggiungi indirizzo URL di descrizione dell''estensione JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185
 msgid "Enter URL"
-msgstr "Inserire l'indirizzo URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
+msgstr "Inserire l''indirizzo URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221
 msgid "Please select an entry."
 msgstr "Seleziona una voce."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:206
 msgid "Edit JOSM Plugin description URL."
-msgstr "Modifica indirizzo URL di descrizione dell'estensione JOSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:201
+msgstr "Modifica indirizzo URL di descrizione dell''estensione JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:207
 msgid "JOSM Plugin description URL"
-msgstr "Indirizzo URL di descrizione dell'estensione JOSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:228
+msgstr "Indirizzo URL di descrizione dell''estensione JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:234
 msgid "Configure Plugin Sites"
 msgstr "Configura i siti delle estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:281
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:310
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:328
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:340
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:540
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:356
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
 msgid "Update plugins"
 msgstr "Aggiorna estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:311
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:363
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
 msgid "Configure sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:364
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
 msgid "Configure the list of sites where plugins are downloaded from"
 msgstr ""
@@ -12017,5 +11849,5 @@
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 msgstr ""
-"<p>Le scorciatoie da tastiera sono assegnate all'avvio di JOSM. Bisogna "
+"<p>Le scorciatoie da tastiera sono assegnate all''avvio di JOSM. Bisogna "
 "<b>riavviare</b> JOSM per applicare le modifiche.</p>"
 
@@ -12025,23 +11857,24 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes "
-"here.</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
 msgstr ""
 "<p>Inoltre le scorciatoie sono abilitate quando sono assegnate a una voce di "
 "menu o un pulsante per la prima volta. Quindi alcune delle modifiche fatte "
 "possono essere attive anche senza riavviare --- ma anche senza la gestione "
-"delle collisioni. Questa è un'altra ragione per <b>riavviare</b> JOSM dopo "
+"delle collisioni. Questa è un''altra ragione per <b>riavviare</b> JOSM dopo "
 "aver apportato delle modifiche in questa sezione.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
 "keys that exist on all kinds of keyboards Java knows about, not just those "
 "keys that exist on your keyboard. Please use only those values that "
-"correspond to a real key on your keyboard. So if your keyboard has no 'Copy' "
-"key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
-"there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key "
-"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
+"correspond to a real key on your keyboard. So if your keyboard has no "
+"''Copy'' key (PC keyboard do not have them, Sun keyboards do), the do not "
+"use it. Also there will be ''keys'' listed that correspond to a shortcut on "
+"your keyboard (e.g. '':''/Colon). Please also do not use them, use the base "
+"key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) "
 "instead. Not doing so may result in conflicts, as there is no way for JOSM "
 "to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
@@ -12053,12 +11886,12 @@
 "propria tastiera specifica. Si invita pertanto ad usare solamente quei "
 "valori che corrispondono a un tasto reale della propria tastiera. Se, ad "
-"esempio, la propria tastiera non possiede un tasto 'Copia' (le tastiere dei "
-"PC non ce l'hanno, mentre quelle della Sun si), non usarlo. Ci saranno anche "
-"dei 'tasti' elencati che corrispondono ad una scorciatoia sulla propria "
-"tastiera (ad es. ':'/Doppio punto). Si invita a non usare neanche questi; "
-"usare piuttosto il tasto base (';'/Punto e virgola su tastiere US, '.'/Punto "
-"su tastiere italiane, ...). Se non si seguono queste indicazioni ci "
-"potrebbero essere dei conflitti, così come non c'è modo per JOSM di sapere "
-"che Ctrl+Shift+; e Ctrl+: su tastiere US sono la stessa cosa...</p>"
+"esempio, la propria tastiera non possiede un tasto ''Copia'' (le tastiere "
+"dei PC non ce l''hanno, mentre quelle della Sun si), non usarlo. Ci saranno "
+"anche dei ''tasti'' elencati che corrispondono ad una scorciatoia sulla "
+"propria tastiera (ad es. '':''/Doppio punto). Si invita a non usare neanche "
+"questi; usare piuttosto il tasto base ('';''/Punto e virgola su tastiere US, "
+"''.''/Punto su tastiere italiane, ...). Se non si seguono queste indicazioni "
+"ci potrebbero essere dei conflitti, così come non c''è modo per JOSM di "
+"sapere che Ctrl+Shift+; e Ctrl+: su tastiere US sono la stessa cosa...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -12078,8 +11911,8 @@
 "already taken, it will assign a random shortcut instead.</p>"
 msgstr ""
-"<p>L'ultima pagina elenca le chiavi dei modificatori che JOSM assegnerà "
+"<p>L''ultima pagina elenca le chiavi dei modificatori che JOSM assegnerà "
 "automaticamente ai collegamenti. Per ciascuno dei quattro tipi di "
 "collegamenti ci sono tre alternative. Durante la gestione dei conflitti, "
-"JOSM proverà queste alternative nell'ordine in cui sono elencate. Se tutte "
+"JOSM proverà queste alternative nell''ordine in cui sono elencate. Se tutte "
 "le alternative producono collegamenti già assegnati, allora ne verrà "
 "assegnato uno casuale.</p>"
@@ -12087,8 +11920,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
+"<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
 "encountered.</p>"
 msgstr ""
-"<p>Lo pseudo-modificatore 'disabled' disabiliterà il collegamento quando "
+"<p>Lo pseudo-modificatore ''disabled'' disabiliterà il collegamento quando "
 "verrà trovato</p>"
 
@@ -12100,5 +11933,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
-msgstr "Usa l'impostazione predefinita"
+msgstr "Usa l''impostazione predefinita"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
@@ -12177,5 +12010,5 @@
 "program."
 msgstr ""
-"Varie impostazioni che influenzano la rappresentazione visiva dell'intero "
+"Varie impostazioni che influenzano la rappresentazione visiva dell''intero "
 "programma."
 
@@ -12195,9 +12028,9 @@
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
-"Impostazioni per la proiezione della mappa e l'interpretazione dei dati."
+"Impostazioni per la proiezione della mappa e l''interpretazione dei dati."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
 msgid "Audio Settings"
-msgstr "Impostazione dell'audio"
+msgstr "Impostazione dell''audio"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
@@ -12358,5 +12191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
 msgid "Edit the selected icon path"
-msgstr "Modifica il percorso dell'icona selezionata"
+msgstr "Modifica il percorso dell''icona selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703
@@ -12368,6 +12201,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 "<html>Fallito il caricamento della lista dei sorgenti degli stili "
@@ -12434,5 +12267,5 @@
 #, java-format
 msgid ""
-"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
 "validate again.</html>"
 msgstr ""
@@ -12446,6 +12279,6 @@
 #, java-format
 msgid ""
-"<html>Failed to build URL ''{0}'' for validating the OSM API "
-"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12467,6 +12300,6 @@
 msgid ""
 "<html>Failed to retrieve a list of changesets from the OSM API server "
-"at<br>''{1}''. The server responded with the return code {0} instead of "
-"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12474,6 +12307,6 @@
 #, java-format
 msgid ""
-"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
-"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
+"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
@@ -12544,6 +12377,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12554,11 +12386,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
 msgid ""
-"You don't have an Access Token yet to access the OSM server using OAuth. "
+"You do not have an Access Token yet to access the OSM server using OAuth. "
 "Please authorise first."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
-msgid ""
-"You already have an Access Token to access the OSM server using OAuth."
+msgid "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12615,5 +12446,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
-msgid "The current value isn't a valid URL"
+msgid "The current value is not a valid URL"
 msgstr ""
 
@@ -12638,5 +12469,5 @@
 msgstr ""
 "Si prega di inserire un nome utente ed una password se il proprio proxy "
-"richiede l'autenticazione."
+"richiede l''autenticazione."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -12654,6 +12485,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
 msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-"
-"Djava.net.useSystemProxies=true</tt> to enable)"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
 msgstr ""
 "Utilizza le impostazioni di sistema standard (disabilitato. Per abilitare "
@@ -12671,5 +12502,5 @@
 msgid ""
 "Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to 'No proxy'"
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
 
@@ -12798,6 +12629,6 @@
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:60
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
@@ -12811,7 +12642,8 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-msgid ""
-"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}"
+#, fuzzy, java-format
+msgid ""
+"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}''"
 msgstr ""
 "Attenzione: valore non valido per l''attributo ''''{0}'''' dell''elemento "
@@ -12819,5 +12651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -12833,7 +12665,7 @@
 "nell''aggiornamento del gruppo di modifiche. Ottenuto ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:126
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:128
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:132
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:129
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:133
 #, java-format
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
@@ -12842,5 +12674,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:130
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
 #, java-format
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
@@ -12848,14 +12680,14 @@
 "Valore della latitudine non valido per il parametro ''''{0}'''', ottenuto {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:293
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:298
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:300
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:307
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:313
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:318
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:324
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:329
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:340
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:347
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:299
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:301
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:308
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:314
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:319
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:325
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:330
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:341
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:348
 #, java-format
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
@@ -12864,12 +12696,12 @@
 "sui gruppi di modifiche, ottenuto {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:361
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:365
-msgid ""
-"Can't create a changeset query including both the query parameters 'uid' and "
-"'display_name'"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:390
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366
+msgid ""
+"Cannot create a changeset query including both the query parameters ''uid'' "
+"and ''display_name''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
@@ -12897,6 +12729,5 @@
 #, java-format
 msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr ""
-"Numero di porta non valido nella preferenza ''''{0}''''. Ottenuto {1}."
+msgstr "Numero di porta non valido nella preferenza ''''{0}''''. Ottenuto {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:103
@@ -12934,5 +12765,5 @@
 #. Just log something. The network stack will also throw an exception which will be caught
 #. somewhere else
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:143
 #, java-format
@@ -12946,6 +12777,6 @@
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property 'java.net.useSystemProxies' was missing at startup "
-"time. Won't use a proxy."
+"settings. The property ''java.net.useSystemProxies'' was missing at startup "
+"time.  Will not use a proxy."
 msgstr ""
 
@@ -12964,25 +12795,24 @@
 msgstr "Impossibile esportare ''''{0}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:38
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
 #, java-format
 msgid "Could not import ''{0}''."
 msgstr "Impossibile importare ''''{0}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:45
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
 msgid "Could not import files."
 msgstr "Impossibile importare i file."
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:59
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
-"<html>Impossibile leggere il file ''{0}''.<br> Errore: <br>{1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:73
+msgstr "<html>Impossibile leggere il file ''{0}''.<br> Errore: <br>{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
 #, java-format
 msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
 msgstr "<html>Impossibile leggere i file.<br> L''errore è: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -12992,6 +12822,6 @@
 "con licenza GPL."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:25
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:26
 msgid "GPX Files"
 msgstr "Files GPX"
@@ -13050,8 +12880,8 @@
 msgstr "Scegliere una licenza predefinita"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:86
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:83
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -13059,5 +12889,5 @@
 msgstr "Marcatori da {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:67
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
 #, java-format
 msgid ""
@@ -13066,10 +12896,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:78
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
 #, java-format
 msgid "File \"{0}\" does not exist"
 msgstr "il file \"{0}\" non esiste"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:81
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -13086,13 +12916,18 @@
 msgstr "Modalità {0} sconosciuta."
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "Image Files"
 msgstr "File immagine"
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "folder"
 msgstr "cartella"
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:39
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
+#, fuzzy
+msgid "Looking for image files"
+msgstr "Ricerca della riva..."
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
 msgid "No image files found."
 msgstr ""
@@ -13104,7 +12939,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, java-format
-msgid ""
-"No primitive with id {0} in local dataset. Can't infer primitive type."
+#, fuzzy, java-format
+msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 "Nessuna primitiva con {0} nell''insieme di dati locale. Non è possibile "
@@ -13114,5 +12948,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97
@@ -13171,47 +13005,47 @@
 msgstr[1] "Scaricamento di {0} oggetti da ''''{1}''''"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
 msgid "NMEA-0183 Files"
 msgstr "Files NMEA-0183"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Coordinates imported: "
 msgstr "Coordinate importate: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 msgid "Malformed sentences: "
 msgstr "Formato non corretto: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
 msgid "Checksum errors: "
 msgstr "Errori di checksum: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
 msgid "Unknown sentences: "
 msgstr "Frase sconosciuta "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
 msgid "Zero coordinates: "
 msgstr "Coordinate iniziali "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
 msgid "NMEA import success"
 msgstr "NMEA importato con successo"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
 msgid "NMEA import failure!"
 msgstr "Importazione NMEA non riuscita!"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:85
 #, java-format
 msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr "Preferenza ''''{0}'''' mancante. Impossibile inizializzare OsmApi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr "Questa versione di JOSM non è compatibile con il configurato."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
 #, java-format
 msgid ""
@@ -13222,5 +13056,5 @@
 "le versioni dalla {0} alla {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:169
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
@@ -13229,12 +13063,11 @@
 "protocollo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:256
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
-msgstr ""
-"Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:276
+msgstr "Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:277
 #, java-format
 msgid ""
@@ -13246,5 +13079,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:311
 msgid "Creating changeset..."
-msgstr "Creazione dell'insieme di modifiche..."
+msgstr "Creazione dell''insieme di modifiche..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
@@ -13253,64 +13086,63 @@
 msgstr "Insieme di modifiche {0} aperto con successo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:662
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:661
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
 msgstr "Era atteso un insieme di modifiche con ID > 0. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
 msgid "Updating changeset..."
-msgstr "Aggiornamento dell'insieme di modifiche..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+msgstr "Aggiornamento dell''insieme di modifiche..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "Aggiornamento dell''insieme di modifiche {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Chiusura del gruppo di modifiche..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
 msgid "No changeset present for diff upload."
 msgstr ""
 "Non è presente alcun gruppo di modifiche per il caricamento differenziale"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
 msgid "Preparing upload request..."
 msgstr "Preparazione della richiesta di caricamento..."
 
-#. Upload to the server
-#. 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} objects..."
-msgstr "Caricamento di {0} oggetti..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
+#, fuzzy, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Caricamento di {0} oggetti..."
+msgstr[1] "Caricamento di {0} oggetti..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
 msgid "Waiting 10 seconds ... "
 msgstr "Attesa di 10 secondi ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "Inizio del ripristino {0} di {1} in {2} secondi ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:456
 msgid "OK - trying again."
 msgstr "OK - nuovo tentativo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:538
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:537
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Inizio del ripristino {0} di {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:633
 msgid "Current changeset is null. Cannot upload data."
-msgstr ""
-"Il gruppo di modifiche corrente è nullo. Impossibile caricare i dati."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
+msgstr "Il gruppo di modifiche corrente è nullo. Impossibile caricare i dati."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:635
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
@@ -13319,5 +13151,5 @@
 "{0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:664
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:663
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -13338,10 +13170,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
 msgstr "File compressi bzip2 del server OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30
 msgid "Invalid bz2 file."
 msgstr "File bz2 non valido."
@@ -13365,12 +13197,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:164
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -13445,5 +13277,5 @@
 msgid ""
 "Illegal document structure. Found node, way, or relation outside of "
-"'create', 'modify', or 'delete'."
+"''create'', ''modify'', or ''delete''."
 msgstr ""
 
@@ -13461,15 +13293,14 @@
 msgstr "Analisi del contenuto del gruppo di modifiche ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:129
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:135
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:145
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:151
 #, java-format
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+msgstr "Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:82
 #, java-format
 msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
@@ -13478,5 +13309,5 @@
 "''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:116
 #, java-format
 msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
@@ -13485,17 +13316,17 @@
 "''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "Attributo obbligatorio ''''{0}'''' mancante dell''elemento XML {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #, java-format
 msgid "Unsupported version: {0}"
 msgstr "Versione non supportata: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:177
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
@@ -13504,25 +13335,13 @@
 "ingresso. Annullo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr "Valore non valido per l''attributo ''''uid''''. Ottenuto ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:216
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:217
 msgid "Parsing list of changesets..."
 msgstr "Analisi della lista degli insiemi di modifiche..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
-msgid ""
-"Failed to add an OAuth authentication header. There is currently no OAuth "
-"Access Token configured."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:125
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:136
 #, java-format
 msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
@@ -13535,38 +13354,32 @@
 msgstr "(alla linea {0}, colonna {1})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
 msgid "OSM Server Files"
 msgstr "Server dei File di OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45
-#, java-format
-msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "Era attesa una istanza di OsmDataLayer. Ottenuto ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
 #, java-format
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
-"<html>E'' stato generato un errore durante il salvataggio.<br>L''errore "
-"è:<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
+"<html>E'' stato generato un errore durante il salvataggio.<br>L''errore è:"
+"<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>E'' stato generato un errore durante il ripristino del file della "
 "copia di sicurezza.<br>L''errore è:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-"Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}"
+msgstr "Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
 msgstr "File compressi gzip del server OSM"
@@ -13576,10 +13389,10 @@
 msgstr "Analisi dei dati dello storico OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
 #, java-format
 msgid "File ''{0}'' does not exist."
 msgstr "il file \"{0}\" non esiste"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:112
 #, java-format
 msgid ""
@@ -13590,26 +13403,25 @@
 "con id esterno {1} e con id interno {2}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, java-format
-msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 "Attributi obbligatori mancanti sull''elemento ''''bounds''''. Ottenuto "
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
-"E' stato trovato un elemento XML <nd> non come figlio diretto dell'elemento "
-"<way>."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
+"E'' stato trovato un elemento XML <nd> non come figlio diretto "
+"dell''elemento <way>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
-msgstr ""
-"Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+msgstr "Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
@@ -13618,29 +13430,28 @@
 "{0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
-"E' stato trovato l'elemento XML <member> non come figlio diretto "
-"dell'elemento <relation>."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278
+"E'' stato trovato l''elemento XML <member> non come figlio diretto "
+"dell''elemento <relation>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:280
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Attributo ''''ref'''' mancante sul membro nella relazione {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
-#, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:285
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 "Valore non valido per l''attributo ''''ref'''' sul membro nella relazione "
 "{0}. Ottenuto {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:289
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:292
 #, java-format
 msgid ""
@@ -13650,9 +13461,9 @@
 "relazione {1}. Ottenuto {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:299
 msgid "Incomplete <member> specification with ref=0"
 msgstr "<member> incompleto, specificazione con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
@@ -13661,10 +13472,10 @@
 "ingresso. Omesso."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
 msgid "Illegal object with ID=0."
 msgstr "Oggetto illegale con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:365
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
 #, java-format
 msgid ""
@@ -13676,8 +13487,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:371
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #, java-format
 msgid ""
@@ -13689,10 +13500,10 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:384
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Versione delle API sconosciuta o non supportata. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
@@ -13700,6 +13511,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:420
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:430
 #, java-format
 msgid ""
@@ -13711,16 +13522,16 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:424
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
 msgstr "Valore non valido per l''attributo ''''changeset''''. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Manca l''attributo obbligatorio ''''{0}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
@@ -13728,5 +13539,5 @@
 "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470
 #, java-format
 msgid ""
@@ -13736,5 +13547,5 @@
 "esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -13745,5 +13556,5 @@
 "almeno un nodo nei dati caricati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
 #, java-format
 msgid ""
@@ -13753,5 +13564,5 @@
 "esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546
 #, java-format
 msgid ""
@@ -13762,52 +13573,47 @@
 "con ID esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:594
 msgid "Parsing OSM data..."
 msgstr "Analisi dei dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:599
 msgid "Preparing data set..."
-msgstr "Preparazione dell'insieme di dati..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55
-#, java-format
-msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
+msgstr "Preparazione dell''insieme di dati..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
 msgid "Downloading from OSM Server..."
 msgstr "Scaricamento da server OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
 msgstr "scaricamento dei percorsi collegati ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
 msgid "Downloading referring relations ..."
 msgstr "Scaricamento delle relazioni collegate ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
 msgid "Reading changesets..."
 msgstr "Lettura degli insiemi di modifiche..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:65
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
 msgid "Downloading changesets ..."
 msgstr "Scaricamento degli insiemi di modifiche ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
 #, java-format
 msgid "Reading changeset {0} ..."
 msgstr "Lettura dell''insieme di modifiche {0} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:99
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
 #, java-format
 msgid "Downloading changeset {0} ..."
 msgstr "Scaricamento dell''insieme di modifiche {0} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:129
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130
 #, java-format
 msgid "Downloading {0} changeset ..."
@@ -13816,27 +13622,15 @@
 msgstr[1] "Scaricamento di {0} gruppi di modifiche ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
 msgstr "({0}/{1}) Scaricamento del gruppo di modifiche {2} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:173
-#, java-format
-msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-"Era atteso un valore di tipo intero > 0 per il parametro ''''{0}'''', "
-"ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:184
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
 #, java-format
 msgid "Downloading content for changeset {0} ..."
 msgstr "Scaricamento del contenuto per il gruppo di modifiche {0} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
-#, java-format
-msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
 msgid "Downloading history..."
 msgstr "Scaricamento dello storico..."
@@ -13846,18 +13640,12 @@
 msgstr "Connessione al server in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62
-#, java-format
-msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-msgstr "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}."
-msgstr "E' fallita l'apertura della connessione alle API {0}"
+msgstr "E'' fallita l''apertura della connessione alle API {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86
 msgid ""
-"Couldn't connect to the OSM server. Please check your internet connection."
+"Could not connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Impossibile connettersi al server osm. Controllare la propria connessione ad "
@@ -13890,14 +13678,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79
 msgid "Starting to upload with one request per primitive ..."
 msgstr "Inizio del caricamento con una richiesta per primitiva ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} mancanti. Caricamento nodo ''''{4}'''' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
@@ -13905,5 +13693,5 @@
 "{0}% ({1}/{2}), {3} mancanti. Caricamento percorso ''''{4}'''' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
@@ -13911,23 +13699,25 @@
 "{0}% ({1}/{2}), {3} mancanti. Caricamento relazione ''''{4}'''' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:119
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:121
 msgid "Starting to upload in one request ..."
 msgstr "Inizio del caricamento in una richiesta ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 #, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
 msgstr "Era atteso un valore >0 per il parametro ''''{0}'''', ottenuto {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:143
 msgid "Starting to upload in chunks..."
 msgstr "Inizio del caricamento in raggruppamenti..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156
-#, java-format
-msgid "({0}/{1}) Uploading {2} objects..."
-msgstr "({0}/{1}) Caricamento di {2} oggetti..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:182
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
+#, fuzzy, java-format
+msgid "({0}/{1}) Uploading {2} object..."
+msgid_plural "({0}/{1}) Uploading {2} objects..."
+msgstr[0] "({0}/{1}) Caricamento di {2} oggetti..."
+msgstr[1] "({0}/{1}) Caricamento di {2} oggetti..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
 msgstr "Caricamento dati ..."
@@ -13935,6 +13725,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
-"E' stato trovato un identificativo 0 non atteso per una primitiva osm"
+msgstr "E'' stato trovato un identificativo 0 non atteso per una primitiva osm"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:89
@@ -13958,5 +13747,5 @@
 #, java-format
 msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link isn''t known. "
+"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
 "Skipping download."
 msgstr ""
@@ -13965,5 +13754,5 @@
 #, java-format
 msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' isn''t a "
+"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
 "valid URL. Skipping download."
 msgstr ""
@@ -13983,7 +13772,7 @@
 #, java-format
 msgid "An error occurred in plugin {0}"
-msgstr "E' stato generato un errore dall'estensione {0}"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgstr "E'' stato generato un errore dall''estensione {0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
 msgid "The following plugin is no longer necessary and has been deactivated:"
 msgid_plural ""
@@ -13992,23 +13781,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:133
-#, java-format
-msgid ""
-"<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-"developed and very likely will produce errors.<br>It should be "
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#, fuzzy, java-format
+msgid ""
+"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
+"longer developed and very likely will produce errors.<br>It should be "
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
 "<html>E'' stato richiesto il caricamento dell''estensione {0}.<br>Questa "
-"estensione non è più mantenuta e molto probabilmente produrrà degli "
-"errori.<br>Dovrebbe essere disabilitata.<br>Rimuovere dalle "
-"preferenze?</html>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
-msgid ""
-"<html>You updated your JOSM software.<br>To prevent problems the plugins "
-"should be updated as well.<br><br>Update plugins now?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:170
+"estensione non è più mantenuta e molto probabilmente produrrà degli errori."
+"<br>Dovrebbe essere disabilitata.<br>Rimuovere dalle preferenze?</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
+msgid ""
+"You updated your JOSM software.<br>To prevent problems the plugins should be "
+"updated as well.<br><br>Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
 #, java-format
 msgid "Last plugin update more than {0} days ago."
@@ -14017,48 +13805,60 @@
 "giorni fa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
+#, fuzzy
+msgid "Click to update the activated plugins"
+msgstr "Cliccare per chiudere la finestra"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
 msgid "Skip update"
 msgstr "Salta aggiornamento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:202
-#, java-format
-msgid ""
-"A required plugin for plugin {0} was not found. The required plugin is:"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+msgid "Click to skip updating the activated plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
+#, fuzzy, java-format
+msgid ""
+"Plugin {0} requires a plugin which was not found. The missing plugin is:"
 msgid_plural ""
-"{1} required plugins for plugin {0} were not found. The required plugins are:"
+"Plugin {0} requires {1} plugins which were not found. The missing plugins "
+"are:"
 msgstr[0] ""
+"L''estensione {0} è richiesta dall''estensione {1}, ma non è stata trovata."
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, java-format
-msgid "Plugin {0} requires JOSM update to version {1}."
-msgstr ""
-"L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+"L''estensione {0} è richiesta dall''estensione {1}, ma non è stata trovata."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
+#, java-format
+msgid ""
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
 #, java-format
 msgid "loading plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:330
+msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:345
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14066,5 +13866,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:447
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14072,17 +13872,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:472
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:478
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:480
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524
 msgid "Removing umaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:504
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14090,32 +13890,47 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:514
-msgid ""
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
+msgid ""
+"Please open the Preference Dialog after JOSM has started and try to update "
+"it manually."
+msgid_plural ""
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:519
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:574
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:688
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
 msgid "Disable plugin"
 msgstr "Disabilita estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
+#, fuzzy, java-format
+msgid "Click to delete the plugin ''{0}''"
+msgstr "Elimina la vecchia estensione {0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
 msgid "Keep plugin"
 msgstr "Mantieni estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:637
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724
+#, java-format
+msgid "Click to keep the plugin ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
 #, java-format
 msgid ""
@@ -14124,5 +13939,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:643
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
 #, java-format
 msgid ""
@@ -14131,58 +13946,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:693
-msgid "<html>"
-msgstr "<html>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:694
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
+#, fuzzy, java-format
+msgid "Click to disable the plugin ''{0}''"
+msgstr "Cliccare per chiudere la finestra"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
 #, java-format
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
-"E' stata generata una eccezione inaspettata che probabilmente deriva "
-"dall'estensione ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:697
+"E'' stata generata una eccezione inaspettata che probabilmente deriva "
+"dall''estensione ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
-msgstr "Secondo le informazioni all'interno del plugin l'autore è {0}."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
+msgstr "Secondo le informazioni all''interno del plugin l''autore è {0}."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:737
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
-"Provare ad aggiornare questa estensione all'ultima versione prima di "
+"Provare ad aggiornare questa estensione all''ultima versione prima di "
 "comunicare un bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:702
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
 msgid "Should the plugin be disabled?"
-msgstr "Disabilitare l'estensione?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:714
+msgstr "Disabilitare l''estensione?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
 "unload the plugin."
 msgstr ""
-"L'estensione è stata rimossa dalla configurazione. Riavviare JOSM per "
-"eliminare l'estensione."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:720
-msgid "The plugin could not be removed. Probably it was already disabled"
-msgstr ""
-"L''estensione non può essere rimossa. Probabilmente è stata già disabilitata"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:766
+"L''estensione è stata rimossa dalla configurazione. Riavviare JOSM per "
+"eliminare l''estensione."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:853
 msgid "Plugin information"
 msgstr "Informazioni sull''estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:771
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:858
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:179
 msgid "no description available"
 msgstr "nessuna descrizione disponibile"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
+#, fuzzy
+msgid "Do not check and ask again at startup (remembers choice)"
+msgstr "Non visualizzare nuovamente (ricorda la scelta)"
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, java-format
-msgid "The plugin file ''{0}'' doesn't include a Manifest."
-msgstr ""
+#, fuzzy, java-format
+msgid "The plugin file ''{0}'' does not include a Manifest."
+msgstr "il file \"{0}\" non esiste"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -14214,6 +14030,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119
 #, java-format
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14269,20 +14084,22 @@
 msgstr "Impossibile riprodurre il suono"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56
+#. Then ask for submitting a bug report, for exceptions thrown from a plugin too
+#.
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
 msgid "Do nothing"
 msgstr "Non fare niente"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
 msgid "Report Bug"
 msgstr "Segnala bug"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57
-msgid ""
-"An unexpected exception occurred.\n"
-"\n"
-"This is always a coding error. If you are running the latest\n"
-"version of JOSM, please consider being kind and file a bug report."
-msgstr ""
-"Si è verificata un'eccezione inattesa.\n"
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+#, fuzzy
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Si è verificata un''eccezione inattesa.\n"
 "\n"
 "Questo è sempre un errore di programmazione. Se si sta usando la versione\n"
@@ -14290,9 +14107,9 @@
 "inoltrare un bug report."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid "Unexpected Exception"
 msgstr "Eccezione inattesa"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug reportmake sure "
@@ -14300,5 +14117,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:107
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
 "You should also update your plugins. If neither of those help pleasefile a "
@@ -14306,5 +14123,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:111
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 msgid ""
 "There the error information provided below should already befilled in for "
@@ -14313,37 +14130,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:115
-msgid ""
-"Alternatively, if that doesn't work you can manually fill in the "
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
 "informationbelow at this URL:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:136
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Il testo è stato già copiato nei tuoi appunti)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:151
 msgid "You have encountered a bug in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:22
-#, java-format
-msgid "Expected unique id > 0 for primitive id, got {0}"
-msgstr ""
-"Era atteso un identificativo unico > 0 per la primitiva, ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:27
-#, java-format
-msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-"Era atteso un valore di tipo intero lungo > 0 per il parametro ''''{0}'''', "
-"ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:47
-#, java-format
-msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-msgstr "Era atteso un parametro ''''{0}'''' di tipo nodo, ottenuto ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:41
 #, java-format
 msgid ""
@@ -14351,9 +14150,18 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>Fallita l''inizializzazione della comunicazione con il server OSM "
-"{0}.<br>Controllare l''indirizzo URL del server nelle proprie preferenze e "
-"la propria connessione ad internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
+"<html>Fallita l''inizializzazione della comunicazione con il server OSM {0}."
+"<br>Controllare l''indirizzo URL del server nelle proprie preferenze e la "
+"propria connessione ad internet.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#, java-format
+msgid ""
+"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
+"OAuth to authenticate but currently there is no<br>OAuth Access Token "
+"configured.<br>Please open the Preferences Dialog and generate or enter an "
+"Access Token.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:77
 #, java-format
 msgid ""
@@ -14362,45 +14170,44 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
-"<html><strong>Fallita</strong> l'eliminazione della <strong>relazione "
-"{0}</strong>. E' ancora collegata alla relazione {1}.<br>Caricare la "
-"relazione {1}, rimuovere il riferimento alla relazione {0}, e "
-"riprovare.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
+"<html><strong>Fallita</strong> l''eliminazione della <strong>relazione {0}</"
+"strong>. E'' ancora collegata alla relazione {1}.<br>Caricare la relazione "
+"{1}, rimuovere il riferimento alla relazione {0}, e riprovare.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:104
 #, java-format
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Upload <strong>failed</strong> verso il server poiché il dataset "
 "usato<br>viola una precondizione.<br>Il messaggio di errore é:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
-#, java-format
-msgid ""
-"<html>Authentication at the OSM server with the username ''{0}'' "
-"failed.<br>Please check the username and the password in the JOSM "
-"preferences.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
-#, java-format
-msgid ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
-"token.</html>"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
 #, java-format
 msgid ""
-"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>The token is not authorised to access the protected "
-"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
-"another OAuth token.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:122
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
 #, java-format
 msgid ""
@@ -14408,8 +14215,8 @@
 "already been closed.</html>"
 msgstr ""
-"<html>Fallita la chiusura dell''insieme di modifiche "
-"<strong>{0}</strong><br>perché è stato già chiuso.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
+"<html>Fallita la chiusura dell''insieme di modifiche <strong>{0}</"
+"strong><br>perché è stato già chiuso.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
 #, java-format
 msgid ""
@@ -14417,8 +14224,8 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>Fallita la chiusura dell''insieme di modifiche "
-"<strong>{0}</strong><br>perché è stato già chiuso il {1}.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
+"<html>Fallita la chiusura dell''insieme di modifiche <strong>{0}</"
+"strong><br>perché è stato già chiuso il {1}.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:183
 #, java-format
 msgid ""
@@ -14429,9 +14236,9 @@
 "errore (non tradotto):<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:189
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Il server riporta che è stato trovato un conflitto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
 #, java-format
 msgid ""
@@ -14439,13 +14246,13 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>Fallito il caricamento sul gruppo di modifiche "
-"<strong>{0}</strong><br>perché è stato già chiuso il {1}.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+"<html>Fallito il caricamento sul gruppo di modifiche <strong>{0}</"
+"strong><br>perché è stato già chiuso il {1}.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244
 #, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
 "security reasons. This is most likely because you are running<br>in an "
-"applet and because you didn''t load your applet from ''{1}''.</html>"
+"applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
 "<html>Fallita l''apertura della connessione al server "
@@ -14454,5 +14261,5 @@
 "caricata da ''''{1}''''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
 #, java-format
 msgid ""
@@ -14460,9 +14267,8 @@
 "check your internet connection.</html>"
 msgstr ""
-"<html>Fallita l''apertura della connessione al server "
-"remoto<br>''''{0}''''.<br>Controllare la propria connessione ad "
-"internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+"<html>Fallita l''apertura della connessione al server remoto<br>''''{0}''''."
+"<br>Controllare la propria connessione ad internet.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:277
 #, java-format
 msgid ""
@@ -14471,29 +14277,27 @@
 msgstr ""
 "<html>Fallito il caricamento o lo scaricamento dei dati "
-"da<br>''''{0}''''<br>a causa di un problema con il loro "
-"trasferimento.<br>Dettagli (non tradotti): {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
-#, java-format
-msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server "
-"error.<br>This is most likely a temporary problem. Please try again "
-"later.</html>"
+"da<br>''''{0}''''<br>a causa di un problema con il loro trasferimento."
+"<br>Dettagli (non tradotti): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
 msgstr ""
 "<html>Il server OSM<br>''''{0}''''<br>ha riportato un errore interno al "
-"server.<br>Solitamente questo è un problema temporaneo. Riprovare più "
-"tardi.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
+"server.<br>Solitamente questo è un problema temporaneo. Riprovare più tardi."
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-"Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.<br>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
-msgid ""
-"The area you tried to download is too big or your request was too "
-"large.<br>Either request a smaller area or use an export file provided by "
-"the OSM community."
+msgstr "Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.<br>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:310
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
 msgstr ""
 "La zona che si è tentato di scaricare è troppo estesa oppure la propria "
@@ -14502,16 +14306,16 @@
 "OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Messaggio di errore (non tradotto): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
-#, java-format
-msgid ""
-"The OSM server ''{0}'' doesn''t know about an object<br>you tried to read, "
-"update, or delete. Either the respective object<br>doesn''t exist on the "
-"server or you''re using an invalid URL to access<br>it. Please carefully "
-"check the servers address ''{0}'' for typos."
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
+#, java-format
+msgid ""
+"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
+"update, or delete. Either the respective object<br>does not exist on the "
+"server or you are using an invalid URL to access<br>it. Please carefully "
+"check the server''s address ''{0}'' for typos."
 msgstr ""
 "Il server OSM ''''{0}'''' non è a conoscenza di un oggetto<br>che si è "
@@ -14521,29 +14325,29 @@
 "''''{0}'''' per identificare eventuali errori di battitura."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
 #, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Fallita l''apertura della connessione al server "
-"remoto<br>''''{0}''''.<br>Il nome dell''host ''''{1}'''' non può essere "
-"risolto. <br>Controllare l''indirizzo URL delle API nelle proprie preferenze "
-"e la propria connessione ad internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
+"<html>Fallita l''apertura della connessione al server remoto<br>''''{0}''''."
+"<br>Il nome dell''host ''''{1}'''' non può essere risolto. <br>Controllare "
+"l''indirizzo URL delle API nelle proprie preferenze e la propria connessione "
+"ad internet.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426
 #, java-format
 msgid ""
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 "<html>Il server segnala che un oggetto è stato eliminato.<br><strong>Il "
 "caricamento è fallito</strong> se si è tentato di aggiornare o eliminare "
 "questo oggetto.<br> <strong>Lo scaricamento è fallito</strong> se si è "
-"tentato di scaricare questo oggetto.<br><br>Il messaggio d''errore "
-"è:<br>{0}</html>"
+"tentato di scaricare questo oggetto.<br><br>Il messaggio d''errore è:<br>{0}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:348
@@ -14595,6 +14399,6 @@
 "\n"
 msgstr ""
-"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione ''{1}'' "
-"({2}) è fallita\n"
+"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione "
+"''{1}'' ({2}) è fallita\n"
 "perché la scorciatoia è già impegnata dall''azione ''{3}'' ({4}).\n"
 "\n"
@@ -14619,6 +14423,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
-msgstr ""
-"(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
+msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56
@@ -14644,5 +14447,5 @@
 #, java-format
 msgid ""
-"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
 msgstr ""
@@ -14654,5 +14457,5 @@
 msgid ""
 "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
-"{2}. Can''t restore window geometry from preferences."
+"{2}. Cannot restore window geometry from preferences."
 msgstr ""
 "La preferenza con chiave ''''{0}'''' non fornisce un valore intero per "
@@ -14664,5 +14467,5 @@
 msgid ""
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
-"{2}. Can''t restore window geometry from preferences."
+"{2}. Cannot restore window geometry from preferences."
 msgstr ""
 "Non è stato possibile analizzare il campo ''''{1}'''' nella preferenza con "
@@ -14673,5 +14476,5 @@
 #, java-format
 msgid ""
-"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
 msgstr ""
@@ -14790,6 +14593,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "Upload failed. Server returned the following message: "
-msgstr ""
-"Caricamento fallito. Il server ha risposto con il seguente messaggio: "
+msgstr "Caricamento fallito. Il server ha risposto con il seguente messaggio: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
@@ -14828,5 +14630,5 @@
 #: ../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:2285
+#: build/trans_presets.java:2146
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -14834,9 +14636,9 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 msgid "Handy Address Interpolation Functions"
-msgstr "Funzioni facilitate per l'interpolazione di indirizzo"
+msgstr "Funzioni facilitate per l''interpolazione di indirizzo"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
 msgid "Define Address Interpolation"
-msgstr "Definisci un'interpolazione di indirizzo"
+msgstr "Definisci un''interpolazione di indirizzo"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
@@ -14953,5 +14755,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
 msgid "Expected valid number for address increment"
-msgstr "Era atteso un numero valido per l'incremento dell'indirizzo"
+msgstr "Era atteso un numero valido per l''incremento dell''indirizzo"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
@@ -14961,5 +14763,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
 msgid "Please enter valid number for starting and ending address"
-msgstr "Inserire un numero valido per l'indirizzo iniziale e finale"
+msgstr "Inserire un numero valido per l''indirizzo iniziale e finale"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
@@ -14976,18 +14778,17 @@
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
-"La lettera iniziale dell'indirizzo deve essere minore di quella finale"
+"La lettera iniziale dell''indirizzo deve essere minore di quella finale"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
 msgid "Please enter valid number for starting address"
-msgstr "Inserire un numero valido per l'indirizzo iniziale"
+msgstr "Inserire un numero valido per l''indirizzo iniziale"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
 msgid "Please enter valid number for ending address"
-msgstr "Inserire un numero valido per l'indirizzo finale"
+msgstr "Inserire un numero valido per l''indirizzo finale"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
 msgid "Starting address number must be less than ending address number"
-msgstr ""
-"Il numero iniziale dell'indirizzo deve essere minore di quello finale"
+msgstr "Il numero iniziale dell''indirizzo deve essere minore di quello finale"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
@@ -15096,8 +14897,8 @@
 "Would you like to restore F11 for grab action ?"
 msgstr ""
-"L'estensione cadastre-fr usata tradizionalmente per gestire la scorciatoia "
+"L''estensione cadastre-fr usata tradizionalmente per gestire la scorciatoia "
 "da tastiera F11\n"
 "che è attualmente riservata per la modalità a tutto schermo\n"
-"Si desidera ripristinare F11 per l'azione di cattura ?"
+"Si desidera ripristinare F11 per l''azione di cattura ?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:222
@@ -15136,5 +14937,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
-msgstr "Disabilita il ritaglio dell'immagine durante la georeferenziazione."
+msgstr "Disabilita il ritaglio dell''immagine durante la georeferenziazione."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
@@ -15148,20 +14949,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
-msgstr ""
-"Un gestore speciale del wms francese del catasto all'indirizzo "
-"www.cadastre.gouv.fr<BR><BR>Leggere i Termini e Condizioni d'Uso qui (in "
-"francese): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>prima di effettuare qualsiasi caricamento di dati creati da questa "
-"estensione."
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
+msgstr ""
+"Un gestore speciale del wms francese del catasto all''indirizzo www.cadastre."
+"gouv.fr<BR><BR>Leggere i Termini e Condizioni d''Uso qui (in francese): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>prima di effettuare qualsiasi "
+"caricamento di dati creati da questa estensione."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
@@ -15273,10 +15071,10 @@
 msgstr ""
 "Per evitare un sovraccarico del WMS del catasto,\n"
-"la dimensione massima di importazione dell'edificio è di 1 km2."
+"la dimensione massima di importazione dell''edificio è di 1 km2."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr "Abilitare la sorgente automatica e controllare l'annata del catasto."
+msgstr "Abilitare la sorgente automatica e controllare l''annata del catasto."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
@@ -15464,5 +15262,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "Location"
 msgstr "Posizione"
@@ -15524,5 +15322,5 @@
 "Select one of them first, then retry"
 msgstr ""
-"E' presente più di un livello WMS\n"
+"E'' presente più di un livello WMS\n"
 "Selezionare prima uno di questi, e poi riprovare"
 
@@ -15549,5 +15347,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217
 msgid "Is vectorized."
-msgstr "E' stato vettorializzato"
+msgstr "E'' stato vettorializzato"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:218
@@ -15620,5 +15418,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 msgid "Splits an area by an untagged way."
-msgstr "Divide un'area per mezzo di un percorso senza etichette."
+msgstr "Divide un''area per mezzo di un percorso senza etichette."
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
@@ -15628,25 +15426,25 @@
 "Remove the area from the relation before splitting it."
 msgstr ""
-"L'area selezionata non può essere divisa perché è un membro di qualche "
+"L''area selezionata non può essere divisa perché è un membro di qualche "
 "relazione.\n"
-"Eliminare l'area dalla relazione prima di dividerla."
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34
+"Eliminare l''area dalla relazione prima di dividerla."
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
 msgid "TangoGPS Files (*.log)"
 msgstr "File TangoGPS (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Format errors: "
 msgstr "Errori di formato: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
 msgid "TangoGPS import success"
 msgstr "Importazione TangoGPS corretta"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
 msgid "TangoGPS import failure!"
 msgstr "Importazione TangoGPS fallita!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:66
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
 msgid "TCX Files (*.tcx)"
 msgstr "File TCX (*.tcx)"
@@ -15672,5 +15470,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
 msgid "You must select at least one way."
-msgstr "E' necessario selezionare almeno un percorso."
+msgstr "E'' necessario selezionare almeno un percorso."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
@@ -15779,5 +15577,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
 msgid "refresh the port list"
-msgstr "aggiorna l'elenco delle porte"
+msgstr "aggiorna l''elenco delle porte"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
@@ -15799,5 +15597,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
 msgid "delete data after import"
-msgstr "elimina i dati dopo l'importazione"
+msgstr "elimina i dati dopo l''importazione"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:44
@@ -15811,5 +15609,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:63
 msgid "Error deleting data."
-msgstr "Errore nell'eliminazione dei dati."
+msgstr "Errore nell''eliminazione dei dati."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:69
@@ -15833,5 +15631,5 @@
 msgstr ""
 "Impossibile caricare la libreria rxtxSerial. Se si ha bisogno di aiuto per "
-"installarla consultare la pagina Globalsat all'indirizzo http://www.raphael-"
+"installarla consultare la pagina Globalsat all''indirizzo http://www.raphael-"
 "mack.de/josm-globalsat-gpx-import-plugin/"
 
@@ -15851,5 +15649,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:192
 msgid "Grid origin location"
-msgstr "Posizione dell'origine della griglia"
+msgstr "Posizione dell''origine della griglia"
 
 #: ../plugins/grid/src/grid/GridLayer.java:197
@@ -15903,5 +15701,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
 msgid "Rotate image left"
-msgstr "Ruota l'immagine a sinistra"
+msgstr "Ruota l''immagine a sinistra"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
@@ -15911,5 +15709,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
 msgid "Rotate image right"
-msgstr "Ruota l'immagine a destra"
+msgstr "Ruota l''immagine a destra"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
@@ -15940,9 +15738,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
 msgid "Direction index '{0}' not found"
-msgstr "Indice di direzione '{0}' non trovato"
+msgstr "Indice di direzione ''{0}'' non trovato"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
 msgid "The starting location was not within the bbox"
-msgstr "La posizione iniziale non è all'interno del riquadro di selezione"
+msgstr "La posizione iniziale non è all''interno del riquadro di selezione"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
@@ -15979,5 +15777,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -15999,5 +15797,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
 msgid "An unknown error has occurred"
-msgstr "E' stato generato un errore sconosciuto"
+msgstr "E'' stato generato un errore sconosciuto"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
@@ -16039,7 +15837,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16049,5 +15847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16057,5 +15855,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
+#. <rule>
+#. <condition k="waterway" v="ditch"/>
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="waterway" v="drain"/>
@@ -16064,5 +15869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16072,12 +15877,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2337 build/trans_style.java:993
+#: build/trans_presets.java:2198 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
-#: build/trans_style.java:3461 build/trans_style.java:3469
+#: build/trans_style.java:1033 build/trans_style.java:3492
+#: build/trans_style.java:3500
 msgid "water"
 msgstr "acqua"
@@ -16148,6 +15954,5 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Numero massimo di segmenti permesso per ogni percorso generato. Predefinito "
@@ -16168,11 +15973,10 @@
 msgstr ""
 "Valore massimo del livello di grigio da accettare come acqua (basato sui "
-"dati Landsat IR-1). Può essere nell'intervallo 0-255. Predefinito 90."
+"dati Landsat IR-1). Può essere nell''intervallo 0-255. Predefinito 90."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
 "Accuratezza della semplificazione lineare di Douglas-Peucker, misurata in "
@@ -16229,10 +16033,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr ""
-"Una estensione per tracciare le superfici acquee su immagini Landsat."
+msgstr "Una estensione per tracciare le superfici acquee su immagini Landsat."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
-msgstr "Preferenze dell'estensione Lakewalker"
+msgstr "Preferenze dell''estensione Lakewalker"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
@@ -16242,5 +16045,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
 msgid "Could not acquire image"
-msgstr "Impossibile acquisire l'immagine"
+msgstr "Impossibile acquisire l''immagine"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125
@@ -16458,7 +16261,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>L'estensione openstreetbugs sta utilizzando il vecchio server "
-"appspot.com.<br>E' disponibile un nuovo server su schokokeks.org.<br>Si "
-"vuole migrare al nuovo server? (Fortemente consigliato)</html>"
+"<html>L''estensione openstreetbugs sta utilizzando il vecchio server appspot."
+"com.<br>E'' disponibile un nuovo server su schokokeks.org.<br>Si vuole "
+"migrare al nuovo server? (Fortemente consigliato)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
@@ -16472,6 +16275,6 @@
 msgstr ""
 "<html>I dati selezionati contengono riferimenti provenienti da "
-"OpenStreetBugs.<br>Non si possono caricare questi dati. E' possibile che sia "
-"stato selezionato un livello sbagliato?"
+"OpenStreetBugs.<br>Non si possono caricare questi dati. E'' possibile che "
+"sia stato selezionato un livello sbagliato?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -16486,8 +16289,7 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"L'intestazione contiene troppi valori e non è possibile mapparla su una "
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr ""
+"L''intestazione contiene troppi valori e non è possibile mapparla su una "
 "singola stringa"
 
@@ -16514,5 +16316,5 @@
 "OpenStreetBugs"
 msgstr ""
-"L'area visibile è troppo piccola o troppo estesa per poter scaricare i dati "
+"L''area visibile è troppo piccola o troppo estesa per poter scaricare i dati "
 "da OpenStreetBugs"
 
@@ -16601,6 +16403,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid ""
-"You have unsaved changes in your queue. Do you want to submit them now?"
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16637,5 +16438,5 @@
 "the preferences."
 msgstr ""
-"Firefox non è stato trovato. Specificare l'eseguibile firefox nella pagina "
+"Firefox non è stato trovato. Specificare l''eseguibile firefox nella pagina "
 "delle impostazioni della mappa nelle preferenze."
 
@@ -16680,5 +16481,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
-msgstr "Preferenze per l'estensione di controllo remoto."
+msgstr "Preferenze per l''estensione di controllo remoto."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
@@ -16688,7 +16489,7 @@
 "talking to the plugin."
 msgstr ""
-"L'estensione di controllo remoto si metterà sempre in ascolto sulla porta "
+"L''estensione di controllo remoto si metterà sempre in ascolto sulla porta "
 "8111 sulla macchina locale. La porta non è variabile perché è usata dalle "
-"applicazioni esterne che devono dialogare con l'estensione."
+"applicazioni esterne che devono dialogare con l''estensione."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
@@ -16715,5 +16516,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247
 msgid "Confirm Remote Control action"
-msgstr "Conferma l'azione del controllo remoto"
+msgstr "Conferma l''azione del controllo remoto"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232
@@ -16724,5 +16525,5 @@
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
-"Il controllo remoto ha richiesto l'importazione dei dati dal seguente "
+"Il controllo remoto ha richiesto l''importazione dei dati dal seguente "
 "indirizzo URL:"
 
@@ -16748,6 +16549,5 @@
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-"Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''"
+msgstr "Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:72
@@ -16782,5 +16582,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Apri un elenco dei nodi dell'itinerario"
+msgstr "Apri un elenco dei nodi dell''itinerario"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
@@ -16806,5 +16606,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
-msgstr "Cancella l'itinerario"
+msgstr "Cancella l''itinerario"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
@@ -16854,9 +16654,9 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
 msgid "Increase zoom"
-msgstr "Aumenta l'ingrandimento"
+msgstr "Aumenta l''ingrandimento"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
 msgid "Decrease zoom"
-msgstr "Diminuisci l'ingrandimento"
+msgstr "Diminuisci l''ingrandimento"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
@@ -16887,5 +16687,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
-msgstr "Impostazioni per l'estensione SlippyMap"
+msgstr "Impostazioni per l''estensione SlippyMap"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
@@ -16935,10 +16735,10 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr "Tasto di scelta rapida '{0}' duplicato - sarà ignorato!"
+msgstr "Tasto di scelta rapida ''{0}'' duplicato - sarà ignorato!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:40
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
 msgstr ""
-"L'estensione Surveyor ha bisogno dell'estensione LiveGps, ma non è stata "
+"L''estensione Surveyor ha bisogno dell''estensione LiveGps, ma non è stata "
 "trovata!"
 
@@ -17041,5 +16841,5 @@
 msgstr ""
 "Apre lo strumento di verifica delle preimpostazioni delle etichette per "
-"vedere l'anteprima dei dialoghi delle preimpostazioni delle etichette."
+"vedere l''anteprima dei dialoghi delle preimpostazioni delle etichette."
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
@@ -17072,5 +16872,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
 msgid "Housenumbers do not match odd/even setting"
-msgstr "I numeri civici non corrispondono all'impostazione pari/dispari"
+msgstr "I numeri civici non corrispondono all''impostazione pari/dispari"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
@@ -17133,10 +16933,9 @@
 msgstr "Nessun errore individuato"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168
 msgid "Grid"
 msgstr "Griglia"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
 #, java-format
 msgid ""
@@ -17153,5 +16952,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
-msgstr "Usa l'elenco degli avvertimenti da ignorare per non visualizzarli."
+msgstr "Usa l''elenco degli avvertimenti da ignorare per non visualizzarli."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
@@ -17226,23 +17025,23 @@
 msgstr "Esecuzione controllo {0}"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Convalida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
 msgid "Performs the data validation"
 msgstr "Esegue la convalida dei dati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:120
 msgid "Validating"
 msgstr "Validazione"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:161
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
 msgstr "Controllo {0}/{1}: Inizio {2}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:170
 msgid "Updating ignored errors ..."
 msgstr "Aggiornamento degli errori ignorati ..."
@@ -17309,4 +17108,11 @@
 msgid "Replace \"{0}\" by \"{1}\" for"
 msgstr "Sostituisci \"{0}\" con \"{1}\" per"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "oggetto"
+msgstr[1] "oggetti"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
@@ -17360,4 +17166,14 @@
 "Questo controllo verifica che non ci siano due nodi nella stessa posizione."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+"Stai per cancellare dei nodi fuori dall''area scaricata.<br>Questo potrebbe "
+"causare dei problemi poiché i nodi potrebbero far parte di altri oggetti "
+"(che non puoi vedere).<br>Vuoi veramente cancellarli?"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
 msgid "Confirmation"
@@ -17399,5 +17215,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3017
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -17441,7 +17257,7 @@
 "Italia - Italien - Italy."
 msgstr ""
-"Questo controllo trova gli oggetti  in più lingue il cui attributo 'name' "
-"non sia identico a qualche attributo 'name:*' e non sia una composizione di "
-"attributi 'name:*', es., Italia - Italien - Italy."
+"Questo controllo trova gli oggetti  in più lingue il cui attributo ''name'' "
+"non sia identico a qualche attributo ''name:*'' e non sia una composizione "
+"di attributi ''name:*'', es., Italia - Italien - Italy."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:46
@@ -17526,5 +17342,5 @@
 msgstr ""
 "Questo controllo verifica se esistono percorsi con nomi simili che possano "
-"essere errori d'ortografia."
+"essere errori d''ortografia."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
@@ -17538,15 +17354,15 @@
 "proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Linea TagChecker non valida - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Linea di correzione ortografica non valida: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307
 #, java-format
 msgid ""
@@ -17557,7 +17373,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:428
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
 msgid "Illegal tag/value combinations"
 msgstr "Combinazione illegale etichetta/valore"
@@ -17565,43 +17381,43 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:453
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
 msgid "Painting problem"
 msgstr "Problema di disegno"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:463
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Chiave ''{0}'' non valida."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
 msgid "Tags with empty values"
 msgstr "Tag con valori vuoti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
 msgid "Invalid property key"
 msgstr "chiave della proprietà non valida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid "Invalid white space in property key"
 msgstr "spazio non valido nella chiave della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
 msgid "Property values start or end with white space"
 msgstr "Il valore della proprietà inizia o finisce con uno spazio"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
 msgid "Property values contain HTML entity"
 msgstr "Il valore della proprietà contiene una entità HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Chiave ''''{0}'''' non presente nei preimpostati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
 msgid "Presets do not contain property key"
 msgstr "I preimpostati non contengono la chiave della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
@@ -17609,17 +17425,17 @@
 "Valore ''''{0}'''' per la chiave ''''{1}'''' non presente nei preimpostati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
 msgid "Presets do not contain property value"
 msgstr "I preimpostati non contengono il valore della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:555
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
 msgid "FIXMES"
 msgstr "FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Check property keys."
 msgstr "Verifica le chiavi delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -17627,52 +17443,51 @@
 "valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
 msgid "Use complex property checker."
 msgstr "Usa un analizzatore delle proprietà complesso."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valida i valori delle proprietà e delle etichette usando regole complesse."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:632
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
 msgid "TagChecker source"
 msgstr "Sorgente TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:695
-msgid ""
-"The sources (URL or filename) of spell check (see "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
-"data files."
-msgstr ""
-"Sorgente (URL o nome del file) del controllo ortografico (vedi "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) o file dati per il "
-"controllo delle etichette."
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+msgid ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"Sorgente (URL o nome del file) del controllo ortografico (vedi http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller) o file dati per il controllo "
+"delle etichette."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "Add a new source to the list."
 msgstr "Aggiungi una nuova sorgente alla lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
 msgid "Edit the selected source."
 msgstr "Modifica la sorgente selezionata."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid "Delete the selected source from the list."
 msgstr "Elimina la sorgente selezionata nella lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Data sources"
 msgstr "Sorgenti dei dati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check property values."
 msgstr "Verifica i valori delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -17680,65 +17495,66 @@
 "validi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for FIXMES."
 msgstr "Cerca FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
-"Cerca i nodi o i percorsi con FIXME presente all'interno dei valori delle "
+"Cerca i nodi o i percorsi con FIXME presente all''interno dei valori delle "
 "proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Check for paint notes."
 msgstr "Controllare le note di disegno."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Check if map painting found data errors."
 msgstr "Controllare se il disegno della mappa contiene degli errori."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default data file."
 msgstr "Usa file dati predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default data file (recommended)."
 msgstr "Usa il file dati predefinito (consigliato)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use default tag ignore file."
-msgstr "Utilizza il file di \"ignoramento\" dell'etichetta predefinita"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+msgstr "Utilizza il file di \"ignoramento\" dell''etichetta predefinita"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
-"Utilizza il file di \"ignoramento\" dell'etichetta predefinita (consigliato)."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
+"Utilizza il file di \"ignoramento\" dell''etichetta predefinita "
+"(consigliato)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use default spellcheck file."
 msgstr "Usa file di controllo ortografico predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Usa il file di controllo ortografico predefinito (consigliato)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:847
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
 msgid "Fix properties"
 msgstr "Correggi proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:968
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
 msgid "Could not find element type"
 msgstr "Impossibile trovare il tipo di elemento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
 msgid "Could not find warning level"
 msgstr "Impossibile trovare il livello di avvertimento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:994
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Espressione illegale \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17797,5 +17613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -17803,5 +17619,5 @@
 #. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -17811,5 +17627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -17818,5 +17634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -17825,5 +17641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -17832,5 +17648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -17839,5 +17655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -17846,14 +17662,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4261
+#: build/trans_style.java:4292
 msgid "building"
 msgstr "building"
@@ -17863,9 +17679,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4268
+#: build/trans_style.java:4299
 msgid "area"
 msgstr "area"
@@ -17882,5 +17698,5 @@
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
-"Questo controllo verifica se una via finisce molto vicina ad un'altra via."
+"Questo controllo verifica se una via finisce molto vicina ad un''altra via."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
@@ -17898,5 +17714,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
-msgstr "Nodo finale della strada collegata vicino ad un'altra strada"
+msgstr "Nodo finale della strada collegata vicino ad un''altra strada"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
@@ -17948,6 +17764,6 @@
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
-"Questo controllo analizza la direzione dei corsi d'acqua, della terraferma e "
-"delle linee di costa."
+"Questo controllo analizza la direzione dei corsi d''acqua, della terraferma "
+"e delle linee di costa."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
@@ -18022,12 +17838,12 @@
 msgstr ""
 "<html>Non è stato selezionato né un nodo né un percorso con un punto "
-"terminale esterno<br>all'attuale zona di scarico.<br>Prima selezionare un "
-"nodo all'inizio o alla fine di un percorso oppure un intero percorso.</html>"
+"terminale esterno<br>all''attuale zona di scarico.<br>Prima selezionare un "
+"nodo all''inizio o alla fine di un percorso oppure un intero percorso.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:107
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
-"<html>Impossibile trovare un nodo unico da cui iniziare lo "
-"scaricamento.</html>"
+"<html>Impossibile trovare un nodo unico da cui iniziare lo scaricamento.</"
+"html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
@@ -18076,5 +17892,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr "E' stata generata una eccezione"
+msgstr "E'' stata generata una eccezione"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
@@ -18114,5 +17930,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145
 msgid "WMS URL or Image ID:"
-msgstr "Indirizzo URL WMS o ID dell'immagine:"
+msgstr "Indirizzo URL WMS o ID dell''immagine:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149
@@ -18127,5 +17943,5 @@
 msgstr ""
 "Non è possibile far corrispondere il collegamento inserito o "
-"l'identificativo al servizio selezionato. Si prega di riprovare."
+"l''identificativo al servizio selezionato. Si prega di riprovare."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:202
@@ -18151,5 +17967,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
 msgid "There are currently no WMS layer to adjust."
-msgstr "Non c'è al momento alcun livello WMS da regolare."
+msgstr "Non c''è al momento alcun livello WMS da regolare."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
@@ -18240,6 +18056,6 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
-"L'area richiesta è troppo grande. Si prega di ingrandire un poco la visuale, "
-"oppure di cambiare la risoluzione"
+"L''area richiesta è troppo grande. Si prega di ingrandire un poco la "
+"visuale, oppure di cambiare la risoluzione"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
@@ -18302,10 +18118,10 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
 msgid "WMS Plugin Preferences"
-msgstr "Preferenze dell'estensione WMS"
+msgstr "Preferenze dell''estensione WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
-"Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS"
+"Modifica la lista dei server WMS mostrata nel menù dell''estensione WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
@@ -18363,5 +18179,5 @@
 #. This file can be used to add some special messages to the translation,
 #. which are not part of the programm texts, but should be translated nevertheless.
-#. 
+#.
 #: build/specialmessages.java:6
 msgid ""
@@ -18390,5 +18206,5 @@
 #: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
-msgstr "non è possibile acquisire il flusso sonoro dall'URL di ingresso"
+msgstr "non è possibile acquisire il flusso sonoro dall''URL di ingresso"
 
 #. Java message loading audio data
@@ -18429,10 +18245,10 @@
 "true :-)"
 msgstr ""
-"Permette all'utente di creare schemi cromatici differenti e di passare da "
-"uno all'altro. E' sufficiente cambiare i colori e creare un nuovo schema. E' "
-"usato per passare su uno sfondo bianco con colori abbinati in modo da "
+"Permette all''utente di creare schemi cromatici differenti e di passare da "
+"uno all''altro. E'' sufficiente cambiare i colori e creare un nuovo schema. "
+"E'' usato per passare su uno sfondo bianco con colori abbinati in modo da "
 "rendere la visualizzazione migliore sotto la luce del sole. Vedere la "
-"schermata tra le preferenze di JOSM e le 'Impostazioni della mappa' (strano "
-"ma vero :-)"
+"schermata tra le preferenze di JOSM e le ''Impostazioni della "
+"mappa'' (strano ma vero :-)"
 
 #. Plugin Create_grid_of_ways
@@ -18446,5 +18262,5 @@
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
-"Creazione e gestione degli indirizzi di nodi ed edifici all'interno della "
+"Creazione e gestione degli indirizzi di nodi ed edifici all''interno della "
 "Repubblica Ceca."
 
@@ -18453,5 +18269,5 @@
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
-"Permette l'importazione di file di vario formato direttamente in JOSM."
+"Permette l''importazione di file di vario formato direttamente in JOSM."
 
 #. Plugin DirectUpload
@@ -18475,11 +18291,10 @@
 "very fast."
 msgstr ""
-"Permette all'utente di rendere anonime le marcature temporali ed eliminare "
+"Permette all''utente di rendere anonime le marcature temporali ed eliminare "
 "velocemente parti di tracciati GPX di grandi dimensioni."
 
 #. Plugin globalsat
 #: build/trans_plugins.java:21
-msgid ""
-"Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 "Scarica direttamente in JOSM i punti GPS dal registratore di dati Globalsat "
@@ -18504,8 +18319,8 @@
 "the filename of an image."
 msgstr ""
-"Un'altra estensione per la correlazione delle immagini ai punti del "
+"Un''altra estensione per la correlazione delle immagini ai punti del "
 "tracciato presenti in un file GPX. Una correlazione avviene quando "
-"l'attributo 'name', 'cmt' oppure 'desc' di una etichetta di un punto del "
-"percorso corrisponde al nome del file di un'immagine."
+"l''attributo ''name'', ''cmt'' oppure ''desc'' di una etichetta di un punto "
+"del percorso corrisponde al nome del file di un''immagine."
 
 #. Plugin lakewalker
@@ -18519,5 +18334,5 @@
 "Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
-"Supporta l'ingresso GPS in tempo reale (punto mobile) attraverso una "
+"Supporta l''ingresso GPS in tempo reale (punto mobile) attraverso una "
 "connessione al server gpsd."
 
@@ -18530,5 +18345,5 @@
 msgstr ""
 "Fornisce una finestra di misurazione e un livello per misurare le lunghezze "
-"e gli angoli dei segmenti, nonché l'area inclusa da un percorso chiuso "
+"e gli angoli dei segmenti, nonché l''area inclusa da un percorso chiuso "
 "(semplice), e crea dei percorsi di misurazione (che possono essere importati "
 "da un livello gps)."
@@ -18555,5 +18370,5 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
-"Simula un click quando si effettua un piccolo e breve trascinamento. E' "
+"Simula un click quando si effettua un piccolo e breve trascinamento. E'' "
 "utile per le penne dei tablet, quando si hanno dei problemi semplicemente "
 "cliccando il tablet senza lo spostamento del mouse (in generale un problema "
@@ -18575,5 +18390,5 @@
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
-"Permette l'apertura di file gpx/osm che intersecano l'area di schermo "
+"Permette l''apertura di file gpx/osm che intersecano l''area di schermo "
 "visualizzata correntemente"
 
@@ -18593,5 +18408,5 @@
 msgstr ""
 "Questa estensione permette di visualizzare una qualsiasi immagine come "
-"sfondo dell'editor e allinearla con la mappa."
+"sfondo dell''editor e allinearla con la mappa."
 
 #. Plugin plastic_laf
@@ -18612,5 +18427,5 @@
 msgstr ""
 "Renderizza i percorsi (bus, scalata, bicicletta, etc...). I tipi di percorso "
-"devono essere definiti all'interno del file routes.xml nella directory dei "
+"devono essere definiti all''interno del file routes.xml nella directory dei "
 "plugin"
 
@@ -18632,10 +18447,10 @@
 #: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr "Permetti l'aggiunta di marcatori/nodi alle posizioni gps correnti."
+msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
 #: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr "Fornisce un'interfaccia per l'editing dei tag in forma tabulare"
+msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare"
 
 #. Plugin tagging-preset-tester
@@ -18663,5 +18478,5 @@
 msgstr ""
 "Un validatore di dati OSM. Controlla se sono presenti dei problemi "
-"all'interno dei dati, è fornisce delle soluzioni per quelli più comuni. "
+"all''interno dei dati, è fornisce delle soluzioni per quelli più comuni. "
 "Correttore ortografico integrato per i nomi delle etichette."
 
@@ -18692,5 +18507,5 @@
 #. <!--
 #. Pics have been derived from
-#. http://commons.wikipedia.org (german street sign SVGs)
+#. http://de.wikipedia.org/wiki/Bildtafel_der_Verkehrszeichen_in_Deutschland (german street sign SVGs)
 #. http://commons.wikimedia.org/wiki/Image:National_Park_Service_sample_pictographs.svg (various monochrome pictograms)
 #. http://www.kde.org
@@ -18797,6 +18612,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1560 build/trans_presets.java:2389
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:1421 build/trans_presets.java:2250
+#: build/trans_presets.java:3053
 msgid "Reference"
 msgstr "Riferimento"
@@ -18813,5 +18628,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:370
+#: build/trans_presets.java:193 build/trans_presets.java:388
 msgid "Lanes"
 msgstr "Corsie"
@@ -18828,15 +18643,15 @@
 #. item "Highways/Streets/Bridge" combo "Layer"
 #. item "Highways/Streets/Tunnel" combo "Layer"
+#. item "Ways/Path" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:292
-#: build/trans_presets.java:325 build/trans_presets.java:346
-#: build/trans_presets.java:385 build/trans_presets.java:400
-#: build/trans_presets.java:424 build/trans_presets.java:443
-#: build/trans_presets.java:464 build/trans_presets.java:484
-#: build/trans_presets.java:522 build/trans_presets.java:678
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:236 build/trans_presets.java:310
+#: build/trans_presets.java:343 build/trans_presets.java:364
+#: build/trans_presets.java:403 build/trans_presets.java:418
+#: build/trans_presets.java:442 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:597
+#: build/trans_presets.java:617 build/trans_presets.java:1182
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
@@ -18855,4 +18670,6 @@
 #. item "Highways/Streets/Living Street" text "Name"
 #. <optional>
+#. item "Highways/Streets/Pedestrian" text "Name"
+#. <optional>
 #. item "Highways/Streets/Service" text "Name"
 #. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
@@ -18865,11 +18682,12 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. item "Ways/Construction" text "Name"
-#. item "Ways/Bridleway" text "Name"
-#. item "Ways/Cycleway" text "Name"
-#. item "Ways/Footway" text "Name"
-#. item "Ways/Pedestrian" text "Name"
-#. <optional>
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. 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 "Ways/Path" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -18878,11 +18696,13 @@
 #: build/trans_presets.java:195 build/trans_presets.java:214
 #: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:285
-#: build/trans_presets.java:305 build/trans_presets.java:318
-#: build/trans_presets.java:332 build/trans_presets.java:364
-#: build/trans_presets.java:416 build/trans_presets.java:436
-#: build/trans_presets.java:456 build/trans_presets.java:476
-#: build/trans_presets.java:496 build/trans_presets.java:515
-#: build/trans_presets.java:671 build/trans_presets.java:1314
+#: build/trans_presets.java:266 build/trans_presets.java:284
+#: build/trans_presets.java:303 build/trans_presets.java:323
+#: build/trans_presets.java:336 build/trans_presets.java:350
+#: build/trans_presets.java:382 build/trans_presets.java:434
+#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:506 build/trans_presets.java:526
+#: build/trans_presets.java:549 build/trans_presets.java:571
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:1175
 msgid "Oneway"
 msgstr "Senso unico"
@@ -18899,4 +18719,5 @@
 #. 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"
@@ -18905,16 +18726,12 @@
 #. </optional>
 #. item "Ways/Construction" check "Oneway"
-#. item "Ways/Bridleway" check "Oneway"
-#. item "Ways/Cycleway" check "Oneway"
-#. item "Ways/Footway" check "Oneway"
-#. item "Ways/Pedestrian" check "Oneway"
+#. item "Ways/Track" text "Name"
+#. item "Ways/Path" text "Name"
+#. 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/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Track Grade 1" text "Name"
-#. item "Ways/Track Grade 2" text "Name"
-#. item "Ways/Track Grade 3" text "Name"
-#. item "Ways/Track Grade 4" text "Name"
-#. item "Ways/Track Grade 5" text "Name"
-#. item "Ways/Path" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
 #. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
@@ -18929,14 +18746,13 @@
 #: build/trans_presets.java:196 build/trans_presets.java:215
 #: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:286
-#: build/trans_presets.java:319 build/trans_presets.java:365
-#: build/trans_presets.java:374 build/trans_presets.java:417
-#: build/trans_presets.java:437 build/trans_presets.java:457
-#: build/trans_presets.java:477 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:535
-#: build/trans_presets.java:556 build/trans_presets.java:577
-#: build/trans_presets.java:598 build/trans_presets.java:619
-#: build/trans_presets.java:640 build/trans_presets.java:672
-#: build/trans_presets.java:1315 build/trans_surveyor.java:12
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:337
+#: build/trans_presets.java:383 build/trans_presets.java:392
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Ponte"
@@ -18953,4 +18769,5 @@
 #. item "Highways/Streets/Residential" check "Bridge"
 #. item "Highways/Streets/Living Street" check "Bridge"
+#. item "Highways/Streets/Pedestrian" check "Bridge"
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
@@ -18959,16 +18776,12 @@
 #. </optional>
 #. item "Ways/Construction" check "Bridge"
-#. item "Ways/Bridleway" check "Bridge"
-#. item "Ways/Cycleway" check "Bridge"
-#. item "Ways/Footway" check "Bridge"
-#. item "Ways/Pedestrian" check "Bridge"
+#. item "Ways/Track" check "Bridge"
+#. item "Ways/Path" check "Bridge"
+#. item "Ways/Dedicated Bridleway" check "Bridge"
+#. item "Ways/Dedicated Cycleway" check "Bridge"
+#. item "Ways/Segregated Foot- and Cycleway" check "Bridge"
+#. item "Ways/Combined Foot- and Cycleway" check "Bridge"
+#. item "Ways/Dedicated Footway" check "Bridge"
 #. item "Ways/Steps" check "Bridge"
-#. item "Ways/Track" check "Bridge"
-#. item "Ways/Track Grade 1" check "Bridge"
-#. item "Ways/Track Grade 2" check "Bridge"
-#. item "Ways/Track Grade 3" check "Bridge"
-#. item "Ways/Track Grade 4" check "Bridge"
-#. item "Ways/Track Grade 5" check "Bridge"
-#. item "Ways/Path" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
 #: build/trans_presets.java:84 build/trans_presets.java:101
@@ -18977,14 +18790,12 @@
 #: build/trans_presets.java:197 build/trans_presets.java:216
 #: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:287
-#: build/trans_presets.java:320 build/trans_presets.java:366
-#: build/trans_presets.java:390 build/trans_presets.java:418
-#: build/trans_presets.java:438 build/trans_presets.java:458
-#: build/trans_presets.java:478 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:536
-#: build/trans_presets.java:557 build/trans_presets.java:578
-#: build/trans_presets.java:599 build/trans_presets.java:620
-#: build/trans_presets.java:641 build/trans_presets.java:673
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:384 build/trans_presets.java:408
+#: build/trans_presets.java:436 build/trans_presets.java:455
+#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:528 build/trans_presets.java:551
+#: build/trans_presets.java:573 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:1177
 msgid "Tunnel"
 msgstr "Galleria/tunnel"
@@ -19001,20 +18812,17 @@
 #. item "Highways/Streets/Residential" check "Tunnel"
 #. item "Highways/Streets/Living Street" check "Tunnel"
+#. item "Highways/Streets/Pedestrian" check "Tunnel"
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
 #. item "Ways/Construction" check "Tunnel"
-#. item "Ways/Bridleway" check "Tunnel"
-#. item "Ways/Cycleway" check "Tunnel"
-#. item "Ways/Footway" check "Tunnel"
-#. item "Ways/Pedestrian" check "Tunnel"
+#. item "Ways/Track" check "Tunnel"
+#. item "Ways/Path" check "Tunnel"
+#. item "Ways/Dedicated Bridleway" check "Tunnel"
+#. item "Ways/Dedicated Cycleway" check "Tunnel"
+#. item "Ways/Segregated Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Combined Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Dedicated Footway" check "Tunnel"
 #. item "Ways/Steps" check "Tunnel"
-#. item "Ways/Track" check "Tunnel"
-#. item "Ways/Track Grade 1" check "Tunnel"
-#. item "Ways/Track Grade 2" check "Tunnel"
-#. item "Ways/Track Grade 3" check "Tunnel"
-#. item "Ways/Track Grade 4" check "Tunnel"
-#. item "Ways/Track Grade 5" check "Tunnel"
-#. item "Ways/Path" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
 #: build/trans_presets.java:85 build/trans_presets.java:102
@@ -19023,13 +18831,12 @@
 #: build/trans_presets.java:198 build/trans_presets.java:217
 #: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:288
-#: build/trans_presets.java:321 build/trans_presets.java:367
-#: build/trans_presets.java:419 build/trans_presets.java:439
-#: build/trans_presets.java:459 build/trans_presets.java:479
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:558
-#: build/trans_presets.java:579 build/trans_presets.java:600
-#: build/trans_presets.java:621 build/trans_presets.java:642
-#: build/trans_presets.java:674 build/trans_presets.java:1317
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:385 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:509 build/trans_presets.java:529
+#: build/trans_presets.java:552 build/trans_presets.java:574
+#: build/trans_presets.java:592 build/trans_presets.java:613
+#: build/trans_presets.java:1178
 msgid "Cutting"
 msgstr "Sbancamento"
@@ -19046,20 +18853,17 @@
 #. item "Highways/Streets/Residential" check "Cutting"
 #. item "Highways/Streets/Living Street" check "Cutting"
+#. item "Highways/Streets/Pedestrian" check "Cutting"
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
 #. item "Ways/Construction" check "Cutting"
-#. item "Ways/Bridleway" check "Cutting"
-#. item "Ways/Cycleway" check "Cutting"
-#. item "Ways/Footway" check "Cutting"
-#. item "Ways/Pedestrian" check "Cutting"
+#. item "Ways/Track" check "Cutting"
+#. item "Ways/Path" check "Cutting"
+#. item "Ways/Dedicated Bridleway" check "Cutting"
+#. item "Ways/Dedicated Cycleway" check "Cutting"
+#. item "Ways/Segregated Foot- and Cycleway" check "Cutting"
+#. item "Ways/Combined Foot- and Cycleway" check "Cutting"
+#. item "Ways/Dedicated Footway" check "Cutting"
 #. item "Ways/Steps" check "Cutting"
-#. item "Ways/Track" check "Cutting"
-#. item "Ways/Track Grade 1" check "Cutting"
-#. item "Ways/Track Grade 2" check "Cutting"
-#. item "Ways/Track Grade 3" check "Cutting"
-#. item "Ways/Track Grade 4" check "Cutting"
-#. item "Ways/Track Grade 5" check "Cutting"
-#. item "Ways/Path" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
 #: build/trans_presets.java:86 build/trans_presets.java:103
@@ -19068,13 +18872,12 @@
 #: build/trans_presets.java:199 build/trans_presets.java:218
 #: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:289
-#: build/trans_presets.java:322 build/trans_presets.java:368
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:460 build/trans_presets.java:480
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:643
-#: build/trans_presets.java:675 build/trans_presets.java:1318
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:386 build/trans_presets.java:438
+#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:510 build/trans_presets.java:530
+#: build/trans_presets.java:553 build/trans_presets.java:575
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:1179
 msgid "Embankment"
 msgstr "Terrapieno"
@@ -19214,33 +19017,22 @@
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
 #. item "Ways/Construction" text "Max. speed (km/h)"
-#. item "Ways/Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Cycleway" text "Max. speed (km/h)"
-#. item "Ways/Footway" 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 Footway" text "Max. speed (km/h)"
 #. item "Ways/Steps" text "Max. speed (km/h)"
-#. item "Ways/Path" text "Max. speed (km/h)"
-#. item "Ways/Hiking" text "Name"
-#. item "Ways/Mountain Hiking" text "Name"
-#. item "Ways/Demanding Mountain Hiking" text "Name"
-#. item "Ways/Alpine Hiking" text "Name"
-#. item "Ways/Demanding Alpine Hiking" text "Name"
-#. item "Ways/Difficult Alpine Hiking" text "Name"
 #. 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)"
 #: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:293
-#: build/trans_presets.java:326 build/trans_presets.java:371
-#: build/trans_presets.java:387 build/trans_presets.java:401
-#: build/trans_presets.java:425 build/trans_presets.java:444
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:503 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:649
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:757 build/trans_presets.java:1322
-#: build/trans_presets.java:1498 build/trans_presets.java:1543
+#: build/trans_presets.java:273 build/trans_presets.java:291
+#: build/trans_presets.java:311 build/trans_presets.java:344
+#: build/trans_presets.java:389 build/trans_presets.java:405
+#: build/trans_presets.java:419 build/trans_presets.java:443
+#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:578
+#: build/trans_presets.java:598 build/trans_presets.java:618
+#: build/trans_presets.java:1183 build/trans_presets.java:1359
+#: build/trans_presets.java:1404
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
@@ -19265,31 +19057,26 @@
 #. 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 "Ways/Construction" combo "Layer"
-#. item "Ways/Bridleway" combo "Layer"
-#. item "Ways/Cycleway" combo "Layer"
-#. item "Ways/Footway" combo "Layer"
-#. item "Ways/Pedestrian" combo "Layer"
+#. item "Ways/Track" check "Oneway"
+#. item "Ways/Path" check "Oneway"
+#. 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 "Ways/Track" check "Embankment"
-#. item "Ways/Track Grade 1" check "Embankment"
-#. item "Ways/Track Grade 2" check "Embankment"
-#. item "Ways/Track Grade 3" check "Embankment"
-#. item "Ways/Track Grade 4" check "Embankment"
-#. item "Ways/Track Grade 5" check "Embankment"
-#. item "Ways/Path" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:623
-#: build/trans_presets.java:644 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "Surface"
 msgstr "Superficie"
@@ -19297,178 +19084,180 @@
 #. item "Highways/Streets/Residential" combo "Surface"
 #. item "Highways/Streets/Living Street" combo "Surface"
+#. item "Highways/Streets/Pedestrian" combo "Surface"
 #. item "Highways/Streets/Service" combo "Surface"
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
 #. item "Ways/Construction" combo "Surface"
-#. item "Ways/Bridleway" combo "Surface"
-#. item "Ways/Cycleway" combo "Surface"
-#. item "Ways/Footway" combo "Surface"
-#. item "Ways/Pedestrian" combo "Surface"
+#. item "Ways/Track" combo "Surface"
+#. item "Ways/Path" combo "Surface"
+#. item "Ways/Dedicated Bridleway" combo "Surface"
+#. item "Ways/Dedicated Cycleway" combo "Surface"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface"
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface"
+#. item "Ways/Dedicated Footway" combo "Surface"
 #. item "Ways/Steps" combo "Surface"
-#. item "Ways/Track" combo "Surface"
-#. item "Ways/Track Grade 1" combo "Surface"
-#. item "Ways/Path" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "paved"
 msgstr "pavimentata"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "unpaved"
 msgstr "non pavimentata"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "asphalt"
 msgstr "asfalto"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "concrete"
 msgstr "calcestruzzo"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2465
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181 build/trans_presets.java:2326
 msgid "metal"
 msgstr "metallo"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2465
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181 build/trans_presets.java:2326
 msgid "wood"
 msgstr "bosco"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "paving_stones"
 msgstr "lastricato"
 
-#. item "Ways/Track Grade 2" combo "Surface"
-#. item "Ways/Track Grade 3" combo "Surface"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:560 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "gravel"
 msgstr "ghiaia"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "pebblestone"
 msgstr "ciottoli"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "compacted"
 msgstr "compattato"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "grass_paver"
 msgstr "erba"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:623 build/trans_presets.java:644
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "grass"
 msgstr "erba"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:644
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "sand"
 msgstr "sabbia"
 
-#. item "Ways/Track Grade 4" combo "Surface"
-#. item "Ways/Track Grade 5" combo "Surface"
 #: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:291 build/trans_presets.java:306
-#: build/trans_presets.java:324 build/trans_presets.java:422
-#: build/trans_presets.java:442 build/trans_presets.java:463
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:539
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:644
-#: build/trans_presets.java:677 build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "ground"
 msgstr "terra"
@@ -19490,4 +19279,17 @@
 #. </optional>
 #: build/trans_presets.java:276
+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" />
+#: build/trans_presets.java:279
+msgid "Edit Pedestrian Street"
+msgstr "Modifica area pedonale"
+
+#. item "Highways/Streets/Pedestrian" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:294
 msgid "Service"
 msgstr "Strada di servizio"
@@ -19496,5 +19298,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:279
+#: build/trans_presets.java:297
 msgid "Edit Serviceway"
 msgstr "Modifica strada di servizio"
@@ -19504,18 +19306,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "Serviceway type"
 msgstr "Tipo di strada di servizio"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "alley"
 msgstr "vicolo"
 
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "parking_aisle"
 msgstr "corsia interna a parcheggio"
@@ -19523,5 +19325,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:314
 msgid "Parking Aisle"
 msgstr "Corsia interna a parcheggio"
@@ -19531,5 +19333,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:300
+#: build/trans_presets.java:318
 msgid "Edit Parking Aisle"
 msgstr "Modifica corsia interna a parcheggio"
@@ -19537,5 +19339,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:310
+#: build/trans_presets.java:328
 msgid "Road (Unknown Type)"
 msgstr "Road (Tipo Sconosciuto)"
@@ -19544,5 +19346,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:313
+#: build/trans_presets.java:331
 msgid "Edit Road of unknown type"
 msgstr "Modifica Road (Tipo Sconosciuto)"
@@ -19551,20 +19353,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:348
 msgid "Road Restrictions"
 msgstr "Restrizioni e divieti"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:331
+#: build/trans_presets.java:349
 msgid "Edit Road Restrictions"
 msgstr "Modifica restrizioni e divieti"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:333
+#: build/trans_presets.java:351
 msgid "Toll"
 msgstr "Pedaggio"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:352
 msgid "No exit (cul-de-sac)"
 msgstr "Senza uscita (cul-de-sac)"
@@ -19572,13 +19374,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#. item "Ways/Track Grade 1" combo "Layer"
-#. item "Ways/Track Grade 2" combo "Layer"
-#. item "Ways/Track Grade 3" combo "Layer"
-#. item "Ways/Track Grade 4" combo "Layer"
-#. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:335 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:646
+#: build/trans_presets.java:353 build/trans_presets.java:464
 msgid "Access"
 msgstr "Permesso di accesso"
@@ -19598,19 +19392,4 @@
 #. item "Ways/Track" combo "Motorcycle"
 #. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
 #. item "Ways/Path" combo "Foot"
 #. item "Ways/Path" combo "Bicycle"
@@ -19635,31 +19414,24 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:461
-#: build/trans_presets.java:481 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:661
-#: build/trans_presets.java:662 build/trans_presets.java:663
-#: build/trans_presets.java:664 build/trans_presets.java:665
-#: build/trans_presets.java:666 build/trans_presets.java:1407
-#: build/trans_presets.java:1408 build/trans_presets.java:1411
-#: build/trans_presets.java:1412 build/trans_presets.java:1413
-#: build/trans_presets.java:1532 build/trans_presets.java:1533
-#: build/trans_presets.java:1534 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2427
-#: build/trans_presets.java:2428 build/trans_presets.java:2464
-#: build/trans_presets.java:2473 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2759
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:1268
+#: build/trans_presets.java:1269 build/trans_presets.java:1272
+#: build/trans_presets.java:1273 build/trans_presets.java:1274
+#: build/trans_presets.java:1393 build/trans_presets.java:1394
+#: build/trans_presets.java:1395 build/trans_presets.java:1628
+#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:2289 build/trans_presets.java:2325
+#: build/trans_presets.java:2334 build/trans_presets.java:2335
+#: build/trans_presets.java:2336 build/trans_presets.java:2620
 msgid "yes"
 msgstr "si"
@@ -19672,40 +19444,25 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_style.java:212
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:212
 msgid "private"
 msgstr "privato"
 
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:661
-#: build/trans_presets.java:662 build/trans_presets.java:663
-#: build/trans_presets.java:664 build/trans_presets.java:665
-#: build/trans_presets.java:666
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "designated"
 msgstr "specifico"
@@ -19718,19 +19475,12 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_style.java:219
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:219
 msgid "destination"
 msgstr "destinazione"
@@ -19741,8 +19491,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#. 
+#.
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -19753,74 +19503,52 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_style.java:205
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:205
 msgid "permissive"
 msgstr "permesso"
 
-#: build/trans_presets.java:335 build/trans_presets.java:339
-#: build/trans_presets.java:342 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648
+#: build/trans_presets.java:353 build/trans_presets.java:357
+#: build/trans_presets.java:360 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "Agricolo"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:461
-#: build/trans_presets.java:481 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:661
-#: build/trans_presets.java:662 build/trans_presets.java:663
-#: build/trans_presets.java:664 build/trans_presets.java:665
-#: build/trans_presets.java:666 build/trans_presets.java:785
-#: build/trans_presets.java:800 build/trans_presets.java:1344
-#: build/trans_presets.java:1407 build/trans_presets.java:1408
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:1532
-#: build/trans_presets.java:1533 build/trans_presets.java:1534
-#: build/trans_presets.java:1767 build/trans_presets.java:1777
-#: build/trans_presets.java:2427 build/trans_presets.java:2428
-#: build/trans_presets.java:2464 build/trans_presets.java:2473
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:646
+#: build/trans_presets.java:661 build/trans_presets.java:1205
+#: build/trans_presets.java:1268 build/trans_presets.java:1269
+#: build/trans_presets.java:1272 build/trans_presets.java:1273
+#: build/trans_presets.java:1274 build/trans_presets.java:1393
+#: build/trans_presets.java:1394 build/trans_presets.java:1395
+#: build/trans_presets.java:1628 build/trans_presets.java:1638
+#: build/trans_presets.java:2288 build/trans_presets.java:2289
+#: build/trans_presets.java:2325 build/trans_presets.java:2334
+#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:2620
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:356
 msgid "Goods"
 msgstr "Carico e scarico merci"
 
-#: build/trans_presets.java:339
+#: build/trans_presets.java:357
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Merci pesanti/Trasporti eccezionali"
@@ -19835,10 +19563,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:340 build/trans_presets.java:663
-#: build/trans_presets.java:870 build/trans_presets.java:903
-#: build/trans_presets.java:925 build/trans_presets.java:962
-#: build/trans_presets.java:975 build/trans_presets.java:987
-#: build/trans_presets.java:999 build/trans_presets.java:1011
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:358 build/trans_presets.java:488
+#: build/trans_presets.java:731 build/trans_presets.java:764
+#: build/trans_presets.java:786 build/trans_presets.java:823
+#: build/trans_presets.java:836 build/trans_presets.java:848
+#: build/trans_presets.java:860 build/trans_presets.java:872
+#: build/trans_presets.java:912
 msgid "Horse"
 msgstr "Cavallo"
@@ -19854,13 +19582,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:341 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:647 build/trans_presets.java:871
-#: build/trans_presets.java:889 build/trans_presets.java:904
-#: build/trans_presets.java:926 build/trans_presets.java:963
-#: build/trans_presets.java:976 build/trans_presets.java:988
-#: build/trans_presets.java:1000 build/trans_presets.java:1012
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:359 build/trans_presets.java:465
+#: build/trans_presets.java:732 build/trans_presets.java:750
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:824 build/trans_presets.java:837
+#: build/trans_presets.java:849 build/trans_presets.java:861
+#: build/trans_presets.java:873 build/trans_presets.java:913
 msgid "Motorcycle"
 msgstr "Motocicletta"
@@ -19875,30 +19600,27 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:342 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:648 build/trans_presets.java:666
-#: build/trans_presets.java:890 build/trans_presets.java:905
-#: build/trans_presets.java:927 build/trans_presets.java:964
-#: build/trans_presets.java:977 build/trans_presets.java:989
-#: build/trans_presets.java:1001 build/trans_presets.java:1013
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:360 build/trans_presets.java:466
+#: build/trans_presets.java:492 build/trans_presets.java:751
+#: build/trans_presets.java:766 build/trans_presets.java:788
+#: build/trans_presets.java:825 build/trans_presets.java:838
+#: build/trans_presets.java:850 build/trans_presets.java:862
+#: build/trans_presets.java:874 build/trans_presets.java:914
 msgid "Motorcar"
 msgstr "Automobile"
 
-#: build/trans_presets.java:343
+#: build/trans_presets.java:361
 msgid "Public Service Vehicles (psv)"
 msgstr "Veicoli di servizio pubblico"
 
-#: build/trans_presets.java:344
+#: build/trans_presets.java:362
 msgid "Motorboat"
 msgstr "Barca a motore"
 
-#: build/trans_presets.java:345
+#: build/trans_presets.java:363
 msgid "Boat"
 msgstr "Barca"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:347
+#: build/trans_presets.java:365
 msgid "Min. speed (km/h)"
 msgstr "Velocità minima (km/h)"
@@ -19906,25 +19628,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:348 build/trans_presets.java:386
+#: build/trans_presets.java:366 build/trans_presets.java:404
 msgid "Max. weight (tonnes)"
 msgstr "Peso massimo (tonnellate)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:367
 msgid "Max. Height (meters)"
 msgstr "Altezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:350
+#: build/trans_presets.java:368
 msgid "Max. Width (meters)"
 msgstr "Larghezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:369
 msgid "Max. Length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:353
+#: build/trans_presets.java:371
 msgid "Roundabout"
 msgstr "Rotatoria"
@@ -19935,5 +19657,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:358
+#: build/trans_presets.java:376
 msgid "Edit Junction"
 msgstr "Modifica un incrocio"
@@ -19942,5 +19664,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -19950,13 +19672,13 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_presets.java:379 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada/tangenziale"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "motorway_link"
 msgstr "collegamento autostradale"
@@ -19967,5 +19689,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -19975,13 +19697,13 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_presets.java:379 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -19992,5 +19714,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -20000,13 +19722,13 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_presets.java:379 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primaria"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "primary_link"
 msgstr "svincolo primario"
@@ -20017,5 +19739,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -20025,8 +19747,8 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_presets.java:379 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20038,12 +19760,12 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:617
+#: build/trans_presets.java:379 build/trans_style.java:617
 msgid "tertiary"
 msgstr "terziaria"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "unclassified"
 msgstr "unclassified"
@@ -20054,12 +19776,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3221
+#: build/trans_presets.java:379 build/trans_style.java:3252
 msgid "residential"
 msgstr "residenziale"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "living_street"
 msgstr "living_street"
@@ -20070,5 +19792,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -20077,5 +19799,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -20085,14 +19807,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:673
-#: build/trans_style.java:4326
+#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_style.java:4357
 msgid "service"
 msgstr "strada di servizio"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "bus_guideway"
 msgstr "autobus guidato"
@@ -20103,5 +19825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -20110,5 +19832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -20118,10 +19840,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:880
-#: build/trans_style.java:3286 build/trans_style.java:3287
+#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
 msgstr "construction"
@@ -20132,10 +19854,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:379
+#: build/trans_presets.java:397
 msgid "Edit Bridge"
 msgstr "Modifica ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:409
 msgid "Edit Tunnel"
 msgstr "Modifica un Tunnel"
@@ -20143,19 +19865,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:405
+#: build/trans_presets.java:423
 msgid "Ways"
 msgstr "Percorsi"
 
 #. group "Ways"
-#: build/trans_presets.java:406
+#: build/trans_presets.java:424
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:407
+#: build/trans_presets.java:425
 msgid "Edit Highway Under Construction"
 msgstr "Modifica una strada in costruzione"
 
-#: build/trans_presets.java:423
+#: build/trans_presets.java:441
 msgid "Junction"
 msgstr "Svincolo"
@@ -20166,10 +19888,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- junction tag -->
-#. 
+#.
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:898
+#: build/trans_presets.java:441 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rotatoria"
@@ -20177,68 +19899,192 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:446
+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" />
+#: build/trans_presets.java:449
+msgid "Edit Track"
+msgstr "Modifica Track"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "Tracktype"
+msgstr "Track"
+
+#. item "Ways/Track" combo "Tracktype"
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade1"
+msgstr "ghiaia"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade2"
+msgstr "ghiaia"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade3"
+msgstr "ghiaia"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade4"
+msgstr "ghiaia"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade5"
+msgstr "ghiaia"
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
+msgid "MTB Scale"
+msgstr ""
+
+#. item "Ways/Track" combo "MTB Scale"
+#. item "Ways/Path" combo "MTB Scale"
+#: build/trans_presets.java:462 build/trans_presets.java:485
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Track" combo "SAC Scale"
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:3051
+msgid "hiking"
+msgstr "escursionismo"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "mountain_hiking"
+msgstr "Mountain bike"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "demanding_mountain_hiking"
+msgstr "Percorso escursionistico montano difficile"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "alpine_hiking"
+msgstr "Percorso escursionistico alpino"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "demanding_alpine_hiking"
+msgstr "Percorso escursionistico alpino difficile"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "difficult_alpine_hiking"
+msgstr "Percorso escursionistico alpino molto difficile"
+
+#. item "Ways/Track" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:470
+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" />
+#: build/trans_presets.java:473
+msgid "Edit Path"
+msgstr "Modifica percorso"
+
+#: build/trans_presets.java:489
+#, fuzzy
+msgid "Wheelchairs"
+msgstr "Sedia a rotelle"
+
+#: build/trans_presets.java:490
+msgid "Ski"
+msgstr "Sci"
+
+#: build/trans_presets.java:491
+msgid "Snowmobile"
+msgstr "Motoslitta"
+
+#. item "Ways/Path" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:429
-msgid "Bridleway"
-msgstr "Percorso per equitazione"
-
-#. item "Ways/Bridleway"
+#: build/trans_presets.java:499
+#, fuzzy
+msgid "Dedicated Bridleway"
+msgstr "Modifica un percorso per equitazione"
+
+#. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:431
+#: build/trans_presets.java:501
 msgid "Edit Bridleway"
 msgstr "Modifica un percorso per equitazione"
 
-#. item "Ways/Bridleway" text "Width (meters)"
+#. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:447
-msgid "Cycleway"
-msgstr "Cycleway"
-
-#. item "Ways/Cycleway"
+#: build/trans_presets.java:517
+#, fuzzy
+msgid "Dedicated Cycleway"
+msgstr "Modifica Cycleway"
+
+#. 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" />
-#: build/trans_presets.java:451
+#. item "Ways/Segregated Foot- and 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"
+#. <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" />
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:563
 msgid "Edit Cycleway"
 msgstr "Modifica Cycleway"
 
-#. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:461
+#. item "Ways/Dedicated Cycleway" check "Embankment"
+#: build/trans_presets.java:531
 msgid "Pedestrians"
 msgstr "Pedoni"
 
-#. item "Ways/Cycleway" text "Width (meters)"
+#. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:468
-msgid "Footway"
-msgstr "Footway"
-
-#. item "Ways/Footway"
+#: build/trans_presets.java:537
+msgid "Segregated Foot- and Cycleway"
+msgstr ""
+
+#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:559
+#, fuzzy
+msgid "Combined Foot- and Cycleway"
+msgstr "Unisci comunque"
+
+#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:581
+#, fuzzy
+msgid "Dedicated Footway"
+msgstr "Modifica Footway"
+
+#. 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" />
-#: build/trans_presets.java:471
+#: build/trans_presets.java:584
 msgid "Edit Footway"
 msgstr "Modifica Footway"
 
-#. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:481
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:594
 msgid "Bikes"
 msgstr "Biciclette"
 
-#. item "Ways/Footway" text "Width (meters)"
+#. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:488
-msgid "Pedestrian"
-msgstr "Area pedonale"
-
-#. item "Ways/Pedestrian"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:491
-msgid "Edit Pedestrian Street"
-msgstr "Modifica area pedonale"
-
-#. item "Ways/Pedestrian" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:506
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Rampa di scale"
@@ -20248,5 +20094,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:510
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Modifica una rampa di scale"
@@ -20254,198 +20100,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:527
-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" />
-#: build/trans_presets.java:530
-msgid "Edit Track"
-msgstr "Modifica Track"
-
-#. item "Ways/Track" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:547
-msgid "Track Grade 1"
-msgstr "Track Grade 1"
-
-#. item "Ways/Track Grade 1"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:550
-msgid "Edit Track of grade 1"
-msgstr "Modifica Track Grade 1"
-
-#. item "Ways/Track Grade 1" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:568
-msgid "Track Grade 2"
-msgstr "Track Grade 2"
-
-#. item "Ways/Track Grade 2"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:571
-msgid "Edit Track of grade 2"
-msgstr "Modifica Track Grade 2"
-
-#. item "Ways/Track Grade 2" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:589
-msgid "Track Grade 3"
-msgstr "Track Grade 3"
-
-#. item "Ways/Track Grade 3"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:592
-msgid "Edit Track of grade 3"
-msgstr "Modifica Track Grade 3"
-
-#. item "Ways/Track Grade 3" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:610
-msgid "Track Grade 4"
-msgstr "Track Grade 4"
-
-#. item "Ways/Track Grade 4"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:613
-msgid "Edit Track of grade 4"
-msgstr "Modifica Track Grade 4"
-
-#. item "Ways/Track Grade 4" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:631
-msgid "Track Grade 5"
-msgstr "Track Grade 5"
-
-#. item "Ways/Track Grade 5"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:634
-msgid "Edit Track of grade 5"
-msgstr "Modifica Track Grade 5"
-
-#. item "Ways/Track Grade 5" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:653
-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" />
-#: build/trans_presets.java:656
-msgid "Edit Path"
-msgstr "Modifica percorso"
-
-#: build/trans_presets.java:664
-msgid "Ski"
-msgstr "Sci"
-
-#: build/trans_presets.java:665
-msgid "Snowmobile"
-msgstr "Motoslitta"
-
-#. item "Ways/Path" text "Width (meters)"
-#. </optional>
-#. item "Tourism/Map" label "Routes shown for:"
-#. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:682 build/trans_presets.java:1729
-#: build/trans_presets.java:1752
-msgid "Hiking"
-msgstr "Percorso escursionistico"
-
-#. item "Ways/Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:686
-msgid "Edit Hiking"
-msgstr "Modifica percorso escursionistico"
-
-#. item "Ways/Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:695
-msgid "Mountain Hiking"
-msgstr "Percorso escursionistico montano"
-
-#. item "Ways/Mountain Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:699
-msgid "Edit Mountain Hiking"
-msgstr "Modifica percorso escursionistico montano"
-
-#. item "Ways/Mountain Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:708
-msgid "Demanding Mountain Hiking"
-msgstr "Percorso escursionistico montano difficile"
-
-#. item "Ways/Demanding Mountain Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:712
-msgid "Edit Demanding Mountain Hiking"
-msgstr "Modifica percorso escursionistico montano difficile"
-
-#. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:721
-msgid "Alpine Hiking"
-msgstr "Percorso escursionistico alpino"
-
-#. item "Ways/Alpine Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:725
-msgid "Edit Alpine Hiking"
-msgstr "Modifica percorso escursionistico alpino"
-
-#. item "Ways/Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:734
-msgid "Demanding Alpine Hiking"
-msgstr "Percorso escursionistico alpino difficile"
-
-#. item "Ways/Demanding Alpine Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:738
-msgid "Edit Demanding Alpine Hiking"
-msgstr "Modifica percorso escursionistico alpino difficile"
-
-#. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:747
-msgid "Difficult Alpine Hiking"
-msgstr "Percorso escursionistico alpino molto difficile"
-
-#. item "Ways/Difficult Alpine Hiking"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
-#. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:751
-msgid "Edit Difficult Alpine Hiking"
-msgstr "Modifica un percorso escursionistico alpino molto difficile"
-
-#. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:761
+#: build/trans_presets.java:622
 msgid "Waypoints"
 msgstr "Punti del percorso"
 
 #. group "Waypoints"
-#: build/trans_presets.java:762
+#: build/trans_presets.java:623
 msgid "Motorway Junction"
 msgstr "Svincolo autostradale"
@@ -20453,15 +20111,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:764
+#: build/trans_presets.java:625
 msgid "Edit Motorway Junction"
 msgstr "Modifica svincolo autostradale"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:629
 msgid "Number"
 msgstr "Numero"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:631
 msgid "Services"
 msgstr "Stazione di servizio"
@@ -20469,5 +20127,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:772
+#: build/trans_presets.java:633
 msgid "Edit Service Station"
 msgstr "Modifica stazione di servizio"
@@ -20506,17 +20164,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:777 build/trans_presets.java:914
-#: build/trans_presets.java:1396 build/trans_presets.java:1420
-#: build/trans_presets.java:1426 build/trans_presets.java:1434
-#: build/trans_presets.java:1441 build/trans_presets.java:1765
-#: build/trans_presets.java:1775 build/trans_presets.java:2204
-#: build/trans_presets.java:2306 build/trans_presets.java:2336
-#: build/trans_presets.java:2388 build/trans_presets.java:2396
-#: build/trans_presets.java:2413 build/trans_presets.java:2425
-#: build/trans_presets.java:2434 build/trans_presets.java:2441
-#: build/trans_presets.java:2495 build/trans_presets.java:2505
-#: build/trans_presets.java:2557 build/trans_presets.java:2723
-#: build/trans_presets.java:2738 build/trans_presets.java:2777
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:638 build/trans_presets.java:775
+#: build/trans_presets.java:1257 build/trans_presets.java:1281
+#: build/trans_presets.java:1287 build/trans_presets.java:1295
+#: build/trans_presets.java:1302 build/trans_presets.java:1626
+#: build/trans_presets.java:1636 build/trans_presets.java:2065
+#: build/trans_presets.java:2167 build/trans_presets.java:2197
+#: build/trans_presets.java:2249 build/trans_presets.java:2257
+#: build/trans_presets.java:2274 build/trans_presets.java:2286
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2356 build/trans_presets.java:2366
+#: build/trans_presets.java:2418 build/trans_presets.java:2584
+#: build/trans_presets.java:2599 build/trans_presets.java:2638
+#: build/trans_presets.java:3058
 msgid "Operator"
 msgstr "Operatore"
@@ -20525,5 +20183,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:781
+#: build/trans_presets.java:642
 msgid "Traffic Signal"
 msgstr "Semaforo"
@@ -20533,5 +20191,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:785
+#: build/trans_presets.java:646
 msgid "Pedestrian crossing type"
 msgstr "Tipo di attraversamento pedonale"
@@ -20540,27 +20198,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "uncontrolled"
 msgstr "non presidiato"
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "traffic_signals"
 msgstr "Semaforo"
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "island"
 msgstr "isola spartitraffico"
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "unmarked"
 msgstr "non marcato"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:786 build/trans_presets.java:802
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:647 build/trans_presets.java:663
+#: build/trans_presets.java:1206
 msgid "Cross on horseback"
 msgstr "attraversamento a cavallo"
@@ -20568,6 +20226,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:787 build/trans_presets.java:801
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:648 build/trans_presets.java:662
+#: build/trans_presets.java:1207
 msgid "Cross by bicycle"
 msgstr "attraversamento ciclabile"
@@ -20576,11 +20234,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:788 build/trans_presets.java:803
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:1208
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:789
+#: build/trans_presets.java:650
 msgid "Crossing type name (UK)"
 msgstr "Nome del tipo di attraversamento (UK)"
@@ -20588,30 +20246,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "zebra"
 msgstr "strisce pedonali"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "pelican"
 msgstr "attraversamento pedonale regolato da semaforo"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:792
+#: build/trans_presets.java:653
 msgid "Stop"
 msgstr "Stop"
@@ -20619,5 +20277,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:795
+#: build/trans_presets.java:656
 msgid "Pedestrian Crossing"
 msgstr "Attraversamento pedonale"
@@ -20626,14 +20284,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:798
+#: build/trans_presets.java:659
 msgid "Edit Crossing"
 msgstr "Modifica attraversamento pedonale"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:804
+#: build/trans_presets.java:665
 msgid "Type name (UK)"
 msgstr "Nome del tipo (UK)"
 
-#: build/trans_presets.java:806
+#: build/trans_presets.java:667
 msgid "Mini-roundabout"
 msgstr "mini-rotatoria"
@@ -20644,14 +20302,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:811
+#: build/trans_presets.java:672
 msgid "Direction"
 msgstr "Direzione"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:811
+#: build/trans_presets.java:672
 msgid "clockwise"
 msgstr "senso orario"
 
-#: build/trans_presets.java:813
+#: build/trans_presets.java:674
 msgid "Turning Circle"
 msgstr "Slargo per inversione di marcia"
@@ -20661,20 +20319,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:818
+#: build/trans_presets.java:679
 msgid "City Limit"
 msgstr "City Limit"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:819
+#: build/trans_presets.java:680
 msgid "Edit City Limit Sign"
 msgstr "Modifica City Limit"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:824
+#: build/trans_presets.java:685
 msgid "Second Name"
 msgstr "Secondo nome"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:826
+#: build/trans_presets.java:687
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -20682,5 +20340,5 @@
 #. item "Waypoints/Speed Camera"
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:690
 msgid "Emergency Phone"
 msgstr "Telefono di emergenza"
@@ -20688,5 +20346,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:693
 msgid "Incline"
 msgstr "Rampa"
@@ -20694,5 +20352,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:835
+#: build/trans_presets.java:696
 msgid "Incline Steep"
 msgstr "Rampa ripida"
@@ -20701,10 +20359,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:700
 msgid "Ford"
 msgstr "Guado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:701
 msgid "Edit Ford"
 msgstr "Modifica guado"
@@ -20712,5 +20370,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:847
+#: build/trans_presets.java:708
 msgid "Mountain Pass"
 msgstr "Passo montano"
@@ -20718,5 +20376,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:849
+#: build/trans_presets.java:710
 msgid "Edit Mountain Pass"
 msgstr "Modifica passo montano"
@@ -20728,7 +20386,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:854 build/trans_presets.java:1604
-#: build/trans_presets.java:1749 build/trans_presets.java:2891
-#: build/trans_presets.java:2898 build/trans_presets.java:2905
+#: build/trans_presets.java:715 build/trans_presets.java:1465
+#: build/trans_presets.java:1610 build/trans_presets.java:2752
+#: build/trans_presets.java:2759 build/trans_presets.java:2766
 msgid "Elevation"
 msgstr "Elevazione"
@@ -20736,5 +20394,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:858
+#: build/trans_presets.java:719
 msgid "Barriers"
 msgstr "Barriere"
@@ -20742,5 +20400,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:861
+#: build/trans_presets.java:722
 msgid "Bollard"
 msgstr "Colonnina"
@@ -20748,5 +20406,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:724
 msgid "Edit Bollard"
 msgstr "Modifica colonnina"
@@ -20791,16 +20449,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:866 build/trans_presets.java:885
-#: build/trans_presets.java:899 build/trans_presets.java:921
-#: build/trans_presets.java:958 build/trans_presets.java:971
-#: build/trans_presets.java:983 build/trans_presets.java:995
-#: build/trans_presets.java:1007 build/trans_presets.java:1019
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:727 build/trans_presets.java:746
+#: build/trans_presets.java:760 build/trans_presets.java:782
+#: build/trans_presets.java:819 build/trans_presets.java:832
+#: build/trans_presets.java:844 build/trans_presets.java:856
+#: build/trans_presets.java:868 build/trans_presets.java:880
+#: build/trans_presets.java:890 build/trans_presets.java:899
+#: build/trans_presets.java:908
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:734
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
@@ -20809,5 +20467,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:877
+#: build/trans_presets.java:738
 msgid "Block"
 msgstr "Blocco"
@@ -20815,5 +20473,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:880
+#: build/trans_presets.java:741
 msgid "Cattle Grid"
 msgstr "Griglia"
@@ -20821,10 +20479,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:882
+#: build/trans_presets.java:743
 msgid "Edit Cattle Grid"
 msgstr "Modifica griglia"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:892
+#: build/trans_presets.java:753
 msgid "Bus Trap"
 msgstr "Trappola bus"
@@ -20832,15 +20490,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:895
+#: build/trans_presets.java:756
 msgid "Spikes"
 msgstr "Spunzoni"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:757
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:768
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
@@ -20848,5 +20506,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:770
 msgid "Edit Toll Booth"
 msgstr "Modifica casello (per pedaggio)"
@@ -20854,10 +20512,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:917
+#: build/trans_presets.java:778
 msgid "Border Control"
 msgstr "Dogana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:779
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
@@ -20865,7 +20523,7 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#. 
+#.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:932
+#: build/trans_presets.java:793
 msgid "Hedge"
 msgstr "Siepe"
@@ -20874,5 +20532,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:936
+#: build/trans_presets.java:797
 msgid "Fence"
 msgstr "Recinto"
@@ -20881,5 +20539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:940
+#: build/trans_presets.java:801
 msgid "Wall"
 msgstr "Muro"
@@ -20887,5 +20545,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:943
+#: build/trans_presets.java:804
 msgid "City Wall"
 msgstr "Cinta muraria"
@@ -20894,5 +20552,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:947
+#: build/trans_presets.java:808
 msgid "Retaining Wall"
 msgstr "Muro di contenimento"
@@ -20902,17 +20560,17 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#. 
+#.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:954
+#: build/trans_presets.java:815
 msgid "Entrance"
 msgstr "Punto di accesso"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:955
+#: build/trans_presets.java:816
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:827
 msgid "Gate"
 msgstr "Cancello"
@@ -20920,50 +20578,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:829
 msgid "Edit Gate"
 msgstr "Modifica cancello"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:840
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:980
+#: build/trans_presets.java:841
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:852
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:992
+#: build/trans_presets.java:853
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:864
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:865
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:876
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:877
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:885
 msgid "Stile"
 msgstr "Scaletta"
@@ -20971,40 +20629,40 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:887
 msgid "Edit Stile"
 msgstr "Modifica scaletta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:895
 msgid "Turnstile"
 msgstr "Tornello"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:896
 msgid "Edit Turnstile"
 msgstr "Modifica tornello"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:904
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:905
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#. 
+#.
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1058 build/trans_presets.java:1059
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:919 build/trans_presets.java:920
+#: build/trans_presets.java:963
 msgid "Water"
 msgstr "Acqua"
 
 #. group "Water/Water"
-#: build/trans_presets.java:1060
+#: build/trans_presets.java:921
 msgid "Spring"
 msgstr "Sorgente"
@@ -21012,5 +20670,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:923
 msgid "Edit Spring"
 msgstr "Modifica sorgente"
@@ -21018,5 +20676,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:928
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -21024,10 +20682,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1069
+#: build/trans_presets.java:930
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:936
 msgid "Stream"
 msgstr "Torrente"
@@ -21035,10 +20693,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:938
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:1083
+#: build/trans_presets.java:944
 msgid "Canal"
 msgstr "Canale"
@@ -21046,10 +20704,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:946
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:952
 msgid "River"
 msgstr "Fiume"
@@ -21059,5 +20717,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:956
 msgid "Edit River"
 msgstr "Modifica un fiume"
@@ -21065,15 +20723,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:965
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:969
 msgid "Land"
 msgstr "Terraferma"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:970
 msgid "Edit Land"
 msgstr "Modifica terraferma"
@@ -21081,15 +20739,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:975
 msgid "Basin"
 msgstr "Bacino"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:976
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:981
 msgid "Reservoir"
 msgstr "Serbatoio"
@@ -21097,15 +20755,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:983
 msgid "Edit Reservoir Landuse"
-msgstr "Modifica area di riserva d'acqua"
+msgstr "Modifica area di riserva d''acqua"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:988
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:989
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
@@ -21113,5 +20771,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:994
 msgid "Riverbank"
 msgstr "Argine"
@@ -21120,10 +20778,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:997
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1001
 msgid "Wetland"
 msgstr "Zona umida"
@@ -21134,14 +20792,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1006
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "bog"
 msgstr "torbiera"
@@ -21151,39 +20809,39 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3453
+#: build/trans_presets.java:1009 build/trans_style.java:3484
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1011
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1151
+#: build/trans_presets.java:1012
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1016
 msgid "Beach"
 msgstr "Spiaggia"
@@ -21191,20 +20849,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1157
+#: build/trans_presets.java:1018
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1022
 msgid "Bay"
 msgstr "Baia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1023
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1027
 msgid "Cliff"
 msgstr "Rupe"
@@ -21212,10 +20870,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1029
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1172
+#: build/trans_presets.java:1033
 msgid "Coastline"
 msgstr "Linea di costa"
@@ -21223,5 +20881,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1035
 msgid "Edit Coastline"
 msgstr "Modifica linea di costa"
@@ -21229,5 +20887,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1040
 msgid "Ferry Route"
 msgstr "Linea traghetto"
@@ -21235,5 +20893,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1042
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
@@ -21242,5 +20900,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1189
+#: build/trans_presets.java:1050
 msgid "Boatyard"
 msgstr "Cantiere navale"
@@ -21248,10 +20906,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1052
 msgid "Edit Boatyard"
 msgstr "Modifica cantiere navale"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1057
 msgid "Dock"
 msgstr "Darsena/bacino navale"
@@ -21259,5 +20917,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1059
 msgid "Edit Dock"
 msgstr "Modifica una darsena/bacino navale"
@@ -21265,5 +20923,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1065
 msgid "Dam"
 msgstr "Diga"
@@ -21271,15 +20929,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1067
 msgid "Edit Dam"
 msgstr "Modifica una diga"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1073
 msgid "Waterway Point"
-msgstr "Punto di corso d'acqua"
+msgstr "Punto di corso d''acqua"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1074
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
@@ -21288,5 +20946,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1078
 msgid "Weir"
 msgstr "Sbarramento"
@@ -21294,20 +20952,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1080
 msgid "Edit Weir"
 msgstr "Modifica sbarramento"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1085
 msgid "Waterfall"
 msgstr "Cascata"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1086
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1091
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
@@ -21316,15 +20974,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1095
 msgid "Marina"
 msgstr "Porto turistico"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1096
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1100
 msgid "Pier"
 msgstr "Passerella"
@@ -21332,10 +20990,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1102
 msgid "Edit Pier"
 msgstr "Modifica passerella"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1106
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
@@ -21343,10 +21001,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:1108
 msgid "Edit Ferry Terminal"
 msgstr "Modifica terminal traghetti"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1112
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
@@ -21356,20 +21014,20 @@
 #. 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:1255
+#: build/trans_presets.java:1116
 msgid "Edit Slipway"
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1122
 msgid "Transport"
 msgstr "Trasporto"
 
 #. group "Transport"
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1123
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1124
 msgid "Rail"
 msgstr "Ferrovia"
@@ -21377,5 +21035,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1126
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
@@ -21405,8 +21063,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "Optional Types"
 msgstr "Tipi opzionali"
@@ -21420,35 +21078,35 @@
 #. item "Transport/Railway/Tram" combo "Optional Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "yard"
 msgstr "tratto per lo smistamento delle merci"
 
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "siding"
 msgstr "tratto parallelo ad una ferrovia principale"
 
-#: build/trans_presets.java:1268 build/trans_presets.java:1274
-#: build/trans_presets.java:1281 build/trans_presets.java:1287
-#: build/trans_presets.java:1293 build/trans_presets.java:1299
-#: build/trans_presets.java:1305 build/trans_presets.java:1330
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "spur"
 msgstr "tratto per una società o ente"
 
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1131
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1132
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifica una ferrovia a scartamento ridotto"
 
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1137
 msgid "Monorail"
 msgstr "Monorotaia"
@@ -21456,45 +21114,45 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1139
 msgid "Edit Monorail"
 msgstr "Modifica una monorotaia"
 
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1144
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1145
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
 
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1150
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1151
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
 
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1156
 msgid "Subway"
 msgstr "Metropolitana"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1157
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
 
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1162
 msgid "Tram"
 msgstr "Tramvia"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1163
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
 
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:1168
 msgid "Bus Guideway"
 msgstr "Autobus guidato"
@@ -21502,5 +21160,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:1170
 msgid "Edit Bus Guideway"
 msgstr "Modificare autobus guidato"
@@ -21509,14 +21167,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1187
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1188
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
 
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1193
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -21525,5 +21183,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1197
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -21532,5 +21190,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1201
 msgid "Crossing"
 msgstr "Crossing"
@@ -21540,5 +21198,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1205
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -21546,5 +21204,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1211
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -21553,10 +21211,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1216
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1217
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -21564,10 +21222,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1219
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1223
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -21575,10 +21233,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1225
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1229
 msgid "Cable Car"
 msgstr "Cabinovia"
@@ -21586,10 +21244,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1231
 msgid "Edit Cable Car"
 msgstr "Modifica una cabinovia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1235
 msgid "Gondola"
 msgstr "Cabinovia"
@@ -21597,10 +21255,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1237
 msgid "Edit Gondola"
 msgstr "Modifica cabinovia"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1241
 msgctxt "aerialway"
 msgid "Station"
@@ -21609,5 +21267,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1243
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -21615,5 +21273,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1389
+#: build/trans_presets.java:1250
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -21623,5 +21281,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1254
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
@@ -21679,32 +21337,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1690 build/trans_presets.java:1703
-#: build/trans_presets.java:1717 build/trans_presets.java:1814
-#: build/trans_presets.java:1822 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:2244
-#: build/trans_presets.java:2268 build/trans_presets.java:2496
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1536 build/trans_presets.java:1543
+#: build/trans_presets.java:1551 build/trans_presets.java:1564
+#: build/trans_presets.java:1578 build/trans_presets.java:1675
+#: build/trans_presets.java:1683 build/trans_presets.java:1786
+#: build/trans_presets.java:1792 build/trans_presets.java:2105
+#: build/trans_presets.java:2129 build/trans_presets.java:2357
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Opening Hours"
 msgstr "Orario di apertura"
@@ -21763,91 +21421,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
 
-#: build/trans_presets.java:1397 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -21862,5 +21520,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1399 build/trans_presets.java:1445
+#: build/trans_presets.java:1260 build/trans_presets.java:1306
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -21870,5 +21528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1263
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
@@ -21879,25 +21537,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1405 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:2426
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:1266 build/trans_presets.java:1627
+#: build/trans_presets.java:1637 build/trans_presets.java:2287
+#: build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Numero di riferimento"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1267
 msgid "multi-storey"
 msgstr "multi-piano"
 
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1267
 msgid "surface"
 msgstr "superficie"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2338
+#: build/trans_presets.java:1267 build/trans_presets.java:2199
 msgid "underground"
 msgstr "sotterraneo"
 
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1268
 msgid "Park and Ride"
 msgstr "Parcheggio di interscambio"
@@ -21906,48 +21564,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1408 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2427
+#: build/trans_presets.java:1269 build/trans_presets.java:1628
+#: build/trans_presets.java:1638 build/trans_presets.java:2288
 msgid "Fee"
 msgstr "Tariffa"
 
 #. <space />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1271
 msgid "Capacity (overall)"
 msgstr "Capacità (totale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1411
+#: build/trans_presets.java:1272
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1273
 msgid "Spaces for Women"
 msgstr "Spazi per le donne"
 
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1274
 msgid "Spaces for Parents"
 msgstr "Spazi per gli elementi da cui dipende"
 
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1275
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr "Vedere il Wiki per un'altra capacità:[tipi]=*."
+msgstr "Vedere il Wiki per un''altra capacità:[tipi]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1277
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1278
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1283
 msgid "Repair"
 msgstr "Autofficina"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1284
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
@@ -21955,5 +21613,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1428 build/trans_presets.java:1452
+#: build/trans_presets.java:1289 build/trans_presets.java:1313
 msgid "Rental"
 msgstr "Noleggio"
@@ -21962,10 +21620,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1292
 msgid "Edit Car Rental"
 msgstr "Modifica noleggio automobili"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1297
 msgid "Sharing"
 msgstr "Condivisione"
@@ -21973,5 +21631,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1299
 msgid "Edit Car Sharing"
 msgstr "Modifica condivisione automobili"
@@ -21979,10 +21637,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1447
+#: build/trans_presets.java:1308
 msgid "Edit Bicycle Parking"
 msgstr "Modifica parcheggio per biciclette"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1311
 msgid "Capacity"
 msgstr "Capacità"
@@ -21991,15 +21649,15 @@
 #. <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:1455
+#: build/trans_presets.java:1316
 msgid "Edit Bicycle Rental"
 msgstr "Modifica noleggio biciclette"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1321
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1322
 msgctxt "railway"
 msgid "Station"
@@ -22009,5 +21667,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1464
+#: build/trans_presets.java:1325
 msgctxt "railway"
 msgid "Edit Station"
@@ -22015,5 +21673,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1330
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -22021,5 +21679,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1333
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -22027,5 +21685,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1335
 msgid "Edit Halt"
 msgstr "Modifica stazione non presidiata"
@@ -22033,5 +21691,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1342
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -22040,5 +21698,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1345
 msgid "Edit Tram Stop"
 msgstr "Modifica fermata del tram"
@@ -22046,5 +21704,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1352
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -22053,5 +21711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1355
 msgid "Edit Railway Platform"
 msgstr "Modifica una piattaforma ferroviaria"
@@ -22063,5 +21721,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1542
+#: build/trans_presets.java:1358 build/trans_presets.java:1403
 msgid "Reference (track number)"
 msgstr "Riferimento (numero del tracciato)"
@@ -22069,10 +21727,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1544
+#: build/trans_presets.java:1360 build/trans_presets.java:1405
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1362
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -22081,10 +21739,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1365
 msgid "Edit Subway Entrance"
 msgstr "Modifica ingresso metropolitana"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509 build/trans_presets.java:2428
+#: build/trans_presets.java:1370 build/trans_presets.java:2289
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -22093,5 +21751,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1375
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -22100,5 +21758,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1378
 msgid "Edit Bus Station"
 msgstr "Modifica una stazione degli autobus"
@@ -22106,7 +21764,7 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1384
 msgid "Bus Stop"
-msgstr "Fermata dell'autobus"
+msgstr "Fermata dell''autobus"
 
 #. item "Public Transport/Bus Stop"
@@ -22114,32 +21772,32 @@
 #. 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:1527
+#: build/trans_presets.java:1388
 msgid "Edit Bus Stop"
-msgstr "Modifica fermata dell'autobus"
+msgstr "Modifica fermata dell''autobus"
 
 #. item "Public Transport/Bus Stop" text "Name"
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1789
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:1393 build/trans_presets.java:1650
+#: build/trans_presets.java:2334
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1533 build/trans_presets.java:2461
+#: build/trans_presets.java:1394 build/trans_presets.java:2322
 msgid "Bench"
 msgstr "Panchina"
 
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1395
 msgid "Tactile Paving"
 msgstr "Pavimentazione tattile"
 
 #. </optional>
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1399
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1400
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -22147,5 +21805,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1408
 msgid "Taxi"
 msgstr "Taxi"
@@ -22153,5 +21811,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1410
 msgid "Edit Taxi station"
 msgstr "Stazione dei taxi"
@@ -22159,5 +21817,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1415
 msgid "Airport"
 msgstr "Aeroporto"
@@ -22165,15 +21823,15 @@
 #. item "Public Transport/Airport"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1417
 msgid "Edit Airport"
 msgstr "Modifica aeroporto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1422
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1423
 msgid "ICAO"
 msgstr "ICAO"
@@ -22181,10 +21839,10 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1428
 msgid "Travel"
 msgstr "Viaggio"
 
 #. group "Travel"
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1429
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -22196,5 +21854,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1569 build/trans_surveyor.java:43
+#: build/trans_presets.java:1430 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -22203,15 +21861,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1433
 msgid "Edit Hotel"
 msgstr "Modifica hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1436
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1577
+#: build/trans_presets.java:1438
 msgid "Motel"
 msgstr "Motel"
@@ -22219,20 +21877,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1440
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1583
+#: build/trans_presets.java:1444
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1445
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1449
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -22240,10 +21898,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1451
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1455
 msgid "Hostel"
 msgstr "Ostello"
@@ -22251,30 +21909,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1457
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1461
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1462
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1467
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1468
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1472
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -22282,10 +21940,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1474
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1479
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -22296,5 +21954,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1619 build/trans_surveyor.java:47
+#: build/trans_presets.java:1480 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -22302,5 +21960,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1482
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
@@ -22308,5 +21966,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "Cuisine"
 msgstr "Cucina"
@@ -22314,61 +21972,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "regional"
 msgstr "provinciale"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1488
 msgid "Fast Food"
 msgstr "Fast food"
@@ -22376,9 +22034,9 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1490
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1496
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -22386,9 +22044,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1498
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1503
 msgid "Pub"
 msgstr "Pub"
@@ -22396,18 +22054,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1505
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1510
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1511
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1516
 msgid "Bar"
 msgstr "Bar"
@@ -22415,9 +22073,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1518
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1523
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -22425,24 +22083,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1525
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1531
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1532
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1533
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1538
 msgid "Museum"
 msgstr "Museo"
@@ -22450,9 +22108,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1540
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1545
 msgid "Zoo"
 msgstr "Zoo"
@@ -22461,9 +22119,9 @@
 #. <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:1687
+#: build/trans_presets.java:1548
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1553
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -22471,50 +22129,50 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1555
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1558
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1560
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1561
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1566
 msgid "Artwork"
-msgstr "Opera d'arte"
+msgstr "Opera d''arte"
 
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1568
 msgid "Edit Artwork"
-msgstr "Modifica opera d'arte"
+msgstr "Modifica opera d''arte"
 
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1573
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1580
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "topo"
 msgstr "topografico"
@@ -22525,5 +22183,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -22533,5 +22191,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -22541,5 +22199,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -22549,8 +22207,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_presets.java:1585 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -22558,28 +22216,28 @@
 msgstr "strada"
 
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "scheme"
 msgstr "schema"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "site"
 msgstr "luogo"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "city"
 msgstr "città"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "region"
 msgstr "provincia"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1726 build/trans_presets.java:1742
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1587 build/trans_presets.java:1603
+#: build/trans_presets.java:1647
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
@@ -22589,12 +22247,18 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
+#: build/trans_presets.java:1589 build/trans_presets.java:1612
 msgid "Routes shown for:"
 msgstr "Percorsi segnalati per:"
 
+#. item "Tourism/Map" label "Routes shown for:"
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:1590 build/trans_presets.java:1613
+msgid "Hiking"
+msgstr "Percorso escursionistico"
+
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1591 build/trans_presets.java:1614
+#: build/trans_presets.java:1832
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -22602,5 +22266,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1731 build/trans_presets.java:1754
+#: build/trans_presets.java:1592 build/trans_presets.java:1615
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -22608,6 +22272,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1732 build/trans_presets.java:1755
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:1593 build/trans_presets.java:1616
+#: build/trans_presets.java:1886
 msgid "Skiing"
 msgstr "Sci"
@@ -22615,5 +22279,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1733 build/trans_presets.java:1756
+#: build/trans_presets.java:1594 build/trans_presets.java:1617
 msgid "Riding"
 msgstr "Equitazione"
@@ -22621,46 +22285,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1734 build/trans_presets.java:1757
+#: build/trans_presets.java:1595 build/trans_presets.java:1618
 msgid "... other transportation modes possible"
 msgstr "... altre modalità di trasporto possibili"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1597
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "notice"
 msgstr "avviso"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "plants"
 msgstr "piantine"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1605
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1620
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -22668,29 +22332,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1764 build/trans_presets.java:1774
+#: build/trans_presets.java:1625 build/trans_presets.java:1635
 msgid "Closer description"
 msgstr "Descrizione dettagliata"
 
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1630
 msgid "Audioguide"
 msgstr "Audio-guida"
 
 #. <space />
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1640
 msgid "Audioguide via mobile phone?"
 msgstr "Audio-guida tramite cellulare?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1641
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1643
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1651
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -22698,25 +22362,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1793 build/trans_presets.java:1799
+#: build/trans_presets.java:1654 build/trans_presets.java:1660
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1656
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1657
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1663
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1664
 msgid "Castle"
 msgstr "Castello"
@@ -22725,19 +22389,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1667
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1671
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1672
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1677
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -22746,9 +22410,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1680
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1685
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -22756,10 +22420,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1687
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1691
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
@@ -22767,5 +22431,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1693
 msgid "Edit Palaeontological Site"
 msgstr "Modifica sito paleontologico"
@@ -22773,15 +22437,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1698
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1699
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1703
 msgid "Memorial"
 msgstr "Memoriale"
@@ -22789,55 +22453,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1705
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1709
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1710
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1714
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1715
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1719
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1720
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1725
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1726
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1727
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1731
 msgid "Playground"
 msgstr "Parco giochi"
@@ -22845,35 +22509,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1733
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1737
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1738
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1883 build/trans_presets.java:2703
+#: build/trans_presets.java:1744 build/trans_presets.java:2564
 msgid "Sports"
 msgstr "Articoli sportivi"
 
 #. group "Sports"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1745
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1746
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1747
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -22887,6 +22551,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1751 build/trans_presets.java:1760
+#: build/trans_presets.java:1769 build/trans_presets.java:1778
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -22905,7 +22569,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -22915,5 +22579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -22923,5 +22587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -22931,5 +22595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -22939,5 +22603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -22947,5 +22611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -22955,5 +22619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -22963,5 +22627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -22971,5 +22635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -22979,5 +22643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -22987,5 +22651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -22995,5 +22659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -23003,5 +22667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -23011,5 +22675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -23019,5 +22683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -23027,5 +22691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -23035,5 +22699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -23043,5 +22707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -23051,5 +22715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -23059,5 +22723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -23067,5 +22731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -23075,5 +22739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -23083,5 +22747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -23091,5 +22755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -23099,5 +22763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -23107,5 +22771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -23115,5 +22779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -23123,5 +22787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -23131,5 +22795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -23139,5 +22803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -23147,5 +22811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -23155,5 +22819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -23163,5 +22827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -23171,5 +22835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -23179,5 +22843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -23187,5 +22851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -23195,5 +22859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -23203,5 +22867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -23211,5 +22875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -23219,5 +22883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -23227,5 +22891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -23235,5 +22899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -23243,5 +22907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -23251,5 +22915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -23259,5 +22923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -23267,5 +22931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -23275,33 +22939,33 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3674 build/trans_style.java:3682
-#: build/trans_style.java:3690 build/trans_style.java:3698
-#: build/trans_style.java:3706 build/trans_style.java:3714
-#: build/trans_style.java:3722 build/trans_style.java:3730
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_style.java:3705 build/trans_style.java:3713
+#: build/trans_style.java:3721 build/trans_style.java:3729
+#: build/trans_style.java:3737 build/trans_style.java:3745
+#: build/trans_style.java:3753 build/trans_style.java:3761
+#: build/trans_style.java:3769 build/trans_style.java:3777
+#: build/trans_style.java:3785 build/trans_style.java:3793
+#: build/trans_style.java:3801 build/trans_style.java:3809
+#: build/trans_style.java:3817 build/trans_style.java:3825
+#: build/trans_style.java:3833 build/trans_style.java:3841
+#: build/trans_style.java:3849 build/trans_style.java:3857
+#: build/trans_style.java:3865 build/trans_style.java:3873
+#: build/trans_style.java:3881 build/trans_style.java:3889
+#: build/trans_style.java:3897 build/trans_style.java:3905
+#: build/trans_style.java:3913 build/trans_style.java:3921
+#: build/trans_style.java:3929 build/trans_style.java:3937
+#: build/trans_style.java:3945 build/trans_style.java:3953
+#: build/trans_style.java:3961 build/trans_style.java:3969
+#: build/trans_style.java:3977 build/trans_style.java:3985
+#: build/trans_style.java:3993 build/trans_style.java:4001
+#: build/trans_style.java:4009 build/trans_style.java:4017
+#: build/trans_style.java:4025 build/trans_style.java:4033
+#: build/trans_style.java:4041 build/trans_style.java:4049
+#: build/trans_style.java:4057 build/trans_style.java:4065
+#: build/trans_style.java:4073
 msgid "sport"
 msgstr "sport"
@@ -23311,225 +22975,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "archery"
-msgstr "tiro con l'arco"
-
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+msgstr "tiro con l''arco"
+
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "equestrian"
 msgstr "sport_equestri"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "football"
 msgstr "football_americano"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1755
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1756
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1764
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1765
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1773
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1774
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1782
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1783
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1788
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1789
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1795
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:1796
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1797
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -23568,21 +23232,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "type"
 msgstr "tipo"
@@ -23621,203 +23285,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "pitch"
 msgstr "campo_sportivo"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "sports_centre"
 msgstr "centro_sportivo"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
-#: build/trans_presets.java:2065 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2095
-#: build/trans_presets.java:2101 build/trans_presets.java:2107
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
 msgid "track"
 msgstr "tracciato"
 
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1802
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1803
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1808
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1809
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1814
 msgid "Archery"
-msgstr "Tiro con l'arco"
+msgstr "Tiro con l''arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1815
 msgid "Edit Archery"
-msgstr "Modifica tiro con l'arco"
-
-#: build/trans_presets.java:1959
+msgstr "Modifica tiro con l''arco"
+
+#: build/trans_presets.java:1820
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1821
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1826
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1827
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1833
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1838
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1839
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1844
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1845
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1850
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1851
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1856
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1857
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1862
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1863
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:1868
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:1869
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:1874
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:1875
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:1880
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:1881
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -23825,56 +23489,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:1888
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:1895
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -23882,182 +23546,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:1897
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:1903
 msgid "Sport (Ball)"
 msgstr "Sport (Pallone)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1904
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:1905
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:1910
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:1911
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:1916
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:1917
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1922
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:1923
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:1928
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:1929
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:1934
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:1935
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:1938
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:1940
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:1941
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:1946
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:1947
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:1952
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:1953
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:1958
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:1959
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:1964
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:1965
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:1970
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:1971
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:1976
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:1977
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:1982
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:1983
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:1988
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:1989
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:1994
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:1995
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2000
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2001
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2008
 msgid "Man-Made"
 msgstr "Artificiale"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2009
 msgid "Buildings"
 msgstr "Edifici"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2010
 msgid "Building"
 msgstr "Palazzo"
@@ -24065,5 +23729,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2013
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -24071,10 +23735,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2015
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2019
 msgid "Town hall"
 msgstr "Municipio"
@@ -24082,10 +23746,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2021
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2025
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -24093,10 +23757,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2027
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2031
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -24105,10 +23769,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2034
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2038
 msgid "Prison"
 msgstr "Prigione"
@@ -24117,10 +23781,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2041
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2045
 msgid "Police"
 msgstr "Polizia"
@@ -24130,10 +23794,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2049
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2053
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -24142,10 +23806,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2056
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2060
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -24153,5 +23817,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2062
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -24159,15 +23823,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2068
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2069
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2073
 msgid "School"
 msgstr "Scuola"
@@ -24175,10 +23839,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2075
 msgid "Edit School"
 msgstr "Modifica scuola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2079
 msgid "University"
 msgstr "Università"
@@ -24186,10 +23850,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2081
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2085
 msgid "College"
 msgstr "Scuola superiore"
@@ -24197,5 +23861,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2087
 msgid "Edit College"
 msgstr "Modifica scuola superiore"
@@ -24203,5 +23867,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2092
 msgid "Cinema"
 msgstr "Cinema"
@@ -24210,10 +23874,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2095
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2099
 msgid "Library"
 msgstr "Biblioteca"
@@ -24222,9 +23886,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2102
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2107
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -24232,10 +23896,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2109
 msgid "Edit Arts Centre"
-msgstr "Modifica centro d'arte"
+msgstr "Modifica centro d''arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2113
 msgid "Theatre"
 msgstr "Teatro"
@@ -24244,10 +23908,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2116
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2120
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -24257,5 +23921,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2124
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -24264,6 +23928,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "Religion"
 msgstr "Religione"
@@ -24272,66 +23936,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "bahai"
 msgstr "Bahaista"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "hindu"
 msgstr "Induista"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "jain"
 msgstr "Giainista"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "taoist"
 msgstr "Taoista"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "unitarian"
 msgstr "Unitariana"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "zoroastrian"
 msgstr "Zoroastrista"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "Denomination"
 msgstr "Denominazione"
@@ -24340,81 +24004,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "shia"
 msgstr "Sciita"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "sunni"
 msgstr "Sunnita"
 
 #. <separator/>
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2132
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -24423,5 +24087,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2135
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -24429,5 +24093,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2137
 msgid "House number"
 msgstr "Numero civico"
@@ -24435,25 +24099,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2139
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2140
 msgid "Street name"
 msgstr "Nome Strada"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2141
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2142
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2143
 msgid "Country code"
 msgstr "Codice nazione"
@@ -24462,5 +24126,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2288
+#: build/trans_presets.java:2149
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -24468,61 +24132,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2154
 msgid "Man Made"
 msgstr "Artificiale"
 
 #. group "Man Made"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2155
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2156
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2160
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2161
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2166
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
@@ -24530,25 +24194,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2170
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2171
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2175
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2176
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2180
 msgid "Lighthouse"
 msgstr "Faro"
@@ -24556,10 +24220,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2182
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2186
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -24567,10 +24231,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2188
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2192
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -24579,37 +24243,37 @@
 #. <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:2334
+#: build/trans_presets.java:2195
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2337 build/trans_presets.java:2379
+#: build/trans_presets.java:2198 build/trans_presets.java:2240
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "heat"
 msgstr "calore"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2201
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -24619,10 +24283,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2205
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2209
 msgid "Crane"
 msgstr "Gru permanente"
@@ -24630,10 +24294,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2211
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2215
 msgid "Beacon"
 msgstr "Torre radio"
@@ -24641,10 +24305,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2217
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2221
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -24652,10 +24316,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2223
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2227
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -24663,5 +24327,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
@@ -24669,5 +24333,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2234
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -24677,35 +24341,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2238
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2243
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -24714,10 +24378,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2246
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2252
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -24726,5 +24390,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2255
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -24732,10 +24396,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2397 build/trans_presets.java:2414
+#: build/trans_presets.java:2258 build/trans_presets.java:2275
 msgid "Line reference"
 msgstr "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2260
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -24746,23 +24410,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2265
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2266
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2266
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2267
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2269
 msgid "Power Line"
 msgstr "Linea elettrica"
@@ -24771,79 +24435,79 @@
 #. <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:2411
+#: build/trans_presets.java:2272
 msgid "Edit Power Line"
 msgstr "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "line"
 msgstr "linea"
 
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "minor_line"
 msgstr "linea minore"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2276
 msgid "Voltage"
 msgstr "Tensione"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2277
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 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:2417
+#: build/trans_presets.java:2278
 msgid "single"
 msgstr "singola"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "double"
 msgstr "doppia"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "triple"
 msgstr "tripla"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "quad"
 msgstr "quadrupla"
 
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2281
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2282
 msgid "Toilets"
 msgstr "Bagni pubblici"
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2289
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2429 build/trans_presets.java:2559
+#: build/trans_presets.java:2290 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2292
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2297
 msgid "Telephone"
 msgstr "Telefono"
@@ -24852,5 +24516,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2300
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -24858,5 +24522,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2442 build/trans_presets.java:2560
+#: build/trans_presets.java:2303 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Monete"
@@ -24864,5 +24528,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2443 build/trans_presets.java:2561
+#: build/trans_presets.java:2304 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Note"
@@ -24870,5 +24534,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2444 build/trans_presets.java:2562
+#: build/trans_presets.java:2305 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -24876,5 +24540,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2445 build/trans_presets.java:2563
+#: build/trans_presets.java:2306 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -24882,15 +24546,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2446 build/trans_presets.java:2564
+#: build/trans_presets.java:2307 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2308
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2310
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -24899,5 +24563,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2313
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -24905,30 +24569,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2315
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2316
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2317
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2318
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2319
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2320
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
@@ -24937,31 +24601,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2325
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "brown"
 msgstr "marrone"
@@ -24971,7 +24635,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -24981,5 +24645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -24989,5 +24653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -24997,5 +24661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -25005,5 +24669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -25013,5 +24677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -25021,5 +24685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -25029,5 +24693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -25037,42 +24701,42 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2466 build/trans_style.java:3126
-#: build/trans_style.java:3134 build/trans_style.java:3142
-#: build/trans_style.java:3150 build/trans_style.java:3158
-#: build/trans_style.java:3205 build/trans_style.java:3213
-#: build/trans_style.java:3311 build/trans_style.java:3319
+#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_style.java:3165 build/trans_style.java:3173
+#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3236 build/trans_style.java:3244
+#: build/trans_style.java:3342 build/trans_style.java:3350
 msgid "green"
 msgstr "verde"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "gray"
 msgstr "grigio"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2328
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2330
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2331
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -25081,30 +24745,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2472 build/trans_presets.java:2948
+#: build/trans_presets.java:2333 build/trans_presets.java:2809
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2335
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2336
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2338
 msgid "Fountain"
 msgstr "Fontana"
@@ -25113,10 +24777,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2341
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2345
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -25125,10 +24789,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2348
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2352
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -25136,15 +24800,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2354
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2360
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2361
 msgid "Car Dealer"
 msgstr "Concessionaria"
@@ -25152,10 +24816,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2363
 msgid "Edit Car Shop"
 msgstr "Modifica concessionaria"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2368
 msgid "Bike Dealer"
 msgstr "Negozio di biciclette"
@@ -25164,28 +24828,28 @@
 #. <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:2510
+#: build/trans_presets.java:2371
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2375
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2376
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2381
 msgid "Chemist"
 msgstr "Farmacista"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2382
 msgid "Edit Chemist"
 msgstr "Modifica farmacista"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2387
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -25193,9 +24857,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2389
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2394
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -25203,27 +24867,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2396
 msgid "Edit Kiosk"
 msgstr "Modificia Chiosco"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2401
 msgid "Book Store"
 msgstr "Libreria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2402
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2407
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2408
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -25231,5 +24895,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -25237,88 +24901,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Macellaio"
@@ -25326,9 +24990,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2435
 msgid "Baker"
 msgstr "Panificio"
@@ -25336,9 +25000,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2437
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2442
 msgid "Florist"
 msgstr "Fiorista"
@@ -25346,18 +25010,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2444
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2449
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2450
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
-#: build/trans_presets.java:2594
+#: build/trans_presets.java:2455
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -25365,54 +25029,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2457
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
-#: build/trans_presets.java:2601
+#: build/trans_presets.java:2462
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2463
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2468
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2469
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2474
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2475
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2480
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2481
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2486
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2487
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2492
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -25420,9 +25084,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2494
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2499
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -25430,9 +25094,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2501
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2506
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -25440,54 +25104,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2508
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2513
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2514
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2519
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2520
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2525
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2526
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2531
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2532
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2537
 msgid "Video"
 msgstr "Videoteca"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2538
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2543
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -25495,9 +25159,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2545
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2550
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -25505,38 +25169,38 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2552
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2557
 msgid "Outdoor"
-msgstr "Sport all'aperto"
+msgstr "Sport all''aperto"
 
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2559
 msgid "Edit Outdoor Shop"
-msgstr "Modifica sport all'aperto"
+msgstr "Modifica sport all''aperto"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2565
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2570
 msgid "Optician"
 msgstr "Ottico"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2571
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2578
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2579
 msgid "Bank"
 msgstr "Banca"
@@ -25544,14 +25208,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2581
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:2725 build/trans_presets.java:2734
+#: build/trans_presets.java:2586 build/trans_presets.java:2595
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2588
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -25559,5 +25223,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2590
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -25565,15 +25229,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2597
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2602
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2603
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -25581,18 +25245,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2605
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2610
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2611
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2616
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -25600,5 +25264,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2618
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -25606,9 +25270,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2620
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2624
 msgid "Hospital"
 msgstr "Ospedale"
@@ -25616,10 +25280,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2626
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2630
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -25628,5 +25292,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2633
 msgid "Edit Emergency Access Point"
 msgstr "Modifica colonnina SOS"
@@ -25635,20 +25299,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2636
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2637
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2639
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2640
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -25656,5 +25320,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2643
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -25663,64 +25327,64 @@
 #. <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:2785
+#: build/trans_presets.java:2646
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2653
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2654
 msgid "Places"
 msgstr "Luoghi"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2655
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2656
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2661
 msgid "Country"
 msgstr "Nazione"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2662
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2667
 msgid "State"
 msgstr "Regione"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2668
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2673
 msgid "Region"
 msgstr "Provincia"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2674
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2679
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2680
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -25728,15 +25392,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2686
 msgid "City"
 msgstr "Città"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2687
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2692
 msgid "Town"
 msgstr "Paese"
@@ -25744,10 +25408,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2694
 msgid "Edit Town"
 msgstr "Modifica paese"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2699
 msgid "Suburb"
 msgstr "Quartiere"
@@ -25755,25 +25419,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2701
 msgid "Edit Suburb"
 msgstr "Modifica quartiere"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2706
 msgid "Village"
 msgstr "Frazione"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2707
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2712
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2713
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
@@ -25781,5 +25445,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2719
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
@@ -25787,10 +25451,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2721
 msgid "Edit Locality"
 msgstr "Modifica località (luogo con nome, non popolato)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2726
 msgid "Island"
 msgstr "Isola"
@@ -25798,10 +25462,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2728
 msgid "Edit Island"
 msgstr "Modifica isola"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2733
 msgid "Islet"
 msgstr "Isoletta"
@@ -25809,5 +25473,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2735
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
@@ -25815,5 +25479,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2741
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -25821,10 +25485,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2743
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2747
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -25832,10 +25496,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2749
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2754
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -25843,10 +25507,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2756
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2761
 msgid "Volcano"
 msgstr "Vulcano"
@@ -25854,70 +25518,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2763
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2769
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2770
 msgid "National"
 msgstr "Nazionale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2771
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2776
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:2777
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2921
+#: build/trans_presets.java:2782
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2783
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2788
 msgid "Political"
 msgstr "Politico"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2789
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2794
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2795
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2801
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2802
 msgid "Tree"
 msgstr "Albero"
@@ -25926,15 +25590,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2805
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2810
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2812
 msgid "Wood"
 msgstr "Bosco"
@@ -25943,5 +25607,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2815
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -25949,17 +25613,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2820
 msgid "Forest"
 msgstr "Foresta"
@@ -25968,14 +25632,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2823
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2829
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2830
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -25983,25 +25647,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2835
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2836
 msgid "Edit Scree"
 msgstr "Modifica ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2840
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2841
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2845
 msgid "Fell"
 msgstr "Prato alpino"
@@ -26009,10 +25673,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2847
 msgid "Edit Fell"
 msgstr "Modifica prato alpino"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2851
 msgid "Heath"
 msgstr "Brughiera"
@@ -26020,5 +25684,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2853
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -26026,5 +25690,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2858
 msgid "Farmyard"
 msgstr "Aia"
@@ -26033,45 +25697,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2861
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2866
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2867
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:2872
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:2873
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:2878
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2879
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:2884
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2885
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -26080,25 +25744,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3030
+#: build/trans_presets.java:2891
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:2892
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:2896
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:2897
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2902
 msgid "Village Green"
 msgstr "Village Green"
@@ -26106,10 +25770,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:2904
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:2909
 msgid "Common"
 msgstr "Area comune (UK)"
@@ -26117,20 +25781,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:2911
 msgid "Edit Common"
 msgstr "Modifica area comune (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2915
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:2916
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:2920
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -26138,5 +25802,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:2922
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -26144,15 +25808,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:2928
 msgid "Residential area"
 msgstr "Area residenziale"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:2929
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:2934
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -26160,9 +25824,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:2936
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:2942
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -26170,39 +25834,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2944
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:2951
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:2952
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:2957
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:2958
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:2963
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:2964
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:2969
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -26210,15 +25874,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:2971
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:2976
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3116
+#: build/trans_presets.java:2977
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -26226,50 +25890,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2983
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:2984
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:2989
 msgid "Brownfield"
-msgstr "Ridestinazione d'uso"
+msgstr "Ridestinazione d''uso"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:2990
 msgid "Edit Brownfield Landuse"
-msgstr "Modifica area di ridestinazione d'uso"
+msgstr "Modifica area di ridestinazione d''uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:2995
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:2996
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:3001
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3002
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3007
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3008
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
@@ -26279,5 +25943,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3021
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -26286,10 +25950,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3027
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3028
 msgid "inner segment"
 msgstr "segmento interno"
@@ -26297,5 +25961,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3031
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -26304,5 +25968,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3034
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -26310,34 +25974,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -26346,15 +26010,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3041
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3042
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3043
 msgid "to way"
 msgstr "verso il percorso"
@@ -26362,5 +26026,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3185
+#: build/trans_presets.java:3046
 msgid "Route"
 msgstr "Percorso"
@@ -26369,5 +26033,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3049
 msgid "Edit Route"
 msgstr "Modifica un percorso"
@@ -26375,5 +26039,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "Route type"
 msgstr "Tipo di percorso"
@@ -26385,5 +26049,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -26399,5 +26063,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -26407,5 +26071,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -26416,5 +26080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -26427,7 +26091,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -26437,5 +26101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -26445,5 +26109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -26453,5 +26117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -26461,8 +26125,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3190 build/trans_style.java:233
+#: build/trans_presets.java:3051 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -26472,17 +26136,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "ski"
 msgstr "sci"
@@ -26493,5 +26157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -26507,5 +26171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -26515,5 +26179,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -26522,5 +26186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -26530,5 +26194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -26539,8 +26203,8 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3190 build/trans_style.java:247
+#: build/trans_presets.java:3051 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -26549,13 +26213,9 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3190
-msgid "hiking"
-msgstr "escursionismo"
-
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "detour"
 msgstr "deviazione"
@@ -26566,13 +26226,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3190 build/trans_style.java:1193
+#: build/trans_presets.java:3051 build/trans_style.java:1208
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3054
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -26580,31 +26240,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3057
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "Route state"
 msgstr "Stato del percorso"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3060
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -26613,30 +26273,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3202
+#: build/trans_presets.java:3063
 msgid "route segment"
 msgstr "segmento di percorso"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3064
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3065
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3066
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3067
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3068
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -26679,9 +26339,9 @@
 #. 7. scale_min / scale_max
 #. - zoom scale for display
-#. 
+#.
 #. Using both area and line attributes for the same key/value pair does work. For areas
 #. first the best matching area rule is searched and the best matching line rule is
 #. connected with it. They need not have the same key/value pair.
-#. 
+#.
 #. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
 #. If both are given, the color name is introduced in preferences with that value. If only
@@ -26689,5 +26349,5 @@
 #. modified preferences or previous value is used. The 6 hex digit color code can also
 #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#. 
+#.
 #. Linemod's are drawn over or under the line they are associated with and modify the
 #. appearance. There can be multiple linemod's for one way (contrary to line styles,
@@ -26697,8 +26357,8 @@
 #. on the sides of the way or the waystyles itself must use alpha channel (which may
 #. look strange).
-#. 
+#.
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
 #. in case they have same priority! Using priority settings helps to solve conflicts.
-#. 
+#.
 #. For external files the <rules> should have following elements:
 #. - author           the author of the style
@@ -26712,5 +26372,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -26718,5 +26378,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -26765,6 +26425,6 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
 #. <rule>
@@ -26844,5 +26504,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -26852,16 +26512,16 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--abutters tags -->
-#. 
+#.
 #. <!--accessories tags -->
-#. 
+#.
 #. <!--properties tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4056
+#: build/trans_style.java:633 build/trans_style.java:4087
 msgid "deprecated"
 msgstr "deprecato"
@@ -26872,5 +26532,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -26879,5 +26539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -26886,5 +26546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -26900,5 +26560,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -26912,5 +26572,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -26919,5 +26579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -26926,5 +26586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -26933,5 +26593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -26940,5 +26600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -26947,5 +26607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -26954,5 +26614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -26961,5 +26621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -26968,5 +26628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -26975,5 +26635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -26982,5 +26642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -26989,5 +26649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -26996,5 +26656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -27003,5 +26663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -27010,5 +26670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -27185,7 +26845,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -27199,5 +26859,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -27207,7 +26867,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -27217,5 +26877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -27225,5 +26885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -27233,5 +26893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -27241,5 +26901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -27255,5 +26915,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -27263,5 +26923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -27271,5 +26931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -27279,5 +26939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -27287,5 +26947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -27295,5 +26955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -27303,5 +26963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -27312,12 +26972,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:756 build/trans_style.java:1167
-#: build/trans_style.java:1231 build/trans_style.java:1239
-#: build/trans_style.java:1248 build/trans_style.java:1256
-#: build/trans_style.java:1264 build/trans_style.java:1265
-#: build/trans_style.java:1272
+#: build/trans_style.java:756 build/trans_style.java:1182
+#: build/trans_style.java:1246 build/trans_style.java:1254
+#: build/trans_style.java:1263 build/trans_style.java:1271
+#: build/trans_style.java:1279 build/trans_style.java:1280
+#: build/trans_style.java:1287
 msgid "rail"
 msgstr "ferrovia"
@@ -27328,5 +26988,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -27335,5 +26995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -27343,5 +27003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -27350,5 +27010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -27357,5 +27017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -27364,5 +27024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -27371,5 +27031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -27378,5 +27038,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -27385,5 +27045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -27392,5 +27052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -27399,5 +27059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -27406,5 +27066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -27418,5 +27078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -27430,5 +27090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -27437,5 +27097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -27449,5 +27109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -27462,5 +27122,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -27475,5 +27135,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -27487,8 +27147,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1034
+#: build/trans_style.java:1041
 msgid "dock"
 msgstr "darsena"
@@ -27499,5 +27159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -27506,5 +27166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -27513,5 +27173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -27521,5 +27181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -27528,5 +27188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -27535,5 +27195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -27542,13 +27202,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
 #. <icon annotate="true" src="nautical/weir.png"/>
-#. color manmade
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. 
+#. color rapids
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -27559,5 +27219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -27567,7 +27227,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -27577,5 +27237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -27585,5 +27245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -27593,5 +27253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -27602,5 +27262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -27609,5 +27269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -27617,5 +27277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -27625,5 +27285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -27633,5 +27293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -27641,5 +27301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -27649,5 +27309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -27657,5 +27317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -27665,5 +27325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -27673,28 +27333,50 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1057 build/trans_style.java:1086
-#: build/trans_style.java:1094 build/trans_style.java:1095
-#: build/trans_style.java:1103 build/trans_style.java:1580
-#: build/trans_style.java:1587 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1636
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1667
-#: build/trans_style.java:1676 build/trans_style.java:1684
-#: build/trans_style.java:1692 build/trans_style.java:1700
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_works"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1064 build/trans_style.java:1093
+#: build/trans_style.java:1109 build/trans_style.java:1110
+#: build/trans_style.java:1118 build/trans_style.java:1603
+#: build/trans_style.java:1610 build/trans_style.java:1619
+#: build/trans_style.java:1627 build/trans_style.java:1659
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1690
+#: build/trans_style.java:1699 build/trans_style.java:1707
+#: build/trans_style.java:1715 build/trans_style.java:1723
+#: build/trans_style.java:1731
 msgid "manmade"
 msgstr "costruzioni umane"
 
 #. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="rapids"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1101
+#, fuzzy
+msgid "rapids"
+msgstr "Battista"
+
+#. color manmade
 #. <!-- it's not possible to have both line and area, line seems more likely -->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -27704,5 +27386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -27711,5 +27393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -27719,5 +27401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -27726,5 +27408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -27734,5 +27416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -27742,10 +27424,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1113 build/trans_style.java:1128
-#: build/trans_style.java:1143 build/trans_style.java:1151
-#: build/trans_style.java:1159
+#: build/trans_style.java:1128 build/trans_style.java:1143
+#: build/trans_style.java:1158 build/trans_style.java:1166
+#: build/trans_style.java:1174
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -27756,5 +27438,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -27765,13 +27447,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1176 build/trans_style.java:1185
+#: build/trans_style.java:1191 build/trans_style.java:1200
 msgid "otherrail"
 msgstr "altro_ferrovia"
 
 #. color otherrail
-#: build/trans_style.java:1177
+#: build/trans_style.java:1192
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -27782,5 +27464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -27790,5 +27472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -27801,5 +27483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -27807,7 +27489,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1201 build/trans_style.java:1211
-#: build/trans_style.java:1212 build/trans_style.java:1222
-#: build/trans_style.java:1223
+#: build/trans_style.java:1216 build/trans_style.java:1226
+#: build/trans_style.java:1227 build/trans_style.java:1237
+#: build/trans_style.java:1238
 msgid "oldrail"
 msgstr "vecchia_ferrovia"
@@ -27818,5 +27500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -27825,5 +27507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -27832,5 +27514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -27839,7 +27521,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -27850,9 +27532,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1303 build/trans_style.java:1304
-#: build/trans_style.java:1336
+#: build/trans_style.java:1318 build/trans_style.java:1319
+#: build/trans_style.java:1351
 msgid "aeroway"
 msgstr "aeroporto"
@@ -27863,8 +27545,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1327
 msgid "terminal"
 msgstr "terminal"
@@ -27875,5 +27557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -27883,8 +27565,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1320 build/trans_style.java:1328
+#: build/trans_style.java:1335 build/trans_style.java:1343
 msgid "aeroway_dark"
 msgstr "aeroporto (scuro)"
@@ -27895,8 +27577,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1344
+#: build/trans_style.java:1359
 msgid "aeroway_light"
 msgstr "aeroporto (chiaro)"
@@ -27907,5 +27589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -27914,5 +27596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -27921,7 +27603,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -27931,5 +27613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -27939,5 +27621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -27947,5 +27629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -27955,25 +27637,33 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1368 build/trans_style.java:1376
-#: build/trans_style.java:1384 build/trans_style.java:1392
-#: build/trans_style.java:1400
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="pylon"/>
+#: build/trans_style.java:1383 build/trans_style.java:1391
+#: build/trans_style.java:1399 build/trans_style.java:1407
+#: build/trans_style.java:1415 build/trans_style.java:1423
 msgid "aerialway"
 msgstr "struttura_di_risalita"
 
 #. color aerialway
-#. <icon annotate="true" src="transport/aerialway/station.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. 
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- piste tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1410 build/trans_style.java:1411
+#: build/trans_style.java:1433 build/trans_style.java:1434
 msgid "piste_easy"
 msgstr "pista_facile"
@@ -27984,9 +27674,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1419 build/trans_style.java:1420
+#: build/trans_style.java:1442 build/trans_style.java:1443
 msgid "piste_intermediate"
 msgstr "pista_intermedia"
@@ -27997,9 +27687,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1428 build/trans_style.java:1429
+#: build/trans_style.java:1451 build/trans_style.java:1452
 msgid "piste_advanced"
 msgstr "pista_avanzata"
@@ -28010,9 +27700,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1437 build/trans_style.java:1438
+#: build/trans_style.java:1460 build/trans_style.java:1461
 msgid "piste_expert"
 msgstr "pista esperto"
@@ -28023,9 +27713,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1446 build/trans_style.java:1447
+#: build/trans_style.java:1469 build/trans_style.java:1470
 msgid "piste_freeride"
 msgstr "pista libera"
@@ -28036,9 +27726,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1455 build/trans_style.java:1456
+#: build/trans_style.java:1478 build/trans_style.java:1479
 msgid "piste_novice"
 msgstr "pista_principiante"
@@ -28049,7 +27739,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -28059,5 +27749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -28066,5 +27756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -28074,5 +27764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -28082,5 +27772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -28090,5 +27780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -28098,5 +27788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -28106,5 +27796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -28114,5 +27804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -28122,5 +27812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -28130,5 +27820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -28138,5 +27828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -28146,5 +27836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -28154,15 +27844,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1467 build/trans_style.java:1481
-#: build/trans_style.java:1489 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538 build/trans_style.java:1546
-#: build/trans_style.java:1554 build/trans_style.java:1562
-#: build/trans_style.java:1570
+#: build/trans_style.java:1490 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1521
+#: build/trans_style.java:1529 build/trans_style.java:1537
+#: build/trans_style.java:1545 build/trans_style.java:1553
+#: build/trans_style.java:1561 build/trans_style.java:1569
+#: build/trans_style.java:1577 build/trans_style.java:1585
+#: build/trans_style.java:1593
 msgid "power"
 msgstr "elettricità"
@@ -28172,9 +27862,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1611 build/trans_style.java:1612
+#: build/trans_style.java:1634 build/trans_style.java:1635
 msgid "pier"
 msgstr "pontile"
@@ -28185,8 +27875,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1620
+#: build/trans_style.java:1643
 msgid "pipeline"
 msgstr "conduttura"
@@ -28196,7 +27886,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -28206,5 +27896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -28214,5 +27904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -28222,5 +27912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -28230,5 +27920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -28238,5 +27928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -28246,5 +27936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -28254,5 +27944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -28262,5 +27952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -28270,5 +27960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -28278,5 +27968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -28286,5 +27976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -28294,5 +27984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -28302,5 +27992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -28310,5 +28000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -28318,5 +28008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -28326,17 +28016,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742 build/trans_style.java:1750
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1830 build/trans_style.java:1838
-#: build/trans_style.java:1846
+#: build/trans_style.java:1741 build/trans_style.java:1749
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1797 build/trans_style.java:1805
+#: build/trans_style.java:1813 build/trans_style.java:1821
+#: build/trans_style.java:1829 build/trans_style.java:1837
+#: build/trans_style.java:1845 build/trans_style.java:1853
+#: build/trans_style.java:1861 build/trans_style.java:1869
+#: build/trans_style.java:1877
 msgid "leisure"
 msgstr "struttura per lo svago"
@@ -28346,9 +28036,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1758
+#: build/trans_style.java:1789
 msgid "marina"
 msgstr "porto turistico"
@@ -28358,7 +28048,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -28368,5 +28058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -28376,5 +28066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -28384,5 +28074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -28392,5 +28082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -28400,5 +28090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -28408,5 +28098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -28416,5 +28106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -28424,5 +28114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -28432,5 +28122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -28440,14 +28130,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904 build/trans_style.java:1912
-#: build/trans_style.java:1920 build/trans_style.java:1928
-#: build/trans_style.java:1936
+#: build/trans_style.java:1887 build/trans_style.java:1895
+#: build/trans_style.java:1903 build/trans_style.java:1911
+#: build/trans_style.java:1919 build/trans_style.java:1927
+#: build/trans_style.java:1935 build/trans_style.java:1943
+#: build/trans_style.java:1951 build/trans_style.java:1959
+#: build/trans_style.java:1967
 msgid "amenity"
 msgstr "struttura di servizio"
@@ -28457,5 +28147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -28465,5 +28155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -28473,5 +28163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -28481,5 +28171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -28489,5 +28179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -28497,5 +28187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -28505,5 +28195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -28513,5 +28203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -28521,5 +28211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -28529,5 +28219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -28537,5 +28227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -28545,14 +28235,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008 build/trans_style.java:2015
-#: build/trans_style.java:2024 build/trans_style.java:2032
+#: build/trans_style.java:1975 build/trans_style.java:1983
+#: build/trans_style.java:1991 build/trans_style.java:1999
+#: build/trans_style.java:2007 build/trans_style.java:2015
+#: build/trans_style.java:2023 build/trans_style.java:2031
+#: build/trans_style.java:2039 build/trans_style.java:2046
+#: build/trans_style.java:2055 build/trans_style.java:2063
 msgid "amenity_traffic"
 msgstr "servizio al traffico"
@@ -28562,5 +28252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -28569,5 +28259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -28577,5 +28267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -28584,5 +28274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -28592,5 +28282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -28600,5 +28290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -28608,5 +28298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -28615,5 +28305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -28623,5 +28313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -28631,5 +28321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -28639,5 +28329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -28647,5 +28337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -28654,5 +28344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -28661,5 +28351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -28668,5 +28358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -28675,5 +28365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -28682,5 +28372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -28689,5 +28379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -28696,5 +28386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -28703,5 +28393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -28710,5 +28400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -28717,5 +28407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -28724,5 +28414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -28731,5 +28421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -28738,5 +28428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -28746,5 +28436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -28754,5 +28444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -28762,5 +28452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -28770,5 +28460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -28778,5 +28468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -28786,5 +28476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -28794,5 +28484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -28802,5 +28492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -28810,5 +28500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -28819,5 +28509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -28827,5 +28517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -28835,5 +28525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -28843,5 +28533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -28851,5 +28541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -28859,5 +28549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -28867,5 +28557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -28875,5 +28565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -28883,5 +28573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -28891,5 +28581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -28899,5 +28589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -28907,5 +28597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -28915,5 +28605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -28923,5 +28613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -28931,5 +28621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -28939,5 +28629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -28947,5 +28637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -28955,5 +28645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -28963,5 +28653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -28971,5 +28661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -28978,27 +28668,27 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2047 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2093 build/trans_style.java:2101
-#: build/trans_style.java:2109 build/trans_style.java:2117
-#: build/trans_style.java:2232 build/trans_style.java:2240
-#: build/trans_style.java:2247 build/trans_style.java:2256
-#: build/trans_style.java:2264 build/trans_style.java:2272
-#: build/trans_style.java:2280 build/trans_style.java:2288
-#: build/trans_style.java:2296 build/trans_style.java:2304
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2407
-#: build/trans_style.java:2415 build/trans_style.java:2423
-#: build/trans_style.java:2431 build/trans_style.java:2439
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2471
-#: build/trans_style.java:2479 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2512 build/trans_style.java:2527
+#: build/trans_style.java:2078 build/trans_style.java:2093
+#: build/trans_style.java:2101 build/trans_style.java:2109
+#: build/trans_style.java:2124 build/trans_style.java:2132
+#: build/trans_style.java:2140 build/trans_style.java:2148
+#: build/trans_style.java:2263 build/trans_style.java:2271
+#: build/trans_style.java:2278 build/trans_style.java:2287
+#: build/trans_style.java:2295 build/trans_style.java:2303
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2335
+#: build/trans_style.java:2398 build/trans_style.java:2406
+#: build/trans_style.java:2414 build/trans_style.java:2423
+#: build/trans_style.java:2431 build/trans_style.java:2438
+#: build/trans_style.java:2446 build/trans_style.java:2454
+#: build/trans_style.java:2462 build/trans_style.java:2470
+#: build/trans_style.java:2478 build/trans_style.java:2486
+#: build/trans_style.java:2494 build/trans_style.java:2502
+#: build/trans_style.java:2510 build/trans_style.java:2518
+#: build/trans_style.java:2526 build/trans_style.java:2534
+#: build/trans_style.java:2543 build/trans_style.java:2558
 msgid "amenity_light"
 msgstr "struttura di servizio (chiaro)"
@@ -29008,5 +28698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -29016,5 +28706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -29024,12 +28714,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--natural tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2125 build/trans_style.java:2133
-#: build/trans_style.java:3372
+#: build/trans_style.java:2156 build/trans_style.java:2164
+#: build/trans_style.java:3403
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -29039,5 +28729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -29047,5 +28737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -29055,5 +28745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -29063,5 +28753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -29071,5 +28761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -29079,5 +28769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -29087,11 +28777,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2311 build/trans_style.java:2319
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2343 build/trans_style.java:2351
-#: build/trans_style.java:2359
+#: build/trans_style.java:2342 build/trans_style.java:2350
+#: build/trans_style.java:2358 build/trans_style.java:2367
+#: build/trans_style.java:2374 build/trans_style.java:2382
+#: build/trans_style.java:2390
 msgid "health"
 msgstr "salute"
@@ -29101,7 +28791,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -29111,5 +28801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -29119,5 +28809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -29127,5 +28817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -29135,5 +28825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -29143,5 +28833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -29151,5 +28841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -29159,5 +28849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -29167,5 +28857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -29175,5 +28865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -29183,5 +28873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -29191,5 +28881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -29199,5 +28889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -29207,5 +28897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -29215,5 +28905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -29223,5 +28913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -29231,5 +28921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -29239,5 +28929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -29247,5 +28937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -29255,5 +28945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -29263,5 +28953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -29271,5 +28961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -29279,5 +28969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -29287,5 +28977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -29295,5 +28985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -29303,5 +28993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -29311,5 +29001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -29319,5 +29009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -29327,5 +29017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -29335,5 +29025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -29343,5 +29033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -29351,5 +29041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -29359,5 +29049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -29367,5 +29057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -29375,5 +29065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -29383,5 +29073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -29391,5 +29081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -29399,5 +29089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -29407,5 +29097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -29415,5 +29105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -29423,5 +29113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -29431,5 +29121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -29439,31 +29129,31 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2537 build/trans_style.java:2545
-#: build/trans_style.java:2553 build/trans_style.java:2561
-#: build/trans_style.java:2569 build/trans_style.java:2577
-#: build/trans_style.java:2585 build/trans_style.java:2593
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 build/trans_style.java:2625
-#: build/trans_style.java:2633 build/trans_style.java:2641
-#: build/trans_style.java:2649 build/trans_style.java:2657
-#: build/trans_style.java:2665 build/trans_style.java:2673
-#: build/trans_style.java:2681 build/trans_style.java:2689
-#: build/trans_style.java:2697 build/trans_style.java:2705
-#: build/trans_style.java:2713 build/trans_style.java:2721
-#: build/trans_style.java:2729 build/trans_style.java:2737
-#: build/trans_style.java:2745 build/trans_style.java:2753
-#: build/trans_style.java:2761 build/trans_style.java:2769
-#: build/trans_style.java:2777 build/trans_style.java:2785
-#: build/trans_style.java:2793 build/trans_style.java:2801
-#: build/trans_style.java:2809 build/trans_style.java:2817
-#: build/trans_style.java:2825 build/trans_style.java:2833
-#: build/trans_style.java:2841 build/trans_style.java:2849
-#: build/trans_style.java:2857 build/trans_style.java:2865
-#: build/trans_style.java:2874
+#: build/trans_style.java:2568 build/trans_style.java:2576
+#: build/trans_style.java:2584 build/trans_style.java:2592
+#: build/trans_style.java:2600 build/trans_style.java:2608
+#: build/trans_style.java:2616 build/trans_style.java:2624
+#: build/trans_style.java:2632 build/trans_style.java:2640
+#: build/trans_style.java:2648 build/trans_style.java:2656
+#: build/trans_style.java:2664 build/trans_style.java:2672
+#: build/trans_style.java:2680 build/trans_style.java:2688
+#: build/trans_style.java:2696 build/trans_style.java:2704
+#: build/trans_style.java:2712 build/trans_style.java:2720
+#: build/trans_style.java:2728 build/trans_style.java:2736
+#: build/trans_style.java:2744 build/trans_style.java:2752
+#: build/trans_style.java:2760 build/trans_style.java:2768
+#: build/trans_style.java:2776 build/trans_style.java:2784
+#: build/trans_style.java:2792 build/trans_style.java:2800
+#: build/trans_style.java:2808 build/trans_style.java:2816
+#: build/trans_style.java:2824 build/trans_style.java:2832
+#: build/trans_style.java:2840 build/trans_style.java:2848
+#: build/trans_style.java:2856 build/trans_style.java:2864
+#: build/trans_style.java:2872 build/trans_style.java:2880
+#: build/trans_style.java:2888 build/trans_style.java:2896
+#: build/trans_style.java:2905
 msgid "shop"
 msgstr "negozio"
@@ -29473,7 +29163,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -29483,5 +29173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -29491,5 +29181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -29499,5 +29189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -29507,5 +29197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -29515,5 +29205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -29523,5 +29213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -29531,12 +29221,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2884 build/trans_style.java:2892
-#: build/trans_style.java:2900 build/trans_style.java:2908
-#: build/trans_style.java:2916 build/trans_style.java:2924
-#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2915 build/trans_style.java:2923
+#: build/trans_style.java:2931 build/trans_style.java:2939
+#: build/trans_style.java:2947 build/trans_style.java:2955
+#: build/trans_style.java:2963 build/trans_style.java:2971
 msgid "hotel"
 msgstr "hotel"
@@ -29546,5 +29236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -29554,5 +29244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -29562,5 +29252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -29570,5 +29260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -29578,5 +29268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -29586,5 +29276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -29595,5 +29285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -29603,5 +29293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -29611,5 +29301,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -29619,5 +29309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -29626,5 +29316,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -29633,13 +29323,13 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2989 build/trans_style.java:2997
-#: build/trans_style.java:3013 build/trans_style.java:3035
+#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2995 build/trans_style.java:3003
+#: build/trans_style.java:3011 build/trans_style.java:3019
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3044 build/trans_style.java:3066
 msgid "tourism"
 msgstr "turismo"
@@ -29649,7 +29339,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -29659,5 +29349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -29667,5 +29357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -29675,5 +29365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -29683,5 +29373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -29691,5 +29381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -29699,5 +29389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -29707,5 +29397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -29715,5 +29405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -29723,13 +29413,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3045 build/trans_style.java:3053
-#: build/trans_style.java:3061 build/trans_style.java:3069
-#: build/trans_style.java:3077 build/trans_style.java:3085
-#: build/trans_style.java:3093 build/trans_style.java:3101
-#: build/trans_style.java:3109 build/trans_style.java:3117
+#: build/trans_style.java:3076 build/trans_style.java:3084
+#: build/trans_style.java:3092 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3140 build/trans_style.java:3148
 msgid "historic"
 msgstr "attrazione storica"
@@ -29739,8 +29429,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3165
+#: build/trans_style.java:3196
 msgid "quarry"
 msgstr "cava/miniera"
@@ -29751,8 +29441,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3173
+#: build/trans_style.java:3204
 msgid "landfill"
 msgstr "discarica"
@@ -29763,5 +29453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -29771,8 +29461,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "basin"
 msgstr "bacino"
@@ -29783,8 +29473,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3197
+#: build/trans_style.java:3228
 msgid "forest"
 msgstr "foresta"
@@ -29795,8 +29485,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3260
 msgid "farmyard"
 msgstr "aia"
@@ -29807,6 +29497,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -29816,8 +29506,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3238 build/trans_style.java:3246
+#: build/trans_style.java:3269 build/trans_style.java:3277
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -29828,8 +29518,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3254
+#: build/trans_style.java:3285
 msgid "industrial"
 msgstr "industriale"
@@ -29840,10 +29530,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3262
+#: build/trans_style.java:3293
 msgid "brownfield"
-msgstr "ridestinazione d'uso"
+msgstr "ridestinazione d''uso"
 
 #. color brownfield
@@ -29852,8 +29542,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3270
+#: build/trans_style.java:3301
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -29864,8 +29554,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3309
 msgid "railland"
 msgstr "area ferroviaria"
@@ -29876,5 +29566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -29884,7 +29574,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -29894,5 +29584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -29902,5 +29592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -29910,5 +29600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -29918,11 +29608,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3295 build/trans_style.java:3330
-#: build/trans_style.java:3338 build/trans_style.java:3346
-#: build/trans_style.java:3354 build/trans_style.java:3362
+#: build/trans_style.java:3326 build/trans_style.java:3361
+#: build/trans_style.java:3369 build/trans_style.java:3377
+#: build/trans_style.java:3385 build/trans_style.java:3393
 msgid "military"
 msgstr "militare"
@@ -29933,8 +29623,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3303
+#: build/trans_style.java:3334
 msgid "cemetery"
 msgstr "cimitero"
@@ -29944,8 +29634,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3379
+#: build/trans_style.java:3410
 msgid "peak"
 msgstr "picco montuoso"
@@ -29956,9 +29646,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3388
+#: build/trans_style.java:3419
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -29968,9 +29658,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3396
+#: build/trans_style.java:3427
 msgid "volcano"
 msgstr "vulcano"
@@ -29980,5 +29670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -29989,5 +29679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -29997,5 +29687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -30005,5 +29695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -30013,5 +29703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -30021,12 +29711,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3404 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3429
-#: build/trans_style.java:3493 build/trans_style.java:3501
-#: build/trans_style.java:3509
+#: build/trans_style.java:3435 build/trans_style.java:3436
+#: build/trans_style.java:3444 build/trans_style.java:3460
+#: build/trans_style.java:3524 build/trans_style.java:3532
+#: build/trans_style.java:3540
 msgid "natural"
 msgstr "elemento naturale"
@@ -30036,9 +29726,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3421
+#: build/trans_style.java:3452
 msgid "scrub"
 msgstr "boscaglia"
@@ -30048,9 +29738,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3437
+#: build/trans_style.java:3468
 msgid "heath"
 msgstr "brughiera"
@@ -30060,9 +29750,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3445
+#: build/trans_style.java:3476
 msgid "woodarea"
 msgstr "area boschiva non gestita"
@@ -30072,9 +29762,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3477
+#: build/trans_style.java:3508
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -30084,9 +29774,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3516
 msgid "beach"
 msgstr "spiaggia"
@@ -30096,5 +29786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -30103,7 +29793,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -30113,5 +29803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -30121,5 +29811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -30129,5 +29819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -30137,5 +29827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -30145,5 +29835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -30153,5 +29843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -30161,11 +29851,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3525 build/trans_style.java:3533
-#: build/trans_style.java:3541 build/trans_style.java:3549
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573 build/trans_style.java:3581
+#: build/trans_style.java:3556 build/trans_style.java:3564
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
 msgid "route"
 msgstr "percorso"
@@ -30176,7 +29866,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -30186,5 +29876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -30227,5 +29917,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -30235,5 +29925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -30243,5 +29933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -30251,15 +29941,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3591 build/trans_style.java:3599
-#: build/trans_style.java:3603 build/trans_style.java:3607
-#: build/trans_style.java:3611 build/trans_style.java:3615
-#: build/trans_style.java:3619 build/trans_style.java:3623
-#: build/trans_style.java:3627 build/trans_style.java:3631
-#: build/trans_style.java:3635 build/trans_style.java:3640
-#: build/trans_style.java:3648 build/trans_style.java:3656
-#: build/trans_style.java:3664
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3634 build/trans_style.java:3638
+#: build/trans_style.java:3642 build/trans_style.java:3646
+#: build/trans_style.java:3650 build/trans_style.java:3654
+#: build/trans_style.java:3658 build/trans_style.java:3662
+#: build/trans_style.java:3666 build/trans_style.java:3671
+#: build/trans_style.java:3679 build/trans_style.java:3687
+#: build/trans_style.java:3695
 msgid "boundary"
 msgstr "confine"
@@ -30270,5 +29960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 #. XXX - maybe it's possible to use linemod's here?
@@ -30294,5 +29984,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -30303,11 +29993,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -30317,5 +30007,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -30325,5 +30015,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -30333,5 +30023,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -30341,5 +30031,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -30349,5 +30039,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -30357,5 +30047,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -30365,5 +30055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -30373,5 +30063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -30381,5 +30071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -30389,5 +30079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -30397,5 +30087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -30405,15 +30095,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4104 build/trans_style.java:4112
-#: build/trans_style.java:4120 build/trans_style.java:4128
-#: build/trans_style.java:4136 build/trans_style.java:4144
-#: build/trans_style.java:4152 build/trans_style.java:4160
-#: build/trans_style.java:4168 build/trans_style.java:4176
-#: build/trans_style.java:4184 build/trans_style.java:4192
-#: build/trans_style.java:4200
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231
 msgid "place"
 msgstr "luogo"
@@ -30423,5 +30113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -30430,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -30437,5 +30127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -30444,5 +30134,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -30451,5 +30141,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -30458,9 +30148,9 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4289 build/trans_style.java:4296
-#: build/trans_style.java:4303 build/trans_style.java:4310
+#: build/trans_style.java:4320 build/trans_style.java:4327
+#: build/trans_style.java:4334 build/trans_style.java:4341
 msgid "address"
 msgstr "indirizzo"
@@ -30551,5 +30241,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -30557,28 +30247,28 @@
 #. relation    - a relation
 #. *           - all data types
-#. 
+#.
 #. Message type can be:
 #. E            - an error
 #. W            - a warning
 #. I            - an low priority informational warning
-#. 
+#.
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
 #. ends with // signs. If an 'i' is appended, the regular expression is
 #. case insensitive.
-#. 
+#.
 #. The * sign indicates any string.
 #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
 #. handling for boolean values (yes, true, 0, false, no, ...).
-#. 
+#.
 #. Expression can be:
 #. !=          - the key/value combination does not match
 #. ==          - the key/value combination does match
-#. 
+#.
 #. To have more complicated expressions, multiple elements can be grouped together
 #. with an logical and (&&).
-#. 
+#.
 #. The comment at the end of a rule is displayed in validator description
-#. 
+#.
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
@@ -30693,5 +30383,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -30704,5 +30394,5 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#. 
+#.
 #. different forms for web access
 #. must be html:<url>
@@ -30727,6 +30417,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -30735,6 +30425,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -30749,6 +30439,6 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#. 
-#. 
+#.
+#.
 #. only for Czech Republic
 #: build/trans_wms.java:27
@@ -30762,6 +30452,6 @@
 
 #. 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
@@ -30781,6 +30471,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -30804,6 +30494,6 @@
 
 #. 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
 #: build/trans_wms.java:46
@@ -30816,4 +30506,243 @@
 msgstr "Sicilia - Italia"
 
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr ""
+#~ "L''estensione non può essere rimossa. Probabilmente è stata già "
+#~ "disabilitata"
+
+#~ msgid "Bridleway"
+#~ msgstr "Percorso per equitazione"
+
+#~ msgid "Cycleway"
+#~ msgstr "Cycleway"
+
+#~ msgid "Footway"
+#~ msgstr "Footway"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Track Grade 1"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Modifica Track Grade 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Track Grade 2"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Modifica Track Grade 2"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track Grade 3"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Modifica Track Grade 3"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Track Grade 4"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Modifica Track Grade 4"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Track Grade 5"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Modifica Track Grade 5"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Modifica percorso escursionistico"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Percorso escursionistico montano"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Modifica percorso escursionistico montano"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Modifica percorso escursionistico montano difficile"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Modifica percorso escursionistico alpino"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Modifica percorso escursionistico alpino difficile"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Modifica un percorso escursionistico alpino molto difficile"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Era richiesto un Id > 0, ottenuto {0}"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "il parametro ''{0}'' non deve essere nullo"
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "il parametro ''{0}'' non deve essere nullo"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "La/le strade selezionate hanno dei nodi fuori dalla zona dei dati "
+#~ "scaricati.\n"
+#~ "Alcuni nodi potrebbero essere cancellati accidentalmente.\n"
+#~ "Sei veramente sicuro di continuare ?"
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è "
+#~ "più presente"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Il parametro ''''{0}'''' non deve essere vuoto"
+
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "Era atteso un vettore di lunghezza 4, ottenuto {0}"
+
+#~ msgid "Exactly four doubles excpected in string, got {0}"
+#~ msgstr ""
+#~ "Erano attesi esattamente quattro numeri in doppia precisione nella "
+#~ "stringa, ottenuto {0}"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "Valore in doppia precisione ''''{0}'''' non valido"
+
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "Era atteso ID >= 0. Ottenuto {0}."
+
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "Era atteso il parametro ''''{0}'''' >= 0, ottenuto {1}"
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr ""
+#~ "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "Il parametro ''{0}'' non è una classe accettata. Ottenuto ''{1}''."
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}"
+
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr ""
+#~ "Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo 0.."
+#~ "{1}. Ottenuto ''{2}''."
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "parametro attualmente fuori scala: ottenuto {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "indice di colonna non atteso. Ottenuto {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "il parametro ''{0}'' non deve essere vuoto."
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr ""
+#~ "Era atteso il parametro ''''{0}'''' con etichette per una sola chiave. "
+#~ "Ottenuto {1}."
+
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Finestra non ancora creata. Invocare prima createInstance()"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Apri"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Chiuso"
+
+#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgstr ""
+#~ "Era atteso un valore intero > 0 per il parametro ''''{0}'''', ottenuto "
+#~ "''''{1}''''"
+
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflitto nei dati"
+
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>Si sta impostando un ruolo vuoto su {0} primitive.<br>Questo è "
+#~ "equivalente all'eliminazione dei ruoli di queste primitive.<br>Si "
+#~ "desidera veramente applicare il nuovo ruolo?</html>"
+
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+#~ msgstr "Atteso parametro ''{0}'' > 0. Valore attuale {1}."
+
+#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+#~ msgstr "atteso id nel parametro ''{0}'' > 0, valore attuale {1}."
+
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "immagine"
+#~ msgstr[1] "immagini"
+
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "Valore non valido per l''attributo ''''uid''''. Ottenuto ''{0}''."
+
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "Era attesa una istanza di OsmDataLayer. Ottenuto ''{0}''."
+
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
+
+#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Era atteso un valore di tipo intero > 0 per il parametro ''''{0}'''', "
+#~ "ottenuto {1}"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
+
+#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr ""
+#~ "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM."
+
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
+#~ msgid "Expected unique id > 0 for primitive id, got {0}"
+#~ msgstr ""
+#~ "Era atteso un identificativo unico > 0 per la primitiva, ottenuto {0}"
+
+#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Era atteso un valore di tipo intero lungo > 0 per il parametro "
+#~ "''''{0}'''', ottenuto {1}"
+
+#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
+#~ msgstr "Era atteso un parametro ''''{0}'''' di tipo nodo, ottenuto ''{1}''"
+
 #~ msgid "No data imported."
 #~ msgstr "Nessun dato importato."
@@ -30853,5 +30782,4 @@
 #~ msgstr "Cambia"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Risolvere {0} conflitti in {1} oggetti"
@@ -30872,5 +30800,4 @@
 #~ msgstr "posizione"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -30900,6 +30827,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
@@ -30932,8 +30859,7 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
-#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse oppure "
-#~ "premere Ctrl e le frecce, il punto (.) e la virgola (,)."
-
-#, java-format
+#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
+#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
+
 #~ msgid "Images for {0}"
 #~ msgstr "Immagini per {0}"
@@ -30942,9 +30868,7 @@
 #~ msgstr "Leggi GPX..."
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
@@ -30953,13 +30877,10 @@
 #~ msgstr "Non è stata trovata nessuna immagine con una data leggibile."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS inizio: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS fine: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "differenza attuale: {0}s"
@@ -30968,5 +30889,4 @@
 #~ msgstr "differenza fuso orario: "
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} in questa traccia."
@@ -30975,9 +30895,7 @@
 #~ msgstr "Sincronizza tempo"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Impossibile leggere la data nel file \"{0}\"."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
@@ -30999,5 +30917,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -31055,8 +30974,7 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati sul "
-#~ "server."
-
-#, java-format
+#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
+#~ "sul server."
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
@@ -31077,5 +30995,4 @@
 #~ msgstr "Unire i nodi con diffenti appartenenze?"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Errore durante il caricamento della pagina {0}"
@@ -31088,6 +31005,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
@@ -31150,8 +31067,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?"
+#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
+#~ "unirli?"
 
 #~ msgid "Expected closing parenthesis."
@@ -31179,6 +31097,6 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Posso fare una fotografia al mio ricevitore GPS.<br>Può questo essere "
-#~ "di aiuto?</html>"
+#~ "<html>Posso fare una fotografia al mio ricevitore GPS.<br>Può questo "
+#~ "essere di aiuto?</html>"
 
 #~ msgid "GPX Track loaded"
@@ -31200,5 +31118,4 @@
 #~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usa la preimpostazione ''{0}''"
@@ -31208,6 +31125,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
@@ -31223,5 +31140,4 @@
 #~ msgstr "errore nella richiesta di aggiornamento"
 
-#, java-format
 #~ msgid "requested: {0}"
 #~ msgstr "richiesta: {0}"
@@ -31230,9 +31146,7 @@
 #~ msgstr "errore nel caricamento dei metadati"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "identificativo rectifier={0}"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
@@ -31255,11 +31169,10 @@
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
-#~ "overwrite the existing ones."
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
 #~ msgstr ""
-#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM ha "
-#~ "i permessi per sovrascrivere quelle esistenti."
-
-#, java-format
+#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM "
+#~ "ha i permessi per sovrascrivere quelle esistenti."
+
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -31270,5 +31183,4 @@
 #~ msgstr "Tutte le estensioni sono state aggiornate."
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -31280,5 +31192,4 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Estensione non trovata: {0}."
@@ -31303,5 +31214,4 @@
 #~ msgstr "livello di ingrandimento"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
@@ -31321,6 +31231,6 @@
 #~ msgstr ""
 #~ "(Si può modificare il numero di giorni dopo il quale appare questo "
-#~ "avvertimento<br>specificando l'opzione di configurazione "
-#~ "'pluginmanager.warntime'.)"
+#~ "avvertimento<br>specificando l'opzione di configurazione 'pluginmanager."
+#~ "warntime'.)"
 
 #~ msgid "Edit Properties"
@@ -31366,5 +31276,4 @@
 #~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Si prega di segnalare il problema a {0}"
@@ -31375,6 +31284,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Includi i passi necessari per riprodurre l'errore (il più dettagliatamente "
-#~ "possibile)!"
+#~ "Includi i passi necessari per riprodurre l'errore (il più "
+#~ "dettagliatamente possibile)!"
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -31394,9 +31303,9 @@
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
 #~ msgstr ""
-#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione prima "
-#~ "di segnalare un problema."
+#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione "
+#~ "prima di segnalare un problema."
 
 #~ msgid "NullPointerException, possibly some missing tags."
@@ -31411,6 +31320,6 @@
 #~ msgid ""
 #~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded in "
-#~ "the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ "file.<br>The password is transfered in plain text to the server, encoded "
+#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
 #~ msgstr ""
 #~ "<html>ATTENZIONE: la password è memorizzata in chiaro nel file delle "
@@ -31425,5 +31334,4 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Impossibile leggere \"{0}\""
@@ -31433,6 +31341,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -31449,6 +31357,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -31460,6 +31368,6 @@
 #~ "preferenze di WMSplugin - queste saranno poi visualizzate nel menu WMS.\n"
 #~ "\n"
-#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze avanzate, "
-#~ "usando il seguente schema:\n"
+#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze "
+#~ "avanzate, usando il seguente schema:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -31471,9 +31379,9 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/rectifier/ "
-#~ ", è sufficiente inserire l'identificativo pertinente.\n"
+#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/"
+#~ "rectifier/ , è sufficiente inserire l'identificativo pertinente.\n"
 #~ "Per aggiungere una voce al menù relativo al rettificatore di mappe "
-#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo 73 "
-#~ "con l'identificativo della propria immagine: \n"
+#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo "
+#~ "73 con l'identificativo della propria immagine: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -31485,12 +31393,11 @@
 #~ msgstr "Saracinesca"
 
-#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr ""
 #~ "Il plugin {0} sembra danneggiato o non è stato possibile scaricarlo "
 #~ "automaticamente."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -31512,5 +31419,4 @@
 #~ msgstr "Membro vuoto nella relazione."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
@@ -31531,33 +31437,25 @@
 #~ msgstr "Seleziona i dati dell'utente"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Non-percorso ''{0}'' nel multi-poligono."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "il percorso multi-poligonale ''{0}'' non è chiuso."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Nessun percorso esterno per il multi-poligono ''{0}''."
 
-#, java-format
 #~ msgid "Deleted member ''{0}'' in relation."
 #~ msgstr "Eliminato il membro ''{0}'' nella relazione."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Percorso ''{0}'' con meno di due punti."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Il percorso interno ''{0}'' è esterno."
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Impossibile aprire la cartella delle preferenze: {0}"
@@ -31576,5 +31474,4 @@
 #~ "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti."
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Errore nell'interpretazione dei dati dell'indirizzo URL: \"{0}\""
@@ -31586,13 +31483,10 @@
 #~ msgstr "tavola"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autori: {0}"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Livelli: {0}"
 
-#, java-format
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Conflitti: {0}"
@@ -31611,8 +31505,8 @@
 #~ msgstr "Storico dell'elemento"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
-#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: {0}\n"
+#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: "
+#~ "{0}\n"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
@@ -31650,5 +31544,6 @@
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 #~ msgstr ""
-#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due zone)"
+#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due "
+#~ "zone)"
 
 #~ msgid "Lambert Zone 4 cache file (.4)"
@@ -31661,5 +31556,4 @@
 #~ msgstr "File cache della zona 2 di Lambert (.2)"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Collegamento a {0} in corso..."
@@ -31671,6 +31565,6 @@
 #~ msgstr "Aggiunta l'auto-etichettatura della sorgente:"
 
-#, java-format
-#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert "
@@ -31683,5 +31577,4 @@
 #~ msgstr "Elimina gli elementi selezionati"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -31695,7 +31588,4 @@
 #~ msgstr "Elimina e Scarica"
 
-#~ msgid "Combine Anyway"
-#~ msgstr "Unisci comunque"
-
 #~ msgid "Merge Anyway"
 #~ msgstr "Incorpora comunque"
@@ -31709,7 +31599,7 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
-#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di caricarlo."
-
-#, java-format
+#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di "
+#~ "caricarlo."
+
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relazione: {0}"
@@ -31728,5 +31618,4 @@
 #~ msgstr "Sposta in basso"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -31739,5 +31628,4 @@
 #~ msgstr "Aggiorna dati"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Modificare prima la proiezione in {0}."
@@ -31746,5 +31634,4 @@
 #~ msgstr "Proiezione non valida"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}"
@@ -31754,11 +31641,10 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Un errore è stato rilevato durante il tentativo di correlare le foto al "
 #~ "tracciato GPX. E' possibile far corrispondere le foto in modo manuale."
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Differenza tra il tracciato e le foto: {0}m {1}s"
@@ -31771,5 +31657,6 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Non è stato trovato alcun dato da aggiornare. E' stato già aperto o "
@@ -31802,6 +31689,7 @@
 #~ "import EXIF geotagged pictures."
 #~ msgstr ""
-#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini con i "
-#~ "tracciati GPS oppure importa le immagini geo-etichettate mediante EXIF."
+#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini "
+#~ "con i tracciati GPS oppure importa le immagini geo-etichettate mediante "
+#~ "EXIF."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -31809,14 +31697,14 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
-#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa che "
-#~ "appartengono ad un utente selezionato, apre il browser per la "
+#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa "
+#~ "che appartengono ad un utente selezionato, apre il browser per la "
 #~ "visualizzazione della pagina del profilo dell'autore."
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Alcune utilità per rendere la propria vita più facile: ad esempio la "
@@ -31825,16 +31713,15 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "La caratteristica principale dell'estensione è la possibilità di eliminare i "
-#~ "punti del tracciato GPX. Questa estensione può essere utilizzata per "
-#~ "preparare i tracciati per il loro caricamento su OSM, ad esempio eliminando "
-#~ "le parti che non interessano di un tracciato."
+#~ "La caratteristica principale dell'estensione è la possibilità di "
+#~ "eliminare i punti del tracciato GPX. Questa estensione può essere "
+#~ "utilizzata per preparare i tracciati per il loro caricamento su OSM, ad "
+#~ "esempio eliminando le parti che non interessano di un tracciato."
 
 #~ msgid "Remove route nodes"
 #~ msgstr "Rimuovi nodi dell'itinerario"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -31843,6 +31730,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare la "
-#~ "versione aggiornata ed eliminare il vecchio archivio?\n"
+#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare "
+#~ "la versione aggiornata ed eliminare il vecchio archivio?\n"
 #~ "\n"
 #~ "{0}"
@@ -31859,5 +31746,4 @@
 #~ "modifiche"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -31887,14 +31773,11 @@
 #~ msgstr "% di lon:"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile."
 
-#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr ""
 #~ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}."
 
-#, java-format
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
@@ -31967,5 +31850,4 @@
 #~ msgstr "Primitiva già eliminata"
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "rimozione del riferimento dal percorso {0}"
@@ -31974,11 +31856,10 @@
 #~ msgstr "Nome utente OSM (e-mail)"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Il numero di cambiamenti corrente supera il numero massimo consentito, ora "
-#~ "sono {0}, il massimo è {1}"
+#~ "Il numero di cambiamenti corrente supera il numero massimo consentito, "
+#~ "ora sono {0}, il massimo è {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
@@ -31988,13 +31869,11 @@
 #~ msgstr "Eliminazione di 1 primitiva"
 
-#, java-format
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Il livello {0} deve essere presente nella lista dei livelli"
 
-#, java-format
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr ""
-#~ "<html>E'' fallito il caricamento dello storico dal server. "
-#~ "Dettagli:<br>{0}</html>"
+#~ "<html>E'' fallito il caricamento dello storico dal server. Dettagli:<br>"
+#~ "{0}</html>"
 
 #~ msgid "Defaults (See tooltip for detailed information)"
@@ -32008,6 +31887,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -32023,6 +31902,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -32032,5 +31911,6 @@
 #~ msgstr ""
 #~ "Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda "
-#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu WMS.\n"
+#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu "
+#~ "WMS.\n"
 #~ "\n"
 #~ "Si possono anche aggiungere manualmente nelle Preferenze Avenzate, "
@@ -32046,7 +31926,7 @@
 #~ "Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è "
 #~ "solo necessario inserire l'identificativo rilevante.\n"
-#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare manualmente "
-#~ "l'indirizzo URL come in questo esempio, sostituendo 73 con l'identificativo "
-#~ "della propria immagine:\n"
+#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare "
+#~ "manualmente l'indirizzo URL come in questo esempio, sostituendo 73 con "
+#~ "l'identificativo della propria immagine:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -32061,5 +31941,4 @@
 #~ msgstr "Ordina i membri della relazione selezionata o l'intera lista"
 
-#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Membri: {0} (collegato: {1})"
@@ -32068,26 +31947,22 @@
 #~ msgstr "Elemento dello storico"
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr ""
-#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione di "
-#~ "{0}."
+#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione "
+#~ "di {0}."
 
 #~ msgid "No data"
 #~ msgstr "Nessun dato"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
 #~ "primitives only"
 #~ msgstr ""
-#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime {0} "
-#~ "delle {1} primitive selezionate"
-
-#, java-format
+#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime "
+#~ "{0} delle {1} primitive selezionate"
+
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Rimuovere il membro della relazione {0} {1}"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -32108,24 +31983,20 @@
 #~ msgstr "Scarica riferimenti..."
 
-#, java-format
 #~ msgid "Unknown file extension for file ''{0}''"
 #~ msgstr "Estensione del file sconosciuta per il file ''{0}''"
 
-#, java-format
 #~ msgid "An error occurred while saving. Error is: {0}"
 #~ msgstr ""
 #~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr ""
 #~ "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato."
 
-#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
 #~ msgstr ""
-#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa estensione "
-#~ "non è più necessaria."
+#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa "
+#~ "estensione non è più necessaria."
 
 #~ msgid "Delete all"
@@ -32136,6 +32007,6 @@
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
 #~ "Abilitare per caricare tutte le modifiche in una sola richiesta, "
@@ -32143,5 +32014,4 @@
 #~ "modificata"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -32149,9 +32019,9 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 #~ msgstr[0] ""
-#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti e "
-#~ "continuare?"
+#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti "
+#~ "e continuare?"
 #~ msgstr[1] ""
-#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti e "
-#~ "continuare?"
+#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti "
+#~ "e continuare?"
 
 #~ msgid "Close current changeset"
@@ -32161,21 +32031,13 @@
 #~ msgstr "Usare un nuovo changset a chiuderlo."
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure <A "
-#~ "HREF=\"{1}\">nella propria lingua</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più "
-#~ "disponibile"
+#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure "
+#~ "<A HREF=\"{1}\">nella propria lingua</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -32183,11 +32045,10 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure <A "
-#~ "HREF=\"{1}\">la propria lingua</A>."
-
-#, java-format
+#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
+#~ "<A HREF=\"{1}\">la propria lingua</A>."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Valore di ritorno inatteso. Ottenuto {0}"
@@ -32202,5 +32063,4 @@
 #~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "indice fuori dai limiti Ottenuto {0}"
@@ -32209,18 +32069,16 @@
 #~ msgstr "Visualizza lo storico della primitiva selezionata"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Impossibile leggere \"{0}\""
 
-#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 #~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
-#~ "''{1}''"
-
-#, java-format
+#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, "
+#~ "ricevuto ''{1}''"
+
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
 #~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int (>=0), "
@@ -32229,14 +32087,14 @@
 #~ msgid "Replace the way this member refers to with the combined way"
 #~ msgstr ""
-#~ "Sostituisci il percorso a cui fa riferimento questo membro con il percorso "
-#~ "unito"
+#~ "Sostituisci il percorso a cui fa riferimento questo membro con il "
+#~ "percorso unito"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "nota: Per alcune funzionalità JOSM ha bisogno di molta memoria. Può essere "
-#~ "necessario aggiungere la seguente\n"
+#~ "nota: Per alcune funzionalità JOSM ha bisogno di molta memoria. Può "
+#~ "essere necessario aggiungere la seguente\n"
 #~ "      opzione Java per incrementare la dimensione massima della memoria "
 #~ "allocata"
@@ -32245,24 +32103,22 @@
 #~ msgstr "Sostituisci"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
 #~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo "
 #~ "{2}.<br>Eliminare dalla relazione?</html>"
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr ""
-#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\""
-
-#, java-format
+#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso "
+#~ "\"{1}\""
+
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione "
-#~ "\"{1}\".<br>Eliminare dalla relazione?</html>"
+#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"."
+#~ "<br>Eliminare dalla relazione?</html>"
 
 #~ msgid "Always move and don't show dialog again"
@@ -32280,6 +32136,6 @@
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 #~ msgstr ""
-#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} e "
-#~ "versione {1}"
+#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} "
+#~ "e versione {1}"
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -32292,21 +32148,13 @@
 #~ "finestra unica,"
 
-#, java-format
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "Relazione: da {0} a {1} tramite {2}"
 
-#, java-format
 #~ msgid "{0} extrem nodes."
 #~ msgstr "{0} nodi estremi."
 
-#, java-format
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "Tramite nodo {0}, {1}"
 
-#, java-format
-#~ msgid "{0} via nodes."
-#~ msgstr "{0} nodi intermedi."
-
-#, java-format
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Percorso intermedio: {0}"
@@ -32320,37 +32168,36 @@
 #~ "connessione."
 
-#, java-format
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-#~ "default geometry. Details: {1}"
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
 #~ msgstr ""
 #~ "Attenzione: fallito il ripristino della geometria della finestra dalla "
 #~ "chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</html>"
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
 #~ msgstr ""
-#~ "<html>Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul server "
-#~ "OSM ''''{1}''''.<br>L''insieme di modifiche sarà automaticamente chiuso dal "
-#~ "server dopo un intervallo massimo di attesa.</html>"
+#~ "<html>Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul "
+#~ "server OSM ''''{1}''''.<br>L''insieme di modifiche sarà automaticamente "
+#~ "chiuso dal server dopo un intervallo massimo di attesa.</html>"
 
 #~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to version "
-#~ "0.6"
+#~ "WARNING: no API version defined for data to upload. Falling back to "
+#~ "version 0.6"
 #~ msgstr ""
-#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da caricare. "
-#~ "Ritorno alla versione 0.6"
-
-#, java-format
+#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da "
+#~ "caricare. Ritorno alla versione 0.6"
+
 #~ msgid ""
 #~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff upload."
+#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
+#~ "upload."
 #~ msgstr ""
 #~ "ATTENZIONE: la preferenza ''''{0}'''' o la versione delle API ''''{1}'''' "
-#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti differenziali, "
-#~ "ma le API non sono in grado di gestirli. Ignorato il caricamento "
-#~ "differenziale."
+#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti "
+#~ "differenziali, ma le API non sono in grado di gestirli. Ignorato il "
+#~ "caricamento differenziale."
 
 #~ msgid "Current changeset is null. Can't upload data."
@@ -32358,9 +32205,7 @@
 #~ "L'insieme di modifiche corrente è nullo. Non si possono caricare i dati."
 
-#, java-format
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -32372,11 +32217,10 @@
 #~ msgid "Failed to read command. Exiting help browser. Exception was:"
 #~ msgstr ""
-#~ "Fallita la lettura del comando. Uscita dal browser di aiuto. L'eccezione è "
-#~ "stata:"
+#~ "Fallita la lettura del comando. Uscita dal browser di aiuto. L'eccezione "
+#~ "è stata:"
 
 #~ msgid "Failed to launch the external help browser"
 #~ msgstr "Fallita l'apertura del browser esterno di aiuto"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin {0} version {1} found but for this version of JOSM is at least "
@@ -32390,13 +32234,7 @@
 #~ msgstr "Username del server proxy"
 
-#, java-format
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "L''estensione {0} è richiesta dall''estensione {1}, ma non è stata trovata."
-
 #~ msgid "Set manually the Lambert zone"
 #~ msgstr "Imposta manualmente la zona di Lambert"
 
-#, java-format
 #~ msgid ""
 #~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
@@ -32410,9 +32248,7 @@
 #~ "manualmente la zona di Lambert dal menu Cadastre"
 
-#, java-format
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "Fallito il caricamento della risorsa ''''{0}''''. L''errore è {1}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -32428,9 +32264,9 @@
 
 #~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please decide "
-#~ "whether your want to <strong>keep</strong> these memberships for the target "
-#~ "node or whether you want to <strong>remove</strong> them.<br>The default is "
-#~ "to <strong>keep</strong> them: the target node will take the place of the "
-#~ "original node in the membership.</html>"
+#~ "<html>The merged nodes are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the target node or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the target node will "
+#~ "take the place of the original node in the membership.</html>"
 #~ msgstr ""
 #~ "<html>I nodi uniti sono membri di una o più relazioni. Decidere se si "
@@ -32438,18 +32274,19 @@
 #~ "destinazione oppure se si vuole <strong>rimuoverle</strong>.<br>Il "
 #~ "comportamento predefinito è di <strong>mantenerle</strong>: il nodo di "
-#~ "destinazione prenderà il posto del nodo originale nell'appartenenza.</html>"
+#~ "destinazione prenderà il posto del nodo originale nell'appartenenza.</"
+#~ "html>"
 
 #~ msgid ""
-#~ "<html>The combined ways are members in one ore more relations. Please decide "
-#~ "whether your want to <strong>keep</strong> these memberships for the "
-#~ "combined way or whether you want to <strong>remove</strong> them.<br>The "
-#~ "default is to <strong>keep</strong> them: the combined way will take the "
-#~ "place of the original way in the membership.</html>"
+#~ "<html>The combined ways are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the combined way or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
+#~ "take the place of the original way in the membership.</html>"
 #~ msgstr ""
 #~ "<html>I percorsi uniti sono membri di una o più relazioni. Decidere se si "
 #~ "desidera <strong>mantenere</strong> queste appartenenze per il percorso "
 #~ "unito oppure se si vuole <strong>rimuoverle</strong>.<br>Il comportamento "
-#~ "predefinito è di <strong>mantenerle</strong>: il percorso unito prenderà il "
-#~ "posto del percorso originale nell'appartenenza.</html>"
+#~ "predefinito è di <strong>mantenerle</strong>: il percorso unito prenderà "
+#~ "il posto del percorso originale nell'appartenenza.</html>"
 
 #~ msgid "User with the same uid but different name found"
@@ -32460,17 +32297,13 @@
 #~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
 #~ msgstr ""
-#~ " (<a href=\"urn:changeset-configuration\">configura gruppo di modifiche</a>)"
+#~ " (<a href=\"urn:changeset-configuration\">configura gruppo di modifiche</"
+#~ "a>)"
 
 #~ msgid "Looking up available translations..."
 #~ msgstr "Ricerca delle traduzioni disponibili..."
 
-#, java-format
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Elimina il file della vecchia estensione {0}"
 
-#, java-format
-#~ msgid "Delete old plugin {0}"
-#~ msgstr "Elimina la vecchia estensione {0}"
-
 #~ msgid "Checking locales..."
 #~ msgstr "Controllo delle localizzazioni..."
