Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 23107)
+++ applications/editors/josm/i18n/po/fr.po	(revision 23252)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 01:49+0000\n"
-"Last-Translator: Emilien Klein <emilien+ubuntu@klein.st>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-16 08:04+0000\n"
+"Last-Translator: Jérôme BLUM <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-09-10 20:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -81,6 +81,6 @@
 #: ../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:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -399,5 +399,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -424,4 +424,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -429,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -462,5 +463,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Information"
@@ -674,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -687,5 +688,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Supprimer"
@@ -862,14 +863,14 @@
 msgstr "Quitter l’application"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Affichage plein écran"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Basculer l’affichage plein écran"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Basculer l’affichage plein écran"
@@ -912,26 +913,22 @@
 msgstr "Afficher les informations des nœuds, chemins ou relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Joindre les zones superposées"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Joindre des zones qui se superposent"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Veuillez sélectionner au moins un chemin fermée qui doit être joint."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Seulement deux aires au maximum peuvent être jointes pour le moment."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" n’est pas fermé et ne peut donc pas être joint."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -944,5 +941,5 @@
 "Les chemins sélectionnés ont des nœuds à l'extérieur de la zone téléchargée."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -950,38 +947,68 @@
 msgstr "Cela peut conduire à la suppression accidentelle de nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Êtes-vous sûr(e) de vouloir continuer ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Veuillez abandonner svp si vous n’êtes pas sûr(e)"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Pas d’intersection trouvée. Rien n’a été modifié."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Réversion du groupe de changement"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Suppression des nœuds en doublon…"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Nœuds ajoutés sur toutes les intersections"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 "Supprimer les chemins qui ne font pas partie d’un multipolygone interne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Corriger les relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "A fusionné une aire superposée sur elle-même"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "A fusionné des aires superposées"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -991,33 +1018,22 @@
 "vérifier qu’aucune erreur n’a été introduite."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Entrer des valeurs pour tous les conflits."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Résoudre les conflits"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Résoudre les conflits d’attributs"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Séparer le segment du chemin"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Élément supprimé des relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Joindre les aires : supprimer les chemins courts"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Chemin fermé"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Supprime les attributs des chemins internes"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Fonction de jonction des aires"
@@ -1557,12 +1573,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1583,6 +1598,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1617,6 +1632,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Erreur"
@@ -1648,5 +1663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1761,5 +1776,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Fermer"
@@ -1785,5 +1800,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Non, annuler"
@@ -1815,5 +1830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2013,10 +2028,10 @@
 msgstr "Nœud séparé"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Dupliquer en {0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2429,4 +2444,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2582,17 +2598,17 @@
 msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Déplacer des éléments"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Les déplacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Annuler le déplacement"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2605,5 +2621,5 @@
 "Confirmez-vous ce déplacement massif ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2611,5 +2627,5 @@
 "rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2618,9 +2634,9 @@
 "fusionner avec le nœud le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3129,4 +3145,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3525,5 +3542,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nouvelle valeur"
@@ -3601,15 +3617,15 @@
 msgstr "Valeur de longitude ''{0}'' erronée"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Attention : impossible de forcer les préférences pour ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Erreur dans le fichier de configuration aux lignes {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3620,5 +3636,5 @@
 "préférences ''{0}'' n’est pas un dossier."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3629,5 +3645,5 @@
 "préférences ''{0}'' n’est pas un dossier.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3638,5 +3654,5 @@
 "le dossier manquant des préférences : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3647,5 +3663,5 @@
 "manquant des préférences : {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3655,5 +3671,5 @@
 "fichier de préférences par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3664,5 +3680,5 @@
 "par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3673,5 +3689,5 @@
 "le fichier des préférences par défaut : {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3683,5 +3699,5 @@
 "préférences par défaut.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3691,18 +3707,4 @@
 "Attention : l’initialisation des préférences a échoué. Impossible de "
 "rétablir le fichier des préférences par défaut : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Erreur : Ligne ''{0}'' inattendue dans le fichier des marque-pages ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans le fichier "
-"des marque-pages ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3719,28 +3721,4 @@
 msgid "Could not load preferences from server."
 msgstr "Impossible de charger les préférences depuis le serveur."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-"Erreur : ligne ''{0}'' inattendue dans le fichier des marque-pages du serveur"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans la liste des "
-"marque-pages du serveur"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Le chargement des marque-pages depuis ''{0}'' a échoué pour des raisons de "
-"sécurité. Exception : {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4144,5 +4122,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
 msgid "Offset 3.000.000m east"
-msgstr ""
+msgstr "Décalage 3 000 000 m Est"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4174,5 +4152,29 @@
 msgstr "Système UTM Geodesic"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Erreur lors de la création du dossier de cache : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+"Erreur : Ligne ''{0}'' inattendue dans le fichier des marque-pages ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans le fichier "
+"des marque-pages ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4180,9 +4182,4 @@
 "<html>Impossible de lire les marque-pages depuis<br>''{0}''<br>Erreur : {1}</"
 "html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Le marque-page ne peut être écrit.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4301,5 +4298,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "bâtiment"
@@ -4479,10 +4476,10 @@
 "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4669,8 +4666,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4898,5 +4895,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5468,9 +5465,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5483,9 +5480,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5573,5 +5569,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "rien"
@@ -5886,5 +5882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5991,11 +5987,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Ajouter"
@@ -6342,10 +6338,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Sélectionner dans la liste des relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Sélectionnez une relation dans la liste des relations."
@@ -8065,9 +8061,9 @@
 msgstr "Cette URL de requête pour le groupe de modifications n’est pas valide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Ajouter des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8076,13 +8072,13 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Une valeur vide supprime l’attribut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8090,10 +8086,10 @@
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Modifier les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8102,5 +8098,5 @@
 msgstr[1] "Modifier les propriétés de {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8109,77 +8105,86 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Sélectionnez une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Sélectionnez une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Sélectionnez les objets dont vous voulez modifier les propriétés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Afficher les propriétés de la sélection"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Position"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Modifier la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Voulez-vous vraiment supprimer la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Supprimer des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé / valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifier la valeur de la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Afficher les propriétés de la sélection"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Sélectionner une relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Sélectionner une relation dans la sélection principale."
@@ -8956,5 +8961,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9621,5 +9626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -12028,13 +12033,13 @@
 msgstr "Récupération des informations de l’utilisateur..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Paramètres avancées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Configuration directe des préférences. À utiliser avec précaution !"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -12042,14 +12047,14 @@
 msgstr "Rechercher : "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "La valeur actuelle est par défaut."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "La valeur par défaut est \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -12057,5 +12062,16 @@
 "été utilisé)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Veuillez sélectionner la ligne à supprimer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Entrez une nouvelle paire clé / valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -12063,20 +12079,13 @@
 msgstr "Veuillez sélectionner la ligne à modifier."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nouvelle valeur pour {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Veuillez sélectionner la ligne à supprimer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Entrez une nouvelle paire clé / valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Valeur"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12668,5 +12677,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Activer les valeurs par défauts"
@@ -13169,5 +13178,10 @@
 "Actuellement il est ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Impossible de lire la source des balises : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13179,10 +13193,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "Impossible de lire la source de préréglage du balisage : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13195,5 +13209,5 @@
 "width=600>L'erreur est : [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13202,5 +13216,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13212,5 +13226,5 @@
 "width=600>L'erreur est : {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13219,9 +13233,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Trier le menu des pré-réglages"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Pré-réglages des attribus"
@@ -13677,5 +13691,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:954
 msgid "Add relation"
-msgstr ""
+msgstr "Ajouter la relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:975
@@ -13702,5 +13716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 msgid "New relation"
-msgstr ""
+msgstr "Nouvelle relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1078
@@ -15305,5 +15319,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "Aucune description disponible"
@@ -15322,5 +15336,10 @@
 msgstr "Le dossier du greffon ''{0}'' ne contient pas de manifeste."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "(plus d’infos...)"
@@ -15783,5 +15802,5 @@
 "code JOSM ''{0}''. Le code utilisé par défaut est ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15893,4 +15912,28 @@
 "géométrie de la fenêtre depuis les préférences."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Changer les propriétés"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importer des images"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Télécharger une image non-géoréférencée"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Erreur pendant la création de la sauvegarde du calque supprimé : {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16273,4 +16316,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Aligner les chemins"
@@ -16281,4 +16325,6 @@
 " or put the pivot on their common node.\n"
 msgstr ""
+"Veuillez sélectionner deux segments qui ne partage aucun nœud\n"
+" ou placer le pivot sur leur nœud commun.\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:79
@@ -16291,5 +16337,5 @@
 msgstr "Cet alignement produirait des nœuds à l'extérieur du monde.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Je sui prêt"
@@ -16297,5 +16343,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "Astuces pour les AlignWays"
@@ -16878,8 +16924,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "eau"
@@ -16940,6 +16986,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adresse"
@@ -17449,6 +17495,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Calque vide"
@@ -17674,6 +17720,15 @@
 msgstr "Aucun calque GPX trouvé."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Outils externes"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "Le script enfant a retourné des données invalides."
 
@@ -17696,5 +17751,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "Utiliser des scripts externes dans JOSM"
@@ -17953,13 +18008,19 @@
 "with [irs rectify] in subject."
 msgstr ""
+"Cette option crée un ajustement du calque IRS et un petit chemin sur celui-"
+"ci. Vous devez ajuster la position du calque WMS en premier.\n"
+"Le calque résultant devra être enregistré en fichier .osm et envoyé à Komzpa "
+"(me@komzpa.net) avec pour objet [irs rectify]."
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
 msgid "Zoom level was not enough to record an offset precisely"
 msgstr ""
+"Le niveau de zoom n'était pas suffisant pour enregistrer un décalage "
+"précisément"
 
 #. if there are none, create one
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
 msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "Calque d'ajustement IRS"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18426,5 +18487,5 @@
 msgstr "Vous devez sélectionner au moins deux chemins."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -19225,4 +19286,9 @@
 msgid "Enter weight values"
 msgstr "Entrez les valeurs du poids"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nouvelle valeur pour {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -21280,5 +21346,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "zone"
@@ -21415,140 +21481,146 @@
 msgstr "{0}…"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% des traces GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Affiche la position actuelle dans la vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Importer une vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Synchroniser une vidéo avec une trace GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Supprimer une vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "supprime la vidéo actuelle du calque"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "jouer/pause"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Lecture/Pause"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "démarre/pause la reproduction vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "recule"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "recule de n secondes"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Aller en avant"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "avance"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Avancer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "avance de n secondes"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "plus rapide"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Accélérer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "reproduction plus rapide"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "plus lent"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Ralentir"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "reproduction plus lente"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "en boucle"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "reproduit en boucles les n secondes autour de la position actuelle"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Garder centré"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "suit l'icône de la vidéo automatiquement"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr "Afficher les sous-titres avec la vidéo"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Durée du saut"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Précise la durée du saut"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "Saute la reproduction de x ms"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Durée de la boucle"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Précise la durée de la boucle autour d'un point"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "pas de des-entrelacement"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr "des-entrelacement en utilisant le doublement de ligne"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr "des-entrelacement en utilisant l'interpolation linéaire"
@@ -21566,4 +21638,8 @@
 msgid "play"
 msgstr "lecture"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "en boucle"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -21676,6 +21752,12 @@
 msgstr "Le nœud ''{0}'' est une jonction avec plus de 2 chemins connectés."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Entrez une expression de recherche"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -21703,5 +21785,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Nom de la carte"
@@ -21712,6 +21794,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr "Obtenir les calques"
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Terrains de sport"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21742,5 +21825,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "URL du service WMS"
@@ -21880,5 +21963,5 @@
 "Cela peut amener à de mauvaises coordonnées."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21887,19 +21970,19 @@
 "« {0} »"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(désactivé)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21913,17 +21996,17 @@
 "vos<br>préférences.<br>Voulez-vous récupérer des tuiles WMS ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21931,33 +22014,33 @@
 "La zone demandée est trop grande. Prière de changer le zoom ou la résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Sauvegarder le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Charger le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -21966,30 +22049,30 @@
 "{1} attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Placer un marque-page WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Téléchargement automatique"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21998,5 +22081,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -22006,73 +22089,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Préférences du greffon WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modifier la liste des serveurs WMS affichée dans le menu WMS."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr "Ajouter une url de WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copier le(s) réglage(s) par défaut sélectionné(s)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Veuillez sélectionner au moins une ligne à copier."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Outil de téléchargement :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Tuiles se chevauchant"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% de l’Est :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% du Nord :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Connexions simultanées"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Nom de la carte (par défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "URL du service WMS (par défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr "Ajouter une url de WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copier le(s) réglage(s) par défaut sélectionné(s)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Veuillez sélectionner au moins une ligne à copier."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Outil de téléchargement :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Tuiles se chevauchant"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% de l’Est :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% du Nord :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Connexions simultanées"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Supprimer"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22141,5 +22235,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "forêt"
@@ -22433,6 +22527,12 @@
 msgstr "Saturation :"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22445,15 +22545,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Outils pour dessiner des bâtiments."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "Prise en charge du serveur WMS du cadastre français."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22470,10 +22570,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Crée un réseau de chemins."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22482,5 +22582,5 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -22488,5 +22588,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22495,15 +22595,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "Téléchargements de données OSM le long du chemin"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Chemins dupliqués avec un décalage"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22514,5 +22614,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -22521,15 +22621,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualise les informations comme un calque de calcul d’itinéraire."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fournir un calque d’arrière plan en affichant une grille"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22542,15 +22642,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Aide à vectoriser des images WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22560,5 +22660,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22571,5 +22671,5 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
@@ -22578,10 +22678,10 @@
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Convertir une aire en multipolygone"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22592,5 +22692,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22602,20 +22702,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Affiche une image d’arrière plan provenant d’OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importe les erreurs d’OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22625,5 +22725,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22631,5 +22731,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22640,5 +22740,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22649,10 +22749,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ajoute le thème JGoodies."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22661,15 +22761,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet à d’autres applications d’envoyer des commandes vers JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Greffon pour annuler des groupes de modifications"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22679,5 +22779,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22689,10 +22789,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Fournit des capacités de calcul d’itinéraire."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22701,5 +22801,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22709,16 +22809,31 @@
 "carte glissante en tâche de fond et demander des mises à jour."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Informations sur le greffon"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 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:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22731,15 +22846,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Créer des maisons mitoyennes depuis des blocs entiers."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22748,5 +22863,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22757,5 +22872,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22766,10 +22881,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22780,5 +22895,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22788,5 +22903,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22797,20 +22912,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Active la recherche de points importés à partir d'un fichier gpx"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Sélectionne une séquence de chemins connectés non-ramifiés"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22820,5 +22935,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23713,4 +23828,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23718,5 +23877,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rond-point"
@@ -24223,5 +24382,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "rue résidentiel"
@@ -24270,5 +24429,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "voie d’accès"
@@ -24301,6 +24460,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "construction"
@@ -25459,5 +25618,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marais"
@@ -25655,7 +25814,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "vélo"
@@ -25931,8 +26090,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "par rail"
@@ -27368,5 +27527,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "aérogare"
@@ -28639,32 +28798,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "terrain de sport"
@@ -30462,9 +30655,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "vert"
@@ -32127,5 +32320,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "métro"
@@ -32406,5 +32599,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32422,5 +32615,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "déprécié"
@@ -32797,7 +32990,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "piste"
@@ -32889,9 +33082,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "aire de repos"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32901,5 +33102,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "gué"
@@ -32918,7 +33119,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "piste"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "rond-point interne"
@@ -32933,5 +33147,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "point d’accès d’urgence"
@@ -32945,5 +33159,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "lit d’un fleuve/d’une rivière"
@@ -32957,5 +33171,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "ruisseau"
@@ -32969,5 +33183,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dock"
@@ -33171,14 +33385,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "artificiel"
@@ -33192,5 +33406,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rapides"
@@ -33252,7 +33466,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "gare/arrêt ferroviaire"
@@ -33275,10 +33489,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "autre voie ferrée"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "autre voie ferrée"
@@ -33312,7 +33526,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "ligne ferroviaire touristique"
@@ -33357,6 +33571,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aéroport"
@@ -33378,5 +33592,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "héliport"
@@ -33390,5 +33604,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "aire de stationnement pour avions"
@@ -33466,8 +33680,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "transport aérien par câble"
@@ -33483,5 +33697,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "piste de ski bleue"
@@ -33495,5 +33709,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "piste de ski rouge"
@@ -33507,5 +33721,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "piste de ski noire"
@@ -33519,5 +33733,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "piste de ski orange"
@@ -33531,5 +33745,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "piste de ski hors piste"
@@ -33543,5 +33757,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "piste de ski verte"
@@ -33661,11 +33875,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "alimentation électrique"
@@ -33678,5 +33892,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "jetée/ponton"
@@ -33690,5 +33904,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "canalisation"
@@ -33832,13 +34046,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "loisir"
@@ -33852,5 +34066,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "port"
@@ -33946,10 +34160,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "équipement"
@@ -34059,11 +34273,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "équipement de circulation"
@@ -34501,24 +34715,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "balise lumineuse"
@@ -34550,6 +34764,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "fontaine/eau potable"
@@ -34610,8 +34824,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "santé"
@@ -34972,26 +35186,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "magasin"
@@ -35063,8 +35277,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hôtel"
@@ -35164,9 +35378,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "tourisme"
@@ -35254,9 +35468,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "patrimoine"
@@ -35269,5 +35483,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "carrière"
@@ -35281,5 +35495,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "décharge"
@@ -35301,5 +35515,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "bassin"
@@ -35313,5 +35527,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "cour de ferme"
@@ -35334,5 +35548,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "commerce"
@@ -35346,5 +35560,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "zone industrielle"
@@ -35358,5 +35572,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "terrain vague"
@@ -35370,5 +35584,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "zone d’aménagement"
@@ -35382,5 +35596,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -35437,7 +35651,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "terrain militaire"
@@ -35451,5 +35665,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cimetière"
@@ -35462,5 +35676,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "sommet"
@@ -35475,5 +35689,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glacier"
@@ -35487,5 +35701,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "volcan"
@@ -35539,8 +35753,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "nature"
@@ -35554,5 +35768,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "broussailles"
@@ -35566,5 +35780,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "lande"
@@ -35578,5 +35792,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "Zone forestière"
@@ -35590,5 +35804,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "terrain boueux"
@@ -35602,5 +35816,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "plage"
@@ -35678,8 +35892,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "itinéraire"
@@ -35768,12 +35982,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "frontière"
@@ -35923,11 +36137,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "lieu"
@@ -35941,5 +36155,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "données TIGER"
@@ -36308,4 +36522,60 @@
 msgstr "PCN 2006 - Italie"
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr ""
+#~ "Seulement deux aires au maximum peuvent être jointes pour le moment."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "A fusionné une aire superposée sur elle-même"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Entrer des valeurs pour tous les conflits."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Résoudre les conflits"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Joindre les aires : supprimer les chemins courts"
+
+#~ msgid "Closed Way"
+#~ msgstr "Chemin fermé"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr ""
+#~ "Erreur : ligne ''{0}'' inattendue dans le fichier des marque-pages du "
+#~ "serveur"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans la liste "
+#~ "des marque-pages du serveur"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Le chargement des marque-pages depuis ''{0}'' a échoué pour des raisons "
+#~ "de sécurité. Exception : {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Le marque-page ne peut être écrit.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "jouer/pause"
+
+#~ msgid "forward"
+#~ msgstr "avance"
+
+#~ msgid "faster"
+#~ msgstr "plus rapide"
+
+#~ msgid "slower"
+#~ msgstr "plus lent"
+
+#~ msgid "Get Layers"
+#~ msgstr "Obtenir les calques"
+
 #~ msgid "Move"
 #~ msgstr "Déplacer"
@@ -36741,7 +37011,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "carte de randonnée cycliste"
-
-#~ msgid "Split way segment"
-#~ msgstr "Séparer le segment du chemin"
 
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
@@ -37376,7 +37643,4 @@
 #~ "{1}, valeur {2}"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
-
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "