Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 19557)
+++ applications/editors/josm/i18n/po/fr.po	(revision 19698)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 02:51-0500\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-24 23:42+0000\n"
+"Last-Translator: jojolebestof <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -69,11 +69,11 @@
 #: ../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:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -94,4 +94,5 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
+"Le paramètre \"downloadgps\" n'accepte pas de noms de fichier ou des URLs."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
@@ -243,5 +244,5 @@
 #: ../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:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -255,13 +256,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../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/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../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/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -270,5 +271,8 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -295,5 +299,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:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Fusionner"
@@ -324,5 +328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -389,9 +393,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../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/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../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/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -399,5 +403,7 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -448,6 +454,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -465,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -472,11 +478,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
-#: ../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/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../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/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -513,5 +519,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "le conflit"
@@ -523,9 +529,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "précédent"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "suivant"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -559,5 +565,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr "Gestionnaire d’ensemble de changement"
+msgstr "Gestionnaire de lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
@@ -569,10 +575,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:394
 msgid "Close open changesets"
-msgstr "Fermer les ensembles de changements"
+msgstr "Fermer les lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 msgid "Closes open changesets"
-msgstr "Ferme les ensembles de changements"
+msgstr "Ferme les lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
@@ -592,15 +598,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
 msgid "There are no open changesets"
-msgstr "Il n’y a pas d’ensembles de changements ouverts"
+msgstr "Il n'y a pas de lot de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
 msgid "No open changesets"
-msgstr "Pas d’ensembles de changements ouverts"
+msgstr "Aucun lot de changements ouvert"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
 msgid "Downloading open changesets ..."
-msgstr "Téléchargement des ensembles de changements ouverts…"
+msgstr "Téléchargement des lots de changements ouverts..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
@@ -646,14 +652,14 @@
 msgstr "Veuillez sélectionner au moins deux voies à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Copier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Copier les objets sélectionnés dans la mémoire tampon."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Veuillez sélectionner quelque chose à copier."
@@ -686,8 +692,8 @@
 #: ../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:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../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/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -696,5 +702,5 @@
 #: ../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:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -753,15 +759,14 @@
 #: ../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
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Il y a eu {0} conflits durant l’import."
-msgstr[1] "Il y a eu {0} conflits durant l’import."
+msgstr[0] "Il y avait (0) conflit durant l'importation."
+msgstr[1] "Il y avait (0) conflits durant l'importation."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Conflits durant le téléchargement"
+msgstr[0] "Conflit durant le téléchargement"
 msgstr[1] "Conflits durant le téléchargement"
 
@@ -783,4 +788,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -790,4 +797,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Dupliquer la sélection par un copier-coller immédiat."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Chemin dupliqué"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "éditer la relation sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Couche : {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Zoom sur {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -879,10 +914,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, 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] "La voie sélectionnée ne contient pas le nœud sélectionné."
-msgstr[1] "La voie sélectionnée ne contient pas tous les nœuds sélectionnés."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -894,5 +928,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Êtes-vous vraiment sûr de vouloir continuer?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -1004,5 +1038,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1156,5 +1190,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 "<html>Impossible d’ouvrir un dossier.<br>Veuillez sélectionner un fichier !"
@@ -1169,9 +1204,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Ouverture de {0} fichiers…"
-msgstr[1] "Ouverture de {0} fichiers…"
+msgstr[0] "Ouverture du fichier {0} ..."
+msgstr[1] "Ouverture des fichiers {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1228,7 +1263,7 @@
 #: ../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 "
+"<h3>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.)"
@@ -1242,5 +1277,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°"
 
@@ -1283,4 +1319,9 @@
 "vous continuer ?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Les Multipolygones doivent contenir seulement des chemin fermés."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1295,4 +1336,17 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Les éléments sélectionnés ne peuvent être mis en forme orthogonale"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
+"Veuillez sélectionner des chemins avec des angles droits afin de les "
+"orthogonaliser."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1309,5 +1363,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Supprimer les membres incomplets ?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
@@ -1353,5 +1407,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr ""
+msgstr "Ouvre une boite de dialogue pour les réglages de préférences."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -1400,18 +1454,18 @@
 #: ../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:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../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/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1436,12 +1490,13 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
 #: ../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:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Erreur"
@@ -1577,5 +1632,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:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1785,9 +1840,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Dupliquer {0} nœuds en {1} nœuds"
-msgstr[1] "Dupliquer {0} nœuds en {1} nœuds"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1832,5 +1887,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Télécharger les données."
@@ -1839,5 +1894,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Mise à jour modifiée"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
@@ -2274,6 +2329,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../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/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2359,7 +2414,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "Nord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2372,7 +2426,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Il manque la parenthèse droite"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2402,5 +2455,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Rechercher des objets."
@@ -2598,5 +2651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Chercher"
@@ -2637,25 +2690,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2669,5 +2719,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2675,5 +2725,5 @@
 "d’utilisation : clé=valeur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2697,7 +2747,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Jeton inattendu : {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2816,9 +2866,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "{0} objets ajoutés"
-msgstr[1] "{0} objets ajoutés"
+msgstr[0] "Objet ajouté {0}"
+msgstr[1] "Objets ajoutés {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2868,12 +2918,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Enlever \"{0}\" pour {1} {2}"
+msgstr "Supprimer \"{0}\" pour les objets {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Mettre {0}={1} pour {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2933,17 +2983,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Mode Suppression"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Supprimer {0} chemin"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Supprimer {0} relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -3024,9 +3074,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Objets ''{0}'' purgés"
-msgstr[1] "Objets ''{0}'' purgés"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3076,24 +3126,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Restaurer {0} primitives"
-msgstr[1] "Restaurer {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Résoudre les conflits de version pour le nœud {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Résoudre les conflits de version pour le chemin {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Résoudre les conflits de version pour la relation {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3195,11 +3245,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
 "not a directory."
 msgstr ""
-"échec de la définition de la référence. la référence de version {0} n’est "
-"pas disponible dans l’historique"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
@@ -3352,5 +3400,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3358,5 +3406,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3364,5 +3412,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3370,5 +3418,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3435,8 +3483,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
@@ -3448,67 +3495,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. 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:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3517,5 +3557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3523,5 +3563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3647,6 +3687,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3656,5 +3696,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3665,7 +3705,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3687,5 +3727,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "arrière-plan"
@@ -3829,6 +3869,6 @@
 msgstr "Ne plus afficher (choix mémorisé)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3836,37 +3876,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incomplet"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "highway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "voie ferrée"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "voie navigable"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "utilisation du terrain"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3875,10 +3916,10 @@
 msgstr[1] "{0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3887,5 +3928,5 @@
 msgstr[1] "{0} membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3922,6 +3963,6 @@
 
 #: ../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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflit"
@@ -3932,7 +3973,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "La connexion a échoué."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4137,5 +4177,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initialisation"
@@ -4176,5 +4215,5 @@
 #: ../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:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4185,5 +4224,5 @@
 #: ../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:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Édition"
@@ -4254,29 +4293,29 @@
 msgstr "échelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitude géographique au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Le nom de l’objet au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitude géographique au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "L’angle entre le segment de chemin précédent et l’actuel."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "L’orientation (boussole) du segment en train d’être dessiné."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "La longueur du nouveau segment du chemin étant actuellement dessiné."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4284,9 +4323,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4453,16 +4492,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Étiquettes ({0} conflits)"
-msgstr[1] "Étiquettes ({0} conflits)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflit(s) d’attribut à résoudre"
-msgstr[1] "{0} conflit(s) d’attribut à résoudre"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4521,16 +4560,16 @@
 msgstr "Résolution de conflits"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4745,9 +4784,14 @@
 msgstr "Nœud"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
 "commande de résolution"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4775,5 +4819,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4783,9 +4827,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Il y a {0} nœuds additionnels faisant partie du chemin {1}<br>qui sont "
-"supprimés du serveur.<br><br>Voulez-vous les restaurer également ?</html>"
 msgstr[1] ""
-"<html>Il y a {0} nœuds additionnels faisant partie du chemin {1}<br>qui sont "
-"supprimés du serveur.<br><br>Voulez-vous les restaurer également ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4794,5 +4834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4802,11 +4842,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Il y a {0} primitives référencées dans la relation {1}<br>qui sont "
-"supprimées sur le serveur.<br><br>Voulez-vous les restaurer également ?</"
-"html>"
 msgstr[1] ""
-"<html>Il y a {0} primitives référencées dans la relation {1}<br>qui sont "
-"supprimées sur le serveur.<br><br>Voulez-vous les restaurer également ?</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4909,5 +4943,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Non, annuler"
@@ -4955,5 +4989,10 @@
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5086,10 +5125,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "rien"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "all"
@@ -5169,7 +5208,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5179,6 +5218,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5358,10 +5397,10 @@
 
 #: ../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/ConflictDialog.java:115
 #: ../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/LayerListDialog.java:156
 #: ../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/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5381,13 +5420,13 @@
 msgstr "Pile de commande : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Résoudre les conflits."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Résoudre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5395,6 +5434,6 @@
 "liste ci-dessus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5429,5 +5468,5 @@
 "<html>You did not finish to merge the differences in this conflict."
 "<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
+"resolved.<br>Click <strong>{0}</strong> to close anyway."
 "<strong>Already<br>resolved differences will not be applied.</"
 "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
@@ -5453,5 +5492,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5460,5 +5499,5 @@
 #: ../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:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5538,43 +5577,48 @@
 msgstr "Afficher l’historique de l’élément sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Ouvrir une liste de tous les calques chargés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Montrer/Cacher"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
 msgid "Toggle visible state of the selected layer."
 msgstr "Bascule l’état de visibilité du calque sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Activer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Active la couche sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Fusionne cette couche dans une autre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Chemin dupliqué"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Déplacer le calque sélectionné un niveau vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Déplacer le calque sélectionné un niveau vers le bas."
@@ -5588,6 +5632,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relations"
@@ -5597,22 +5641,22 @@
 msgstr "Ouvrir une liste de toutes les relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Ouvrir un éditeur pour la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Supprimer la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Créer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../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"
@@ -5621,47 +5665,47 @@
 "d’édition"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Sélection actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Ouvrir une fenêtre de liste de sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zoomer sur le(s) élément(s) sélectionné(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zoomer sur la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sél.: Rel.:{0}/Chemins:{1}/Nœuds:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5669,5 +5713,5 @@
 msgstr "Sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -6021,8 +6065,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. -->
 #. <space />
 #. <key key="highway" value="construction" />
@@ -6094,4 +6136,7 @@
 #. <space />
 #. <key key="waterway" value="drain" />
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#. <space />
+#. <key key="waterway" value="ditch" />
 #. item "Water/Water/Stream" label "Edit Stream"
 #. <space />
@@ -6170,6 +6215,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6211,6 +6257,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
 #. <key key="aeroway" value="aerodrome" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#. <key key="aeroway" value="terminal" />
 #. item "Travel/Accomodation/Hotel" label "Edit Hotel"
 #. <key key="tourism" value="hotel" />
@@ -6679,152 +6727,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: 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:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 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
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 build/trans_presets.java:1960
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: build/trans_presets.java:2068 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nom"
@@ -7207,5 +7257,5 @@
 #: ../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
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<différent>"
@@ -7261,55 +7311,55 @@
 msgstr "Ajouter des Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Changer la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Supprimer vraiment la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Supprimer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7345,9 +7395,8 @@
 #: ../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] "Conflit dans les données."
-msgstr[1] "Conflit dans les données."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7648,7 +7697,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7744,9 +7792,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7765,27 +7812,28 @@
 msgid "way is not connected to previous or next relation member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+"Le chemin n'est pas connecté au précédent membre de la relation ni au suivant"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Marque-pages"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Zone actuelle de téléchargement</strong> (minlat,minlon, "
 "maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Créer un marque-pages"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
@@ -7793,25 +7841,25 @@
 "sélectionnée."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
 msgid "Please enter a name for the bookmarked download area."
 msgstr ""
 "Veuillez entrer un nom pour le marque page de la zone de téléchargement."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
 msgid "Name of location"
 msgstr "Nom du lieu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Supprimer le marque-pages actuellement sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Renommer le marque-pages actuellement sélectionné."
@@ -7849,7 +7897,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -7938,18 +7986,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Limites"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Près"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7960,35 +8008,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Entrez un nom d’endroit à rechercher :"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Enter le nom d’un lieu à rechercher"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Zone autour d’un endroit"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 "Échec (NullPointerException). Sans doute parce qu’il manque des attributs."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Rechercher…"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7999,7 +8047,9 @@
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
 #. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Surveillance" text "Name"
 #. item "Man Made/Power Generator" label "Edit Power Generator"
 #. <key key="power" value="generator" />
@@ -8008,10 +8058,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: 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
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Type"
@@ -8020,5 +8071,5 @@
 #. 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/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8030,17 +8081,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: 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:355 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:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: 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
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "inconnu"
@@ -8161,9 +8211,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
 msgstr ""
-"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
-"plan. L’exception était : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8297,5 +8345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55
 msgid "Changeset"
-msgstr "Ensemble de changement"
+msgstr "Lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
@@ -8313,15 +8361,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Changeset info"
-msgstr "Informations sur l’ensemble de changements"
+msgstr "Informations sur le lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
 msgid "Launch browser with information about the changeset"
-msgstr ""
-"Lancer un navigateur avec les informations sur l’ensemble de changements"
+msgstr "Lancer le navigateur avec les informations sur le lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139
 #, java-format
 msgid "Show changeset {0}"
-msgstr "Montrer l’ensemble de changements {0}"
+msgstr "Montrer le lot de changements {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:62
@@ -8408,5 +8455,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Conflits détectés"
@@ -8439,5 +8486,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
 msgid "Changeset closed"
-msgstr "Ensemble de changement fermé"
+msgstr "Lot de changements fermé"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
@@ -8485,5 +8532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr "Identifiant de l’ensemble de changements :"
+msgstr "Identifiant du lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
@@ -8497,5 +8544,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
 msgid "No open changeset"
-msgstr "Aucun ensemble de changements ouvert"
+msgstr "Aucun lot de changements ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:78
@@ -8524,9 +8571,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143
 msgid "Close changeset after upload"
-msgstr "Fermer l’ensemble de changements après l’envoi"
+msgstr "Fermer le lot de changements après envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:144
 msgid "Select to close the changeset after the next upload"
-msgstr "Fermer l’ensemble de changements après le prochain envoi"
+msgstr "Fermer le lot de changements après le prochain envoi"
 
 #. putValue(NAME, tr("Reload"));
@@ -8537,5 +8584,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:315
 msgid "Close the currently selected open changeset"
-msgstr "Fermer l’ensemble de changements actuellement ouvert"
+msgstr "Fermer le lot de changements actuellement sélectionné"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
@@ -8547,26 +8594,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
 msgid "Open changesets"
-msgstr "Ouvrir les ensembles de changements"
+msgstr "Ouvrir des lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
 msgid "Close changesets"
-msgstr "Fermer les ensembles de changements"
+msgstr "Fermer les lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
 msgid "Close the selected open changesets"
-msgstr "Fermer les ensembles de changements sélectionnés"
+msgstr "Fermer les lots de changements sélectionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144
 msgid "Cancel closing of changesets"
-msgstr "Annuler la fermeture des ensembles de changements"
+msgstr "Annuler la fermeture des lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
 msgid "Closing changeset"
-msgstr "Fermeture de l’ensemble de changements"
+msgstr "Fermeture du lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76
 #, java-format
 msgid "Closing changeset {0}"
-msgstr "Fermeture de l’ensemble de changements {0}"
+msgstr "Fermeture du lot de changements {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
@@ -8782,5 +8829,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -8792,10 +8839,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>Le calque {0} comporte des conflits non résolus.<br>Résolvez-les ou "
-"abandonnez les modifications.<br>Calque qui comporte des conflits :</html>"
 msgstr[1] ""
-"<html>Les calques {0} comportent des conflits non résolus.<br>Résolvez-les "
-"ou abandonnez les modifications.<br>Calques qui comportent des conflits :</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8878,9 +8920,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
 #. item "Highways/Streets/Residential" check "Embankment"
 #. item "Highways/Streets/Living Street" check "Embankment"
 #. item "Highways/Streets/Pedestrian" check "Embankment"
-#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8890,7 +8932,7 @@
 #. 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 "Water/Water/Drain" text "Name"
+#. item "Water/Water/Ditch" text "Name"
 #. item "Water/Water/Stream" text "Name"
 #. item "Water/Water/Canal" text "Name"
@@ -8902,16 +8944,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: 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: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:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 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
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Calque"
@@ -9063,5 +9105,9 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
+"Télécharger <strong>{0} objet</strong> dans <strong>1 lot de changement</"
+"strong>"
 msgstr[1] ""
+"Télécharger <strong>{0} objets</strong> dans <strong>1 lot de changement</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
@@ -9074,5 +9120,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
+"Télécharger <strong>{0} objet</strong> dans <strong>1 lot de changement</"
+"strong> via <strong>1 requête</strong>"
 msgstr[1] ""
+"Télécharger <strong>{0} objets</strong> dans <strong>1 lot de changement</"
+"strong> via <strong>1 requête</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
@@ -9106,10 +9156,10 @@
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr "Envoi des données pour le calque ''{0}''"
+msgstr "Téléchargement des données pour le calque \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
 msgid "Continue uploading"
-msgstr "Continuer à envoyer."
+msgstr "Continuer le téléchargement"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82
@@ -9119,5 +9169,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86
 msgid "Go back to Upload Dialog"
-msgstr ""
+msgstr "Revenir à la fenêtre d'envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
@@ -9131,5 +9181,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94
 msgid "Click to abort uploading"
-msgstr ""
+msgstr "Cliquer pour interrompre le téléchargement"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99
@@ -9180,5 +9230,5 @@
 #, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Envoi de {0} objets…"
+msgstr "Téléchargement de {0} objets..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9333,68 +9383,68 @@
 msgstr[1] "{0} objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Personnaliser la couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Choisir une couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Marqueurs depuis des points nommés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Points de parcours nommés depuis {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importer Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9404,23 +9454,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9430,5 +9480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9436,5 +9486,5 @@
 msgstr "Nom : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9442,5 +9492,5 @@
 msgstr "Description : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9450,23 +9500,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Longueur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Longueur : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9475,5 +9525,5 @@
 msgstr[1] "{0} chemins, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9482,10 +9532,10 @@
 msgstr[1] "{0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9496,43 +9546,43 @@
 "regardez ici :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../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:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converti depuis: {0}"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Télécharger depuis OSM le long de cette trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9543,5 +9593,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -9549,5 +9599,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9557,5 +9607,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9565,19 +9615,19 @@
 "estimer leur horodatage ont été omis."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Couche de données {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "en dehors de la zone téléchargée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -9585,5 +9635,5 @@
 "0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9592,5 +9642,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9604,5 +9654,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9615,11 +9665,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9628,32 +9678,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} est consistué de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "non défini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Version de l’API : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir en calque GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "Pas de problème trouvé."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9703,24 +9753,24 @@
 msgstr "Point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Fichiers GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erreur pendant le traitement {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Impossible de lire \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9732,34 +9782,34 @@
 "hpoto et sélectionnez un fuseau horaire.<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Heure de la photo (information EXIF) :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "Heure du GPS (lu sur la photo) : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [jj/mm/aaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Je suis dans le fuseau horaire de : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Aucune date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Ouvrez une autre photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchroniser l’heure avec une photo du GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9769,64 +9819,64 @@
 "Merci d’utiliser le format demandé"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Date non valide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Aucune trace GPX encore chargée>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "Trace GPX : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Ouvrir une autre trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Auto-Guess"
 msgstr "Estimation automatique"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Fuseau horaire : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Décallage :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9836,45 +9886,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Correler les images avec la trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Corréler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Fuseau horaire invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Décallage invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuseau horaire : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9883,5 +9933,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9892,22 +9942,22 @@
 "manuellement."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "La correspondance des photos avec la trace a échoué"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Ajuster le fuseau horaire et le décalage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr ""
 "Les photos sélectionnées ne contiennent pas d’information d’horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Les photos ne contienne tpas d’information d’horodatage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9917,17 +9967,17 @@
 "autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "La trace GPX n’a pas d’horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Vous devez sélectionner une trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Aucune trace GPX sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9938,5 +9988,5 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9947,75 +9997,75 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extractions des positions GPS depuis les informations EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Début du parcours du dossier"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr "Un des fichiers sélectionnés était vide."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Lexture des images…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lecture de {0}…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Parcours du dossier {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fichier vide trouvé dans le dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Corréler en GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Aucune donnée chargée"
-msgstr[1] "Aucune donnée chargée"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} ont été trouvées pour être géoétiquettées."
-msgstr[1] "{0} ont été trouvées pour être géoétiquettées."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10024,5 +10074,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10054,5 +10104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
 msgid "Show previous Image"
-msgstr ""
+msgstr "Afficher l'image précédente"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -10119,5 +10169,5 @@
 msgstr "marqueur gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10125,5 +10175,5 @@
 msgstr[1] "marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10132,9 +10182,9 @@
 msgstr[1] "{0} est constitué de {1} marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synchronizer l’audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10143,20 +10193,20 @@
 "de synchronisation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Fichier audio synchronisé au point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Impossible de synchroniser dans le calque actuellemnt lu."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Créer un marqueur audio au niveau de la tête de lecture"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10166,5 +10216,5 @@
 "voulez le marqueur."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -10172,13 +10222,13 @@
 "décalage ."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Afficher/Masquer Texte/Icônes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Bascule l’état de visibilté du marqueur de texte et d’icônes."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -10188,5 +10238,5 @@
 "laquelle vous voulez l’associer (après le premier marqueur)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -10196,5 +10246,5 @@
 "marqueur audio ou sur le point de la trace où vous voulez synchroniser."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Impossible de créer un nouveau marqueur audio."
@@ -10220,19 +10270,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
-"plan. L’exception était : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
-"plan. L’exception était : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10280,7 +10326,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10370,7 +10415,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10429,7 +10473,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "La connexion a échoué."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10509,7 +10552,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Veuillez sélectionner au moins quatre nœuds."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10519,7 +10561,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Fermer cette fenêtre et annuler le téléchargement"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10573,7 +10614,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
-#, fuzzy, java-format
+#, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "Sauvegarde du calque vers ''{0}''…"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
@@ -10691,5 +10732,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "Revenir à l'étape 1/3"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
@@ -10793,5 +10834,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-#, fuzzy
 msgid ""
 "<html>The test failed because the server responded with an internal error."
@@ -10799,7 +10839,4 @@
 "</html>"
 msgstr ""
-"<html>Le serveur OSM<br>''{0}''<br>a rapporté une erreur interne du serveur."
-"<br>Il s’agit probablement d’un problème temporaire. Veuillez réessayer plus "
-"tard.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -10838,5 +10875,5 @@
 #: ../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:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Veuille sélectionnez la rangée à éditer."
@@ -10850,5 +10887,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:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11008,9 +11045,4 @@
 msgstr "Style de rendu {0} : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Couche : {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11040,6 +11072,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Tous"
@@ -11080,8 +11112,8 @@
 msgstr "Une seule couleur (peut être personnalisée pour les couches nommées)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Voiture"
@@ -11103,13 +11135,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: 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
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Vélos"
@@ -11142,12 +11174,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: 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
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Piétons"
@@ -11509,5 +11541,4 @@
 
 #: ../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 "
@@ -11523,13 +11554,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Vous pouvez remarquer que la liste de sélection des clés sur la page "
-"suivante liste toutes les touches que Java connait sur n’importe quel type "
-"de clavier, et pas uniquement les touches de votre clavier. N’utilisez que "
-"les touches existant vraiment sur cotre clavier. Ainsi, si votre clavier n’a "
-"pas de touche 'Copy' (les claviers de PC n’en ont pas mais les claviers Sun "
-"en ont), ne l’utilisez pas. N’utilisez pas non plus une touche qui "
-"correspond à un raccourcie de votre claiver. Ne pas respecter cela pourra "
-"aboutir sur des conflits, JOS ne savant par exemple pas que Ctrl+Maj+; et "
-"Ctrl+: sont la même chose pour un clavier américain.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11715,5 +11737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
 msgid "File backup"
-msgstr ""
+msgstr "Fichier de sauvegarde"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
@@ -12151,5 +12173,12 @@
 msgstr "Supprimer la sélection dans la table des attributs"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12157,18 +12186,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "voie sans issue"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12179,16 +12208,16 @@
 msgstr "Impossible de lire la source des balises prédéfinies : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur de traitement {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont avalisés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12197,18 +12226,17 @@
 msgstr[1] "Changer {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Rien n’est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Appliquer balise"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Changer les propriétés"
@@ -12265,11 +12293,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type "
-"OsmPrimitiveType, reçu \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12487,6 +12513,6 @@
 #: ../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/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12511,5 +12537,5 @@
 msgstr "Échec de l’analyse du fichier \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -12517,5 +12543,5 @@
 "un document gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12531,7 +12557,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Recherche de ligne côtière…"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12539,15 +12564,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
+"plan. L’exception était : {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"pas de primitive d’id {0} dans le jeu de données local. Impossible de "
-"déduire le type de primitive"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -12616,5 +12647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Coordonnées importées : "
@@ -12718,9 +12749,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Envoi de {0} objets…"
-msgstr[1] "Envoi de {0} objets…"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13258,13 +13289,13 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Envoi de {0} objets…"
-msgstr[1] "Envoi de {0} objets…"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
-msgstr "Envoi des données…"
+msgstr "Téléchargement des données..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
@@ -13346,7 +13377,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Cliquer pour fermer la boîte de dialogue."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13359,5 +13389,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13366,7 +13396,5 @@
 "are:"
 msgstr[0] ""
-"Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
 msgstr[1] ""
-"Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13451,7 +13479,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "Cliquer pour fermer la boîte de dialogue."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13487,7 +13515,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "Cliquer pour fermer la boîte de dialogue."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13532,12 +13560,11 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-#, fuzzy
 msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "Ne plus afficher (choix mémorisé)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Le fichier \"{0}\" n’existe pas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13634,5 +13661,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13640,9 +13666,4 @@
 "file a bug report."
 msgstr ""
-"Une erreur exceptionnelle s’est produite.\n"
-"\n"
-"Ceci est toujours une erreur de programmation. Si vous utilisez la dernière\n"
-"version de JOSM, et afin d’améliorer celle-ci, merci de nous fournir un "
-"rapport d’erreur."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13737,6 +13758,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13778,5 +13799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
@@ -13784,6 +13805,4 @@
 "applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
-"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
-"votre connexion internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
@@ -13840,5 +13859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -13846,6 +13865,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
-"votre connexion internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426
@@ -13865,6 +13882,6 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13873,5 +13890,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14028,4 +14045,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Visibilité"
@@ -14107,5 +14125,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
 msgid "Uploading GPX Track"
-msgstr "Envoyer la trace GPX"
+msgstr "Téléchargement de la trace GPX"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -14118,5 +14136,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -14735,5 +14753,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Localisation"
@@ -14903,21 +14921,21 @@
 "Veuillez supprimer la zone de la relation avant de la diviser."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "Fichiers TangoGPS (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Erreur de format : "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "Import de TangoGPS réussi"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "Erreur d’import de TangoGPS !"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "fichiers TCX (*.tcx)"
@@ -14949,9 +14967,9 @@
 msgstr "Créer un chemin dupliqué"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Couche d’édition des traces GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convertir en couche GPX en rendant anonyme l’horodatage"
@@ -14966,13 +14984,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importer un chemin depuis le calque GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Abandonner le chemin existant"
@@ -14981,6 +14999,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Pas de calque de données GPX trouvé."
@@ -15212,17 +15230,17 @@
 msgstr "Charger l’ensemble des images comme un nouveau calque."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Index de direction ''{0}'' non trouvé"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "L’emplacement de départ n’est pas à l’intérieur de la bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Recherche de ligne côtière…"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15266,42 +15284,41 @@
 msgstr "Suppression des nœuds en doublon…"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Trace Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Une erreur inconnue est survenue"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "Est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "Nord-Est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "Nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "Nord-Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "Sud-Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "Sud"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "Sud-Est"
@@ -15357,6 +15374,6 @@
 #. <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:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15365,69 +15382,69 @@
 msgstr "eau"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "ligne côtière"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "terre"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Nombre maximum de segments par chemin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Nombre maximum de nœuds dans la trace initiale"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valeur de gris maximum à considérer comme de l’eau (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Précision de la simplification des lignes (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Résolution des dalles Landsat (pixels par degré)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Taille des dalles Landsat (en pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Décallage de toutes les traces vers l’est (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Décallage de toutes les traces vers len nord (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Direction vers laquelle chercher de la terre"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Etiquetter les chemins comme"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "Calque WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Taille de cache maximum (Mo)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Age maximum du cache (en jours)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Texte source"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -15435,5 +15452,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15443,5 +15460,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -15452,5 +15469,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15461,5 +15478,5 @@
 "lignes plus précises (0.0003 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15467,21 +15484,21 @@
 "Résolution des dalles Landsat, mesurée en pixels par degré (4000 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Taille d’une dalle Landsat, mesurée en pixels (2000 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Décallage de tous les points vers l’est en degrés (0 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Décallage de tous les points vers le nord en degrés (0 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Direction vers laquelle chercher de la terre (est par défaut)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15489,35 +15506,35 @@
 "rien du tout (eau par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Quel calque WMS faut il utiliser pour tracer contre. par défaut c’est IR-1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Taille maximum de chaque dossier de cache en octet. Par défaut : 300 Mo"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Age maximum de chaque fichier en cache. Par défaut : 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Texte de donnée source. Landsat par défaut."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Un greffon pour tracer les nappes d’eau des images Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Préférences du greffon LakeWalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Téléchargement de la tuile…"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Impossible d’acquérir l’image"
@@ -15541,5 +15558,5 @@
 msgstr "Échec de la connexion"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "aucun nom"
@@ -15570,5 +15587,5 @@
 msgstr "Parcours"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Calque instrument LiveGPS"
@@ -15646,5 +15663,5 @@
 msgstr "Angle entre deux nœuds sélectionnés"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Calque où faire des mesures"
@@ -15868,9 +15885,9 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
 msgid "Switch to online mode"
-msgstr ""
+msgstr "Passer au mode en ligne"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
 msgid "Switch to offline mode"
-msgstr ""
+msgstr "Passer au mode hors ligne"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
@@ -15916,4 +15933,76 @@
 msgid "Firefox executable"
 msgstr "Exécutable Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Bassin de retenue"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Entrer les coordonnées pour le nouveau nœud"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Garder les fichiers de sauvegarde (backup)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Erreur"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "La date indiquée ne peut être analysée."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Impossible de renommer le fichier \"{0}\""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Garder les fichiers de sauvegarde (backup)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Garder les fichiers de sauvegarde (backup)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Écrire dessus"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Impossible de trouver le type element"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16192,6 +16281,6 @@
 msgstr "Sauvegarder les données capturées vers un fichier à chaque minute"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:65
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:81
 #, java-format
 msgid "Error while exporting {0}: {1}"
@@ -16318,72 +16407,129 @@
 "préférences"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Diviser un bâtiment"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Rues"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Plus grand nombre"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Plus petit nombre"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Inverse les numéros des maisons mitoyennes."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Créer une nouvelle relation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Supprimer les chemins dupliqués."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Nom de la rue"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Plus petit nombre"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Plus grand nombre"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Inverser les maisons mitoyennes"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Inverse les numéros des maisons mitoyennes."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Inverser les maisons mitoyennes"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Inverser les maisons mitoyennes"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Diviser un bâtiment"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Crée des bâtiments mitoyens à partir d’un long bâtiment."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Sélectionnez un seul chemin fermé d’au moins quatre points."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Bâtiments mitoyens"
@@ -16623,5 +16769,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Nœuds dupliqués"
@@ -16632,5 +16778,5 @@
 "Ce test vérifie si des nœuds ne sont pas exactement à la même position."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16642,9 +16788,9 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Nœuds à la même position"
@@ -16681,5 +16827,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -16833,7 +16979,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Combinaisons attribut/valeur non valide"
@@ -16841,43 +16987,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:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Problème de rendu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clé \"{0}\" non valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Étiquettes avec des valeurs vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Clé de propriété invalide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "espace blanc dans une clé non valide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Les valeurs commencent ou finissent par un espace blanc"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Les valeurs contiennent du code HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "La clé \"{0}\" ne fait pas partie des balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Les balises ne contiennent pas de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
@@ -16885,39 +17031,39 @@
 "La valeur \"{0}\" pour la clé \"{1}\" n’est pas dans les balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Les balises ne contiennent pas de valeur de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Vérifier les clés de propriétés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Valider que les clés sont valides en comparasion avec une liste de mots?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Utiliser un vérificateur de propriétés complexe."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valider les étiquettes et les valeurs en utilisant des règles complexes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../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
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Source de TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16928,25 +17074,25 @@
 "données de vérification des étiquettes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Ajouter une nouvelle source à la liste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Modifier la source sélectionnée."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Supprimer la source sélectionnée de la liste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Sources de données"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Vérifier les valeurs des propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -16954,9 +17100,9 @@
 "prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Vérifier les FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -16964,54 +17110,54 @@
 "lequel attribut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Vérifier les notes de rendu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Vérifier si le rendu de carte a généré des erreurs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Utiliser le fichier de données par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Utiliser le fichier de données par défaut (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Utiliser la vérification orthographique par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Corriger les propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Impossible de trouver le type element"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Impossible de trouver le niveau d’avertissement"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expression interdite \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17469,5 +17615,5 @@
 msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17478,13 +17624,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Télécharger les tuiles visibles"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17493,37 +17643,33 @@
 "résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Télécharger les tuiles visibles"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Sauvegarder la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Charger la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -17532,13 +17678,13 @@
 "attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17824,6 +17970,13 @@
 "SVG."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17834,5 +17987,5 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
@@ -17840,5 +17993,5 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
@@ -17847,5 +18000,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17857,5 +18010,5 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
@@ -17863,5 +18016,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17872,15 +18025,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS courantes."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Ouvre une fenêtre de modification des attributs sous forme de table."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17893,10 +18046,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Crée des maisons mitoyennes depuis des blocs entiers."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17908,5 +18061,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17917,10 +18070,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Téléchargement facile le long de plusieurs chemins interconnectés"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18028,6 +18181,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. item "Airport/Runway" label "Edit Runway"
+#. <key key="aeroway" value="runway" />
 #. <optional>
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#. <key key="aeroway" value="taxiway" />
+#. <optional>
+#. item "Airport/Helipad" label "Edit Helipad"
+#. <key key="aeroway" value="helipad" />
+#. <optional>
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#. <key key="aeroway" value="gate" />
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
@@ -18035,6 +18197,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Référence"
@@ -18051,5 +18214,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:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Voies"
@@ -18071,10 +18234,10 @@
 #: 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: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
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Vitesse max (km/h)"
@@ -18118,14 +18281,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: 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: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:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: 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
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Sens unique"
@@ -18168,13 +18331,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: 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: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:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 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_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18212,13 +18375,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: 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: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:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 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
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -18253,13 +18416,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: 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: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:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: 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
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Découpe"
@@ -18294,13 +18457,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: 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: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:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: 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
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Remblai"
@@ -18432,4 +18595,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Éditer une route mineure"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18447,15 +18619,15 @@
 #. 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: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:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 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
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
@@ -18467,5 +18639,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Rue résidentielle"
@@ -18474,5 +18646,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Éditer une rue résidentielle"
@@ -18490,16 +18662,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Revêtement"
@@ -18521,166 +18696,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "avec revêtement"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "sans revêtement"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "Asphalte"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "béton"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "Métal"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "bois"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "Pavés"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "pavés"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "gravier"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "Graviers"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "Compact"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: 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:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "Herbe"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "herbe"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "sable"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: 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:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 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:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "terre"
@@ -18688,5 +18870,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Rue résidentielle partagée entre usagers"
@@ -18695,5 +18877,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Éditer une rue résidentielle partagée entre usagers"
@@ -18701,5 +18883,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Rue Piétonne"
@@ -18708,5 +18890,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Éditer une rue piétonne"
@@ -18714,5 +18896,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Voie de service"
@@ -18721,5 +18903,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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Éditer une voie d’accès"
@@ -18729,18 +18911,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Type Voie de service"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "allée"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "acceso  para vehículos (entrada a garage, etc.)"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -18748,5 +18930,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Voie de parking"
@@ -18756,5 +18938,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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Éditer une voie de parking"
@@ -18762,5 +18944,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Route (type inconnu)"
@@ -18769,5 +18951,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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Éditer une route de type inconnu"
@@ -18776,20 +18958,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Rue à accès restreint"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Éditer les restrictions d’une route"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Péage"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Sans issue (cul-de-sac)"
@@ -18797,9 +18979,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Accès"
 
 #. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
 #. item "Highways/Streets/Road Restrictions" combo "Bicycle"
 #. item "Highways/Streets/Road Restrictions" combo "Foot"
@@ -18810,6 +18993,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18821,4 +19002,5 @@
 #. item "Ways/Path" combo "Snowmobile"
 #. item "Ways/Path" combo "Motorcar"
+#. item "Waypoints/Traffic Calming" combo "Type"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -18837,141 +19019,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: 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:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "oui"
+
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:355 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:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privé"
+
+#: 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:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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 "désigné"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java: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:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "destination"
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java: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:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permis par le propriétaire"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "véhicules agricoles"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: 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:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: 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 "oui"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java: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 "privé"
-
-#: 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 "désigné"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java: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 "destination"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java: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 "permis par le propriétaire"
-
-#: 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 "véhicules agricoles"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: 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
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "non"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Biens"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Poids-lourds"
@@ -18986,10 +19176,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: 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
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 build/trans_presets.java:784
+#: build/trans_presets.java:806 build/trans_presets.java:843
+#: build/trans_presets.java:856 build/trans_presets.java:868
+#: build/trans_presets.java:880 build/trans_presets.java:892
+#: build/trans_presets.java:932
 msgid "Horse"
 msgstr "Cheval"
@@ -19005,10 +19195,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: 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
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motos"
@@ -19023,27 +19213,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: 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
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: build/trans_presets.java:786 build/trans_presets.java:808
+#: build/trans_presets.java:845 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:894 build/trans_presets.java:934
 msgid "Motorcar"
 msgstr "Voitures"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Véhicules de service public"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Bateaux à moteur"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Bateaux"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Vitesse min (km/h)"
@@ -19051,25 +19233,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Poids max (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Hauteur max. (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Largeur max. (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Longueur max. (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rond-point"
@@ -19080,5 +19262,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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Éditer une jonction"
@@ -19098,10 +19280,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -19123,10 +19305,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "voie rapide"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -19148,10 +19330,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "primary_link"
@@ -19173,5 +19355,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19186,9 +19368,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "unclassified"
@@ -19202,9 +19384,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "living_street"
@@ -19234,10 +19416,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -19267,5 +19449,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19277,10 +19459,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:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Éditer un pont"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Modifier un tunnel"
@@ -19288,19 +19470,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Chemins"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Éditer une route en construction"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Jonction"
@@ -19316,5 +19498,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "roundabout"
@@ -19322,5 +19504,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Piste"
@@ -19329,40 +19511,34 @@
 #. <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
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Éditer une route carrossable sans revêtement"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Piste"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "gravier"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19370,5 +19546,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19376,37 +19552,32 @@
 #. 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
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "VTT"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Chemin de randonnée en montagne exigeant"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Chemin de randonnée alpin"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Chemin de randonnée alpin exigeant"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Chemin de randonnée alpin difficile"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Chemin partagé"
@@ -19415,12 +19586,32 @@
 #. <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
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Editer le chemin"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "intermédiaire"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Chaise roulante"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19436,7 +19627,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Éditer un chemin équestre"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19449,7 +19639,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Éditer une voie cyclable"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19484,24 +19673,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Fusionner quand même"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Éditer un chemin pour piétons"
+msgstr ""
 
 #. 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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Éditer un chemin pour piétons"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Vélos"
@@ -19509,5 +19695,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Escaliers"
@@ -19517,5 +19703,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:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Éditer des escaliers"
@@ -19523,10 +19709,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Balises"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Jonction autoroutière"
@@ -19534,15 +19720,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Éditer une jonction autoroutière"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Numéro"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Aire de repos"
@@ -19550,5 +19736,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Éditer une aire de repos"
@@ -19556,5 +19742,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19587,17 +19774,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: 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
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Compagnie"
@@ -19606,5 +19793,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Feux tricolores"
@@ -19614,5 +19801,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Passage piéton"
@@ -19621,27 +19808,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "non contrôlé"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "feux tricolores"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "île"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Traversée à cheval"
@@ -19649,6 +19836,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Traversée à vélo"
@@ -19657,11 +19844,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Aide à la traversée (personne)"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Nom du tpe de passage (UK)"
@@ -19669,30 +19856,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pélican"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pégase"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19700,5 +19887,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Passage piéton"
@@ -19707,14 +19894,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Modifier passage piéton sur voie ferrée"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Type de nom (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-rond-point"
@@ -19725,14 +19958,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "sens horaire"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Petit élargissement pour demi-tour"
@@ -19742,26 +19975,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Limite de ville"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Éditer un signe de limite de ville"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Nom secondaire"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Radar automatique"
 
 #. item "Waypoints/Speed Camera"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Téléphone d’urgence"
@@ -19769,5 +20004,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Descente dangereuse"
@@ -19775,5 +20010,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Descente très dangereuse"
@@ -19781,11 +20016,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+msgid "Grit Bin"
+msgstr ""
+
+#. item "Waypoints/Grit Bin"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
+#. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Gué"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Modifier un gué"
@@ -19793,5 +20035,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Col de montagne"
@@ -19799,5 +20041,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Éditer un col de montagne"
@@ -19809,7 +20051,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: 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
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Altitude"
@@ -19817,5 +20059,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barrières"
@@ -19823,5 +20065,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Plot"
@@ -19829,5 +20071,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Modifier une bitte d’amarrage"
@@ -19872,16 +20114,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: 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
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Trafic autorisé:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Barrière pour cycles"
@@ -19890,5 +20132,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Ruines"
@@ -19896,5 +20138,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Grille dans le sol"
@@ -19902,10 +20144,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Modifier une grille dans le sol"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Entrée de voie de bus (Allemagne)"
@@ -19913,15 +20155,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Pointes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Modifier pointes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Péage"
@@ -19929,5 +20171,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Éditer un péage"
@@ -19935,10 +20177,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Douane"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Modifier douane"
@@ -19948,5 +20190,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Haie"
@@ -19955,12 +20197,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Barrière"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Mur"
@@ -19968,5 +20222,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Rempart"
@@ -19975,5 +20229,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Mur de soutènement"
@@ -19985,15 +20239,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Entrée"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Editez une entrée"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Porte"
@@ -20001,50 +20256,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Editer une porte"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Barrière"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Modifier une barrière"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Porte de clôture"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Modifier une Porte de clôture"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Barrière mobile"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Modifier une barrière mobile"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Portillon à chicane"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Modifier un Portillon à chicane"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Échalier"
@@ -20052,25 +20307,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Modifier un échalier"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Tourniquet"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Éditer tourniquet"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Écluse"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Modifier une écluse"
@@ -20081,11 +20336,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Eau"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Source"
@@ -20093,5 +20348,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Éditer une source"
@@ -20099,5 +20354,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Canal d’évacuation"
@@ -20105,10 +20360,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Éditer un canal d’évacuation"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Ruisseau"
@@ -20116,10 +20382,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Éditer un ruisseau"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Canal"
@@ -20127,10 +20393,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Éditer un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Rivière"
@@ -20140,5 +20406,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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Éditer une rivière"
@@ -20146,15 +20412,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Éditer de l’eau"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Terre"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Editez un terrain"
@@ -20162,15 +20428,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Bassin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Éditer un bassin"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Bassin de retenue"
@@ -20178,15 +20444,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Éditer un bassin de retenue"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Réservoir couvert"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Éditer un réservoir couvert"
@@ -20194,5 +20460,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Lit de rivière"
@@ -20201,10 +20467,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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Modifier lit de rivière"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Zone inondable"
@@ -20215,14 +20481,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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Modifier zone inondable"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "marécages"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "tourbière"
@@ -20236,35 +20502,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marais"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "roselière"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "marais salant"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "étendue vaseuse"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Terrain boueux/vase"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Éditer un terrain boueux"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Plage"
@@ -20272,20 +20538,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Éditer une plage"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Baie"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Éditer une baie"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Falaise"
@@ -20293,10 +20559,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Éditer une falaise"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Ligne côtière"
@@ -20304,5 +20570,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Éditer une ligne côtière"
@@ -20310,5 +20576,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Itinéraire de ferry"
@@ -20316,5 +20582,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Éditer un itinéraire de ferry"
@@ -20323,5 +20589,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Chantier naval"
@@ -20329,10 +20595,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Éditer un chantier naval"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dock"
@@ -20340,5 +20606,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Éditer un dock"
@@ -20346,5 +20612,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Barrage"
@@ -20352,15 +20618,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Éditer un barrage"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Voie navigable"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Écluse"
@@ -20369,5 +20635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Petit barrage"
@@ -20375,20 +20641,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Éditer une écluse"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Cascade"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Éditer une cascade"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Point de retournement"
@@ -20397,15 +20663,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Éditer une marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Jetée/Ponton"
@@ -20413,10 +20679,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Modifier jetée/ponton"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Terminal de Ferry"
@@ -20424,10 +20690,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Editer un terminal de Ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Slipway"
@@ -20437,20 +20703,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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Éditer un plan incliné"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Voie ferrée"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Rail"
@@ -20458,5 +20724,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Éditer des rails"
@@ -20465,139 +20731,378 @@
 #. <space />
 #. <key key="railway" value="rail" />
+#. <optional>
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
+#. <optional>
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. <space />
+#. <key key="railway" value="preserved" />
+#. <optional>
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. <space />
+#. <key key="railway" value="light_rail" />
+#. <optional>
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#. <space />
+#. <key key="railway" value="subway" />
+#. <optional>
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#. <space />
+#. <key key="railway" value="tram" />
+#. <optional>
+#: build/trans_presets.java:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 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
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <optional>
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+msgid "Types"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
+#. item "Transport/Railway/Monorail" combo "Types"
+#. item "Transport/Railway/Preserved" combo "Types"
+#. item "Transport/Railway/Light Rail" combo "Types"
+#. item "Transport/Railway/Subway" combo "Types"
+#. item "Transport/Railway/Tram" combo "Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "triage"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "voie de garage"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "embranchement"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "Electrified"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Electrified"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified"
+#. item "Transport/Railway/Monorail" combo "Electrified"
+#. item "Transport/Railway/Preserved" combo "Electrified"
+#. item "Transport/Railway/Light Rail" combo "Electrified"
+#. item "Transport/Railway/Subway" combo "Electrified"
+#. item "Transport/Railway/Tram" combo "Electrified"
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "contact_line"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="transport/steps.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_guideway"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="narrow_gauge"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="monorail"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="turntable"/>
+#. <icon annotate="true" src="transport/turntable.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color rail
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_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 "voie ferrée"
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Tension"
+
+#. item "Transport/Railway/Rail" combo "Voltage"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Voltage"
+#. item "Transport/Railway/Monorail" combo "Voltage"
+#. item "Transport/Railway/Preserved" combo "Voltage"
+#. item "Transport/Railway/Light Rail" combo "Voltage"
+#. item "Transport/Railway/Subway" combo "Voltage"
+#. item "Transport/Railway/Tram" combo "Voltage"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Voie ferrée étroite"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Éditer une voie ferrée étroite"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Éditer un monorail"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Préservé"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Éditer une voie ferrée touristique"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Rails légers"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Éditer des rails légers"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Voie souterraine"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Éditer un métro"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tram"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Éditer un tram"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Voie de guidage de bus"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Éditer une voie de guidage de bus"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Voie désaffectée"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Éditer une voie désaffectée"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: 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
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Types optionels"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: 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 "triage"
-
-#: 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 "voie de garage"
-
-#: 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 "embranchement"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Voie ferrée étroite"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Éditer une voie ferrée étroite"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Éditer un monorail"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Préservé"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Éditer une voie ferrée touristique"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Rails légers"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Éditer des rails légers"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Voie souterraine"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Éditer un métro"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tram"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Éditer un tram"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Voie de guidage de bus"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Éditer une voie de guidage de bus"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Voie désaffectée"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Éditer une voie désaffectée"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Voie abandonnée"
@@ -20606,5 +21111,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Passage à niveau"
@@ -20613,5 +21118,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Passage à niveau"
@@ -20621,5 +21126,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Type de passage"
@@ -20627,5 +21132,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Plaque tournante"
@@ -20634,10 +21139,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+msgid "Buffer Stop"
+msgstr ""
+
+#. item "Transport/Railway/Buffer Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
+#. <key key="railway" value="buffer_stop" />
+#: build/trans_presets.java:1289
 msgid "Aerialway"
 msgstr "Transports aériens par câble"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Télésiège"
@@ -20645,10 +21157,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Éditer un télésiège"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Téléski"
@@ -20656,10 +21168,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Éditer un téléski"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Télécabine"
@@ -20667,10 +21179,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Éditer un télécabine"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Oeufs"
@@ -20678,10 +21190,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Modifier Oeufs"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20689,12 +21201,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Éditer la station"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Station service"
@@ -20704,9 +21229,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Modifier station essence"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20760,32 +21342,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: 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
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -20844,94 +21426,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: 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
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24h/24 7j/7"
 
-#: 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
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-ven 08:30-20:00"
 
-#: 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
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Mar-dim 08:00-15:00; Sam 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20943,5 +21601,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20951,5 +21609,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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Éditer un parking"
@@ -20960,25 +21618,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: 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
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Numéro de référence"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "parking (bâtiment)"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "souterrain"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Parking relais"
@@ -20987,48 +21645,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Péage/Forfait"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Capacité (globale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Espaces pour handicapés"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Emplacements pour femmes"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Emplacements pour parents"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Voir le Wiki pour les autres types de capacité : [types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Lavage"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Editez un espace de lavage de voitures"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Réparer"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Editez un garagiste"
@@ -21036,5 +21694,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Location"
@@ -21043,10 +21701,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:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Éditer une location de voiture"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Partage"
@@ -21054,5 +21712,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Éditer un covoiturage"
@@ -21060,10 +21718,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Éditer un parking à vélo"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Capacité"
@@ -21072,15 +21730,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:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Éditer une location de vélos"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Transport public"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21090,5 +21748,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:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21096,5 +21754,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "Référence UIC"
@@ -21102,5 +21760,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Halte ferroviaire"
@@ -21108,5 +21766,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Editez un arrêt"
@@ -21114,5 +21772,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Arrêt de tram"
@@ -21121,5 +21779,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:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Éditer un arrêt de tram"
@@ -21127,5 +21785,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Quai"
@@ -21134,5 +21792,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:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Éditer un quai"
@@ -21144,5 +21802,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Référence (numéro de voie)"
@@ -21150,10 +21808,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Surface"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Bouche de métro"
@@ -21162,10 +21820,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:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Éditer une bouche de métro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Chaise roulante"
@@ -21174,5 +21832,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Gare routière"
@@ -21181,5 +21839,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:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Éditer une gare routière"
@@ -21187,5 +21845,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Arrêt de bus"
@@ -21195,5 +21853,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Éditer un arrêt de bus"
@@ -21202,25 +21860,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Abri"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Banc"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Éditer une plateforme de bus"
@@ -21228,5 +21887,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21234,5 +21893,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Editez une station de taxi"
@@ -21240,32 +21899,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Aéroport"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Modifier aéroport"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+msgid "Edit Helipad"
+msgstr ""
+
+#. item "Airport/Helipad" text "Reference"
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
+msgid "Apron"
+msgstr ""
+
+#. item "Airport/Apron" label "Apron"
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+msgid "Hangar"
+msgstr ""
+
+#. item "Airport/Hangar" label "Hangar"
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Man Made/Crane" text "Name"
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Balise signalétique"
+
+#. item "Airport/Beacon" label "Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#: build/trans_presets.java:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Voyage"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -21277,5 +22031,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hôtel"
@@ -21284,15 +22038,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:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Éditer un hôtel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Môtel"
@@ -21300,20 +22054,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Éditer un motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Chambre d’hôte"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Éditer une chambre d’hôte"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Châlet"
@@ -21321,10 +22075,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Editez un châlet"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hôtel"
@@ -21332,30 +22086,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Éditer une auberge de jeunesse"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Chalet"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Modifier chalet"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Site pour caravane"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Éditer un  site pour caravane"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Camping"
@@ -21363,10 +22117,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Éditer un camping"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Nourriture & boissons"
@@ -21377,5 +22131,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -21383,5 +22137,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Éditer un restaurant"
@@ -21389,5 +22143,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -21395,61 +22149,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italien"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "chinois"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "greque"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "allemand"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indien"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "régional"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thaïlandais"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexicain"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japonais"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -21457,9 +22223,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Éditer un fast food"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Café"
@@ -21467,9 +22241,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Editez un café"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Bar"
@@ -21477,18 +22251,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Éditer un biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -21496,9 +22270,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Modifier Bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -21506,24 +22280,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Éditer une boîte de nuit"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Editez une attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Musée"
@@ -21531,9 +22305,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Éditer un musée"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21542,9 +22316,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Editez un Zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -21552,24 +22326,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Éditer un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Éditer un parc d’attraction"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Oeuvre d’art"
@@ -21577,5 +22351,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Éditer une oeuvre d’art"
@@ -21583,19 +22357,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Office du Tourisme"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21633,5 +22407,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21639,28 +22413,28 @@
 msgstr "rue"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "Schéma"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "Site"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "Ville"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Description détaillée"
@@ -21670,5 +22444,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Routes affichées pour :"
@@ -21676,5 +22450,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Chemin de randonnée"
@@ -21682,6 +22456,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -21689,5 +22463,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "VTT"
@@ -21695,6 +22469,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Ski"
@@ -21702,5 +22476,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Equitation"
@@ -21708,46 +22482,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "…autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Bureau d’informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "Remarque"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "faune"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "Usines"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Poste d’informations"
@@ -21755,29 +22529,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Description précise"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Guide audio"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Guide audio via téléphone mobile ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Autre points d’information"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Éditer un abri"
@@ -21785,25 +22559,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Âtre"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Éditer un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Château"
@@ -21812,19 +22586,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Éditer un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Éditer des ruines"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -21833,9 +22607,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Éditer un site archéologique"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -21843,10 +22617,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Éditer un lieu de bataille"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Site paléontologique"
@@ -21854,5 +22628,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Éditer un site paléontologique"
@@ -21860,15 +22634,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument commémoratif"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Editez un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Mémorial"
@@ -21876,55 +22650,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Éditer un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Éditer une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Éditer une Chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Éditer Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Éditer un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Aire de jeux"
@@ -21932,35 +22706,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Éditer une zone de jeu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Éditer un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stade"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Éditer un stade"
@@ -21974,6 +22748,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "Selectionner un sport:"
@@ -22365,6 +23139,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22398,225 +23172,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "tir à l’arc"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "cricket_nets"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "dog_racing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "skate"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Éditer un centre sportif"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Éditer un terrain de sport"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Éditer un circuit"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Parcours de Golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Éditer un terrain de golf"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Éditer un minigolf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Editer Multi"
@@ -22655,21 +23429,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: 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
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "type"
@@ -22708,203 +23482,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: 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
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "Terrain"
 
-#: 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
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: 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
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadium"
 
-#: 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
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "№piste"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Éditer un Bowling"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Éditer athlétisme"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Éditer tir à l’arc"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Éditer escalade"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Éditer canoë"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Éditer cyclisme"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Éditer course de chiens"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Equitation"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Éditer sports équestres"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Éditer course de chevaux"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Éditer gymnastique"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Sports mécaniques"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Éditer sports mécaniques"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Skate"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Éditer patin à roulettes"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Éditer skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Natation"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Éditer natation"
@@ -22912,56 +23686,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Type de piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "de descente"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "intermédiaire"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "avancé"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Tirer"
@@ -22969,182 +23739,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Éditer tir sportif"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Sport de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Éditer football australien"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Éditer baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Éditer basketball"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Editer un Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boules"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Éditer boules"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Boules"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Éditer bowls"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Éditer cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Éditer filets de cricket"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Éditer croquet"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Éditer hockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Éditer pelote basque"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Sports de raquette"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Éditer sports de raquette"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Éditer rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Éditer tennis de table"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Éditer tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Artificiel"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Bâtiments"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Bâtiment"
@@ -23152,5 +23922,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Bâtiment officiel"
@@ -23158,10 +23928,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Éditer un bâtiment officiel"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Mairie"
@@ -23169,10 +23939,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Éditer une mairie"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambassade"
@@ -23180,10 +23950,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Editer une ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -23192,10 +23962,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Éditer un palais de justice"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Prison"
@@ -23204,10 +23974,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Éditer une prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Poste de police"
@@ -23217,10 +23987,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Éditer un poste de police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -23229,10 +23999,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Éditer une caserne de pompiers"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -23240,5 +24010,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Éditer un bureau de poste"
@@ -23246,15 +24016,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Éditer un jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "École"
@@ -23262,10 +24032,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Éditer une école"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Université"
@@ -23273,10 +24043,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Éditer une université"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -23284,5 +24054,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Éditer un établissement d’enseignement supérieur"
@@ -23290,5 +24060,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Cinema"
@@ -23297,10 +24067,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Éditer un cinéma"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliothèque"
@@ -23309,9 +24079,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Éditer une bibliothèque"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -23319,10 +24089,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Éditer un centre artistique"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Théâtre"
@@ -23331,10 +24101,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Éditer un théatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -23344,5 +24114,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Éditer un lieu de culte"
@@ -23351,6 +24121,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religion"
@@ -23359,66 +24129,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Dénomination"
@@ -23427,81 +24197,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "catholique"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresses"
@@ -23510,5 +24280,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Editez l’adresse"
@@ -23516,5 +24286,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -23522,25 +24292,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Nom de la rue"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -23549,5 +24319,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Éditer l’interpolation d’adresse"
@@ -23555,61 +24325,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Schéma de numérotation"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Usine"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Éditer une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Structure de hauteur"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Éditer une structure de hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Type de pylône"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Hauteur (mètres)"
@@ -23617,25 +24387,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Éditer un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Éditer un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Phare"
@@ -23643,10 +24413,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Éditer un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -23654,10 +24424,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Éditer un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Canalisation"
@@ -23666,37 +24436,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:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Éditer une canalisation"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "gaz"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "chaleur"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "pétrole"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "gaz"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "égouts"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "chaleur"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "toute substance"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "sous l’eau"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "aérien"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -23706,10 +24476,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Éditer une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Grue"
@@ -23717,21 +24487,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Éditer une grue permanente"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Balise signalétique"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Editer balise signalétique"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -23739,10 +24504,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Éditer un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -23750,11 +24515,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Éditer une caméra de surveillance"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -23764,35 +24541,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Éditer une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "photovoltaïque"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Station électrique"
@@ -23801,10 +24578,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Editez une station électrique"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -23813,5 +24590,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Modifier transformateur électrique"
@@ -23819,10 +24596,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Champ de vision"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -23833,23 +24610,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Éditer un pylône électrique"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "pylônes"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Référence du pylône"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Ligne haute tension"
@@ -23858,79 +24635,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Editer une ligne haute tension"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "ligne"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "ligne mineure"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Tension"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Nombre de conducteurs par câbles"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "simple"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "quadruple"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toilettes"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Téléphone"
@@ -23939,5 +24711,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Éditer un téléphone"
@@ -23945,5 +24717,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Pièces"
@@ -23951,5 +24723,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Billets"
@@ -23957,5 +24729,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Cartes de crédit temporaire"
@@ -23963,5 +24735,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -23969,15 +24741,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Cartes de crédits"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recyclage"
@@ -23986,5 +24758,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Éditer un point de recylcage"
@@ -23992,63 +24764,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Ferrailleur"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
+msgstr ""
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Accoudoir"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Matériau"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "pierre"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plastique"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "noir"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "marron"
@@ -24127,5 +24910,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24135,31 +24918,31 @@
 msgstr "espace vert"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "rouge"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "bleu"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "blanc"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -24168,30 +24951,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Masquer"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontaine"
@@ -24200,10 +24983,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -24212,10 +24995,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+msgid "Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+#: build/trans_presets.java:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -24223,15 +25019,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Concessionnaire automobile"
@@ -24239,10 +25035,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Éditer une concession/réparation"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Boutique de Cycles"
@@ -24251,28 +25047,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Éditer un magasin de vélo"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Droguerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Éditer la droguerie"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -24280,9 +25076,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Éditer une épicerie"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -24290,27 +25086,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Éditer un kiosque à journaux"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Librairie"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Éditer librairie"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Agence de voyage"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Éditer agence de voyage"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -24318,5 +25114,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Éditer un distributeur automatique"
@@ -24324,88 +25120,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Boucherie"
@@ -24413,9 +25209,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Éditer une boucherie"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Boulanger"
@@ -24423,9 +25219,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Éditer une boulangerie"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Fleuriste"
@@ -24433,18 +25229,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Modifier fleuriste"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alcool"
@@ -24452,54 +25248,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Modifier commerce d’acool"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Modifier débit de boissons"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Informatique"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -24507,9 +25303,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Modifier jardinerie"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -24517,9 +25313,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Modifier quincaillerie"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -24527,54 +25323,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Éditer un magasin de bricolage"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Jouets"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -24582,9 +25378,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Éditer un pressing"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -24592,9 +25388,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Éditer une laverie"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -24602,28 +25398,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Éditer un magasin de sports d’extérieur"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Opticien"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banque"
@@ -24631,14 +25427,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Editez une banque"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -24646,5 +25442,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Éditer un bureau de change"
@@ -24652,15 +25448,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Médecin"
@@ -24668,18 +25464,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Modifier Médecin"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -24687,5 +25483,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Éditer pharmacie"
@@ -24693,9 +25489,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Hôpital"
@@ -24703,10 +25499,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -24715,5 +25511,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Éditer point d’accès d’urgence"
@@ -24722,20 +25518,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890"
@@ -24743,5 +25539,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Vétérinaire"
@@ -24750,64 +25546,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Editez un Vétérinaire"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Géographie"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Lieux/endroits"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Pays"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Éditer un pays"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Département"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Région"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
@@ -24815,15 +25611,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -24831,10 +25627,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Editez la ville"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Banlieue"
@@ -24842,25 +25638,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Éditer une banlieue"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
@@ -24868,5 +25664,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -24874,10 +25670,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Éditer un lieu-dit"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "île"
@@ -24885,10 +25681,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Éditer une île"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "îlot"
@@ -24896,5 +25692,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Éditer l’îlot"
@@ -24902,5 +25698,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -24908,10 +25704,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Éditer une entrée de grotte"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Sommet"
@@ -24919,10 +25715,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Modifier un pic"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Glacier"
@@ -24930,10 +25726,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Éditer un glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Volcan"
@@ -24941,70 +25737,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Éditer un volcan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Nationale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politique"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Parc national"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Arbre"
@@ -25013,15 +25809,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Bois"
@@ -25030,5 +25826,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Éditer un bois"
@@ -25036,17 +25832,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Forêt"
@@ -25055,14 +25851,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Éditer une forêt"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
@@ -25070,25 +25866,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Éditer une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Éditer des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Talus"
@@ -25096,10 +25892,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Éditer un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Lande"
@@ -25107,5 +25903,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Éditer une lande"
@@ -25113,5 +25909,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -25120,45 +25916,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
@@ -25166,25 +25962,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Jardin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Herbe"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -25192,10 +25988,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Espace commun"
@@ -25203,20 +25999,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Parc"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -25224,5 +26020,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Éditer une aire de jeux"
@@ -25230,15 +26026,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -25246,9 +26042,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Éditer un petit cimetière"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -25256,39 +26052,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Éditer un cimetière"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -25296,15 +26092,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militaire"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Éditer un terrain militaire"
@@ -25312,50 +26108,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Zone de construction"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Éditer un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
@@ -25365,5 +26161,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -25372,10 +26168,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -25383,5 +26179,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -25390,5 +26186,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -25396,34 +26192,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "Interdiction d’aller tout droit"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "Obligation d’aller tout droit"
@@ -25432,15 +26228,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "chemin d’origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "nœud ou chemin de passage"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "chemin destination"
@@ -25448,5 +26244,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Route"
@@ -25455,5 +26251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Modifier une route"
@@ -25461,5 +26257,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Type de route"
@@ -25550,5 +26346,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 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
@@ -25558,17 +26354,17 @@
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "ski"
@@ -25628,5 +26424,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 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
@@ -25635,9 +26431,9 @@
 msgstr "piéton"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "détour"
@@ -25651,10 +26447,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -25662,31 +26458,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "État de la route"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -25695,107 +26491,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "point d’arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "point d’arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "point d’arrêt précédent"
-
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 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
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. 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,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. 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
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
 
 #. mappaint style named "standard"
@@ -26331,77 +27052,4 @@
 msgid "highway_track"
 msgstr "piste"
-
-#. color foot
-#. <icon annotate="true" src="transport/steps.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="bus_guideway"/>
-#. color railwaypoint
-#. <icon annotate="true" src="vehicle/crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="rail"/>
-#. color oldrail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="narrow_gauge"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="monorail"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="turntable"/>
-#. <icon annotate="true" src="transport/turntable.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="buffer_stop"/>
-#. <icon annotate="true" src="transport/buffer_stop.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="platform"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. color rail
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="funicular"/>
-#: 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 "voie ferrée"
 
 #. color rail
@@ -26789,7 +27437,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptist"
+msgstr ""
 
 #. color manmade
@@ -29928,127 +30575,48 @@
 msgstr "Sicile - Italie"
 
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Il était probablement déjà "
-#~ "désactivé."
-
-#~ msgid "Bridleway"
-#~ msgstr "Chemin équestre"
-
-#~ msgid "Cycleway"
-#~ msgstr "Voie cyclable"
-
-#~ msgid "Footway"
-#~ msgstr "Voie piétonne"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Piste grade 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Éditer une piste grade 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Piste grade 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Éditer une piste grade 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Piste grade 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Éditer une piste grade 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Piste grade 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Éditer une piste grade 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Piste grade 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Éditer une piste grade 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Éditer un chemin de randonnée"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Chemin de randonnée en montagne"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Éditer un chemin de randonnée en montagne"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Éditer un chemin de randonnée en montagne exigeant"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin exigeant"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin difficile"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "requis : Id > 0 obtenu : {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Le paramètre ''{0}'' ne doit pas être nul."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "le paramètre \"{0}\" ne doit pas être nul."
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
-
-#~ 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 ""
-#~ "Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la "
-#~ "zone téléchargée.\n"
-#~ "Certains nœuds utilisés en dehors de la zone pourraient être supprimés "
-#~ "accidentellement.\n"
-#~ "Voulez-vous vraiment continuer ?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossible d’annuler la commande « {0} » parce que la couche « {1} » n’est "
-#~ "plus présente"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Le paramètre ''{0}'' ne doit pas être vide."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "paramètre en dehors de la plage : reçu {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "index de colonne inattendu. Reçu {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Le paramètre \"{0}\" ne doit pas être vide."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflits dans les données"
+#~ msgid "Move"
+#~ msgstr "Déplacer"
+
+#~ msgid "Data Layer"
+#~ msgstr "Calque de données"
+
+#~ msgid "No data imported."
+#~ msgstr "Aucune donnée importée"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Sélectionner un marque-page en premier."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extension de fichier inconnue."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Load Selection"
+#~ msgstr "Charger la sélection"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Résoudre les conflits"
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Supprimer le calque sélectionné."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Aucune heure pour le point {0}·x·{1}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Aucune image avec des informations horaires lisibles trouvée."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "Allumage du GPS : {0}"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "Extinction du GPS : {0}"
+
+#~ msgid "timezone difference: "
+#~ msgstr "différence de fuseau horaire : "
 
 #~ msgid "image"
@@ -30056,59 +30624,4 @@
 #~ msgstr[0] "image"
 #~ msgstr[1] "images"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr ""
-#~ "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Move"
-#~ msgstr "Déplacer"
-
-#~ msgid "Data Layer"
-#~ msgstr "Calque de données"
-
-#~ msgid "No data imported."
-#~ msgstr "Aucune donnée importée"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Sélectionner un marque-page en premier."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extension de fichier inconnue."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Load Selection"
-#~ msgstr "Charger la sélection"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Résoudre les conflits"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Supprimer le calque sélectionné."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Aucune heure pour le point {0}·x·{1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Aucune image avec des informations horaires lisibles trouvée."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Allumage du GPS : {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Extinction du GPS : {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "différence de fuseau horaire : "
 
 #~ msgid "{0} within the track."
@@ -30244,4 +30757,43 @@
 #~ msgid "Navigation"
 #~ msgstr "Navigation"
+
+#~ msgid "Motorboat"
+#~ msgstr "Bateaux à moteur"
+
+#~ msgid "Boat"
+#~ msgstr "Bateaux"
+
+#~ msgid "Cycleway"
+#~ msgstr "Voie cyclable"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Piste grade 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Piste grade 2"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Piste grade 3"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Piste grade 4"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Piste grade 5"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Éditer un chemin de randonnée"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Chemin de randonnée en montagne"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Éditer un chemin de randonnée en montagne"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Éditer un chemin de randonnée en montagne exigeant"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Éditer un chemin de randonnée alpin"
 
 #~ msgid "Shop"
@@ -30339,4 +30891,10 @@
 #~ msgstr "nom"
 
+#~ msgid "Bridleway"
+#~ msgstr "Chemin équestre"
+
+#~ msgid "Footway"
+#~ msgstr "Voie piétonne"
+
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
@@ -30445,7 +31003,4 @@
 #~ msgstr "Aide sur le greffon WMS"
 
-#~ msgid "Station"
-#~ msgstr "Station"
-
 #~ msgid "Edit Station"
 #~ msgstr "Éditer la station"
@@ -30460,9 +31015,4 @@
 #~ msgstr "Charge"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Veuillez sélectionner des chemins avec des angles droits afin de les "
-#~ "orthogonaliser."
-
 #~ msgid "Drawbridge"
 #~ msgstr "Pont-levis"
@@ -30473,7 +31023,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "carte de randonnée cycliste"
-
-#~ msgid "board"
-#~ msgstr "tableau"
 
 #~ msgid "Split way segment"
@@ -30734,7 +31281,4 @@
 #~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Public"
-
 #~ msgid "Lambert Zone 2 cache file (.2)"
 #~ msgstr "Fichier tampon de la zone Lambert 2 (.2)"
@@ -30859,7 +31403,4 @@
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Synchroniser l’heure avec l’instrument GPS"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "La date indiquée ne peut être analysée."
 
 #~ msgid "Login name (email) to the OSM account."
@@ -30972,4 +31513,25 @@
 #~ msgstr "Type de bureau"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Éditer une piste grade 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Éditer une piste grade 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Éditer une piste grade 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Éditer une piste grade 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Éditer une piste grade 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Éditer un chemin de randonnée alpin exigeant"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Éditer un chemin de randonnée alpin difficile"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Modifier un pont-levis"
@@ -31003,7 +31565,4 @@
 #~ msgid "Optional"
 #~ msgstr "Optionnel"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolation"
 
 #~ msgid ""
@@ -31106,4 +31665,7 @@
 #~ msgstr "le paramètre {0} ne peut pas être vide"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Appliquer la résolution partielle"
@@ -31118,4 +31680,8 @@
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr ""
+#~ "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
 
 #~ msgid "Checking whether node {0} is gone ..."
@@ -31306,4 +31872,7 @@
 #~ msgstr "Téléchargement des référents..."
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflits dans les données"
+
 #~ msgid "Linked"
 #~ msgstr "Lié"
@@ -31335,4 +31904,9 @@
 #~ msgid "Delete all"
 #~ msgstr "Tout supprimer"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr ""
+#~ "Le greffon ne peut pas être supprimé. Il était probablement déjà "
+#~ "désactivé."
 
 #~ msgid ""
@@ -31415,4 +31989,7 @@
 #~ msgstr "Remplacer"
 
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
@@ -31448,6 +32025,15 @@
 #~ msgstr "Utiliser ensemble de changements ouvert"
 
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valeur inattendue retournée. Reçue {0}"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
 
 #~ msgid "There's no primitive with version {0} in this history."
@@ -31458,4 +32044,7 @@
 #~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "pas de verison plus ancienne trouvée. L’historique est vide."
@@ -31463,4 +32052,16 @@
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "pas de version plus récente trouvée. L’historique est vide."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "paramètre en dehors de la plage : reçu {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "index de colonne inattendu. Reçu {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "Le paramètre \"{0}\" ne doit pas être vide."
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -31486,10 +32087,25 @@
 #~ "(>=0), reçu \"{1}\""
 
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
+
 #~ msgid "NullPointerException, possibly some missing tags."
 #~ msgstr ""
 #~ "Échec (NullPointerException). Sans doute parce qu'il manque des attributs."
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Le paramètre ''{0}'' ne doit pas être nul."
+
 #~ msgid "No type found. History is empty."
 #~ msgstr "Pas de type trouvé. L'historique est vide."
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Impossible d’annuler la commande « {0} » parce que la couche « {1} » n’est "
+#~ "plus présente"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Le paramètre ''{0}'' ne doit pas être vide."
 
 #~ msgid "Please restart JOSM."
@@ -31523,2 +32139,19 @@
 #~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les "
 #~ "données."
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "requis : Id > 0 obtenu : {0}"
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "le paramètre \"{0}\" ne doit pas être nul."
+
+#~ 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 ""
+#~ "Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la "
+#~ "zone téléchargée.\n"
+#~ "Certains nœuds utilisés en dehors de la zone pourraient être supprimés "
+#~ "accidentellement.\n"
+#~ "Voulez-vous vraiment continuer ?"