Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 17485)
+++ applications/editors/josm/i18n/po/fr.po	(revision 17595)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-06 13:51+0200\n"
-"PO-Revision-Date: 2009-09-05 16:41+0000\n"
-"Last-Translator: David Crochet <crochet.david@free.fr>\n"
+"POT-Creation-Date: 2009-09-12 18:11+0200\n"
+"PO-Revision-Date: 2009-09-08 17:55+0000\n"
+"Last-Translator: François Blondel <Unknown>\n"
 "Language-Team: Fr\n"
 "MIME-Version: 1.0\n"
@@ -14,8 +14,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n"
+"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:193
+#: ../core/src/org/openstreetmap/josm/Main.java:194
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -23,5 +23,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:203
+#: ../core/src/org/openstreetmap/josm/Main.java:204
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -30,18 +30,20 @@
 msgstr "Aide"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:296
+#: ../core/src/org/openstreetmap/josm/Main.java:297
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "La projection {0} ne peut être activée. Utilisation de Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:534
+#: ../core/src/org/openstreetmap/josm/Main.java:298
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/Main.java:519
+#: ../core/src/org/openstreetmap/josm/Main.java:543
+#: ../core/src/org/openstreetmap/josm/Main.java:551
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -57,8 +59,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
@@ -72,6 +74,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -81,5 +83,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
@@ -99,13 +101,13 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
 msgid "Error"
 msgstr "Erreur"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/Main.java:446
+#, java-format
 msgid ""
 "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -113,44 +115,41 @@
 "There are unsaved changes in {0} layers. Discard the changes and continue?"
 msgstr[0] ""
-"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications "
-"et continuer ?"
+"Il y a des modifications non sauvegardées dans {0} calque. Ignorer les "
+"modifications et continuer ?"
 msgstr[1] ""
-"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications "
-"et continuer ?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:452
+"Il y a des modifications non sauvegardées dans {0} calques. Ignorer les "
+"modifications et continuer ?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:453
 msgid "Unsaved Changes"
 msgstr "Modifications non enregistrées"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Save and Exit"
 msgstr "Enregistrer et quitter"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Discard and Exit"
 msgstr "Annuler et quitter"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
@@ -159,11 +158,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
@@ -177,20 +177,20 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:477
+#: ../core/src/org/openstreetmap/josm/Main.java:478
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorant l’URL malformé : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:478
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:479
+#: ../core/src/org/openstreetmap/josm/Main.java:498
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -207,16 +207,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
@@ -246,17 +246,17 @@
 msgstr "Avertissement"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:496
+#: ../core/src/org/openstreetmap/josm/Main.java:497
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorant l URL malformé du fichier : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:509
-#: ../core/src/org/openstreetmap/josm/Main.java:533
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/Main.java:510
+#: ../core/src/org/openstreetmap/josm/Main.java:518
+#: ../core/src/org/openstreetmap/josm/Main.java:542
+#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
-"<html>Lecture du fichier \"{0}\" impossible. L’erreur est : <br>{1}</br></"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -343,5 +343,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
 msgstr "Greffons"
@@ -356,22 +356,19 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "WARNING: unexpected format of API base URL. Redirection to info or history "
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page "
-"d’historique des primitives OSM échouera probablement. l’URL de l’API est : "
-"\"{0}\""
+"ATTENTION : format imprévu pour l'URL de base de l'API. La redirection pour "
+"la page d'info ou d'historique pour la primitive OSM échouera probablement. "
+"L'URL de base de l'API est : ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "WARNING: unexpected format of API base URL. Redirection to user page for OSM "
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page "
-"d’historique des primitives OSM échouera probablement. l’URL de l’API est : "
-"\"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -483,9 +480,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -519,6 +516,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -537,11 +534,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
 msgstr "Information"
@@ -563,5 +560,5 @@
 msgstr "Veuillez sélectionner au moins trois nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
 #, java-format
 msgid ""
@@ -572,10 +569,10 @@
 "courant : {0}, maximum : {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
 msgid "API Capabilities Violation"
 msgstr "Violation des capacités de l’API"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
 #, java-format
 msgid ""
@@ -586,5 +583,5 @@
 "primitive supprimée {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
 #, java-format
 msgid ""
@@ -595,9 +592,9 @@
 "longueur maximale autorisée {2}. la longueur actuelle est de {3}."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
 msgid "Precondition Violation"
 msgstr "Violation de la condition prédéfinie"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
@@ -654,78 +651,62 @@
 msgstr "Aucun conflit sur lequel zoomer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 msgid "Combine Way"
 msgstr "Fusionner des chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 msgid "Combine several ways into one."
 msgstr "Fusionner plusieurs chemins en un seul."
 
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58
+msgid "Combine ways with different memberships?"
+msgstr ""
+"Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+msgid "Combine Anyway"
+msgstr "Fusionner quand même"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61
+msgid ""
+"The selected ways have differing relation memberships.  Do you still want to "
+"combine them?"
+msgstr ""
+"Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
+"Voulez-vous encore les fusionner ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+msgid "Change directions?"
+msgstr "Changer les directions ?"
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+msgid "Reverse and Combine"
+msgstr "Inverser et fusionner"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+msgid ""
+"The ways can not be combined in their current directions.  Do you want to "
+"reverse some of them?"
+msgstr ""
+"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans "
+"la même direction. En retourner certaines ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80
+msgid ""
+"Could not combine ways (They could not be merged into a single string of "
+"nodes)"
+msgstr ""
+"Impossible de fusionner les voies (Elles ne peuvent pas être fusionnées en "
+"une seule chaîne de nœuds)"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#, java-format
+msgid "Combine {0} ways"
+msgstr "Fusionner {0} voies"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228
 msgid "Please select at least two ways to combine."
 msgstr "Veuillez sélectionner au moins deux chemins à fusionner."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
-msgid "Combine ways with different memberships?"
-msgstr ""
-"Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-msgid "Combine Anyway"
-msgstr "Fusionner quand même"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
-msgid ""
-"The selected ways have differing relation memberships.  Do you still want to "
-"combine them?"
-msgstr ""
-"Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
-"Voulez-vous encore les fusionner ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-msgid "Change directions?"
-msgstr "Changer les directions ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
-msgid "Reverse and Combine"
-msgstr "Inverser et fusionner"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159
-msgid ""
-"The ways can not be combined in their current directions.  Do you want to "
-"reverse some of them?"
-msgstr ""
-"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans "
-"la même direction. En retourner certaines ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
-msgid "Enter values for all conflicts."
-msgstr "Entrer des valeurs pour tous les conflits."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-msgid "Solve Conflicts"
-msgstr "Résoudre les conflits"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#, java-format
-msgid "Combine {0} ways"
-msgstr "Fusionner {0} voies"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
-msgid "All the ways were empty"
-msgstr "Toutes les voies étaient vides"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309
-msgid ""
-"Could not combine ways (They could not be merged into a single string of "
-"nodes)"
-msgstr ""
-"Impossible de fusionner les voies (Elles ne peuvent pas être fusionnées en "
-"une seule chaîne de nœuds)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
@@ -781,5 +762,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
 msgstr "Supprimer"
@@ -789,15 +770,15 @@
 msgstr "Supprimer les objets sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
 msgid "Overwrite"
 msgstr "Écrire dessus"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210
 msgid "File exists. Overwrite?"
 msgstr "Le fichier existe déjà. Écrire dessus ?"
@@ -826,10 +807,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #, java-format
 msgid "File: {0}"
@@ -862,5 +843,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
 #, java-format
@@ -903,7 +884,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202
-#, fuzzy
 msgid "All Formats"
-msgstr "Toutes les images"
+msgstr "Tous les formats"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -933,5 +913,5 @@
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr ""
+msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
@@ -1041,1081 +1021,25 @@
 msgstr "Fusionne le calque courant avec un autre calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge Nodes"
 msgstr "Fusionner les nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 msgid "Merge nodes into the oldest one."
 msgstr "Fusionner les nœuds sur le plus ancien"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
 msgid "Please select at least two nodes to merge."
 msgstr "Veuillez sélectionner au moins deux nœuds à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
-msgid "Merge nodes with different memberships?"
-msgstr "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-msgid "Merge Anyway"
-msgstr "Fusionner tout de même"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-msgid ""
-"The selected nodes have differing relation memberships.  Do you still want "
-"to merge them?"
-msgstr ""
-"Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. Voulez-"
-"vous encore les fusionner ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr ""
-"Impossible de fusionner les nœuds : cela obligerait à supprimer un chemin "
-"encore utilisé"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301
-#, java-format
-msgid "Merge {0} nodes"
-msgstr "Fusionner {0} nœuds"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-msgid "Merge selection"
-msgstr "Fusionner la sélection"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-msgid "Merge the currently selected primitives into another layer"
-msgstr "Fusionne les primitives sélectionnées avec un autre calque"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
-msgid "Mirror"
-msgstr "Mirroir"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-msgid "Mirror selected nodes and ways."
-msgstr "Inverse les nœuds et chemins sélectionnés"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
-msgid "Please select at least one node or way."
-msgstr "Veuillez sélectionner au moins un nœud ou chemin"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
-msgid "up"
-msgstr "haut"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, java-format
-msgid "Move objects {0}"
-msgstr "Déplacer des objets {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr "bas"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr "gauche"
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-msgid "right"
-msgstr "droite"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
-#, java-format
-msgid "Move {0}"
-msgstr "Déplacer {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Moves Objects {0}"
-msgstr "Déplacer les objets {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-msgid "Cannot move objects outside of the world."
-msgstr "Impossible de déplacer des objets en dehors de la Terre."
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
-msgid "New"
-msgstr "Nouveau"
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-msgid "Create a new map."
-msgstr "Créer une nouvelle carte."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-msgid "Open..."
-msgstr "Ouvrir..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-msgid "Open a file."
-msgstr "Ouvrir un fichier"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65
-#, fuzzy
-msgid "Opening files"
-msgstr "Ouvrir un fichier"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84
-#, fuzzy, java-format
-msgid "Opening file ''{0}'' ..."
-msgstr "Rôle inconnu \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-msgid "Open Location..."
-msgstr "Ouvrir un emplacement..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-msgid "Open an URL."
-msgstr "Ouvrir une URL."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
-msgid "Separate Layer"
-msgstr "Calque séparé"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
-msgid "Enter URL to download:"
-msgstr "Saisir l'URL à télécharger :"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
-msgid "Download Location"
-msgstr "Emplacement de téléchargement"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Download URL"
-msgstr "Télécharger l'URL"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Orthogonalize Shape"
-msgstr "Rendre une forme orthogonale"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
-msgid "Only two nodes allowed"
-msgstr "Seulement deux nœuds autorisés"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
-msgid "Selection must consist only of ways."
-msgstr "La selection ne doit contenir uniquement que des chemins"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
-msgid "Please select one or more closed ways of at least four nodes."
-msgstr ""
-"Veuillez sélectionner un ou plusieurs chemins fermés ou au moins quatre "
-"nœuds."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?</html>"
-msgstr ""
-"Vous utilisez la projection EPSG:4326 qui pourrait conduire<br> à "
-"d'indésirables résultats en faisant des alignements rectangulaires."
-"<br>Changez votre projection pour supprimer cet avertissement.<br>Voulez-"
-"vous continuer ?</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
-msgid "Only one node selected"
-msgstr "Seulement un nœud sélectionné"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
-msgid "Orthogonalize"
-msgstr "Orthogonaliser"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
-msgid "Paste"
-msgstr "Coller"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-msgid "Paste contents of paste buffer."
-msgstr "Coller les contenus du presse-papier."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
-msgid "Paste Tags"
-msgstr "Coller les étiquettes"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
-msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr ""
-"Appliquer les étiquettes de la mémoire tampon aux éléments sélectionnés."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116
-#, fuzzy, java-format
-msgid "Pasting {0} tag"
-msgid_plural "Pasting {0} tags"
-msgstr[0] "Chargement {0}"
-msgstr[1] "Chargement {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117
-#, fuzzy, java-format
-msgid "to {0} primitive"
-msgid_plural "to {0} primtives"
-msgstr[0] "Restaurer {0} primitives"
-msgstr[1] "Restaurer {0} primitives"
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Preferences..."
-msgstr "Configuration..."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Open a preferences page for global settings."
-msgstr "Ouvrir la page des préférences pour les réglages généraux."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
-msgid "Preferences"
-msgstr "Préférences"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-msgid "Redo"
-msgstr "Refaire"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Refaire la dernière action annulée"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
-msgid "Rename layer"
-msgstr "Renommer le calque"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
-msgid "Also rename the file"
-msgstr "Renommer également le fichier"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
-#, java-format
-msgid "Could not rename file ''{0}''"
-msgstr "Impossible de renommer le fichier \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-msgid "Reverse Ways"
-msgstr "Inverser les chemins"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-msgid "Reverse the direction of all selected ways."
-msgstr "Inverser la direction de tous les chemins sélectionnés."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
-msgid "Please select at least one way."
-msgstr "Veuillez sélectionner au moins un chemin."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
-msgid "Reverse ways"
-msgstr "Inverser les chemins"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
-msgid "Save the current data."
-msgstr "Sauvegarder les données actuelles."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#, java-format
-msgid "File {0} exists. Overwrite?"
-msgstr "Le fichier {0} existe. L'écraser ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-msgid "No Exporter found! Nothing saved."
-msgstr "Aucun exportateur n'a été trouvés! Rien à sauver."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Empty document"
-msgstr "Document vide"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "The document contains no data."
-msgstr "Le document ne contient pas de données."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Save anyway"
-msgstr "Sauvegarder tout de même"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
-msgid "Conflicts"
-msgstr "Conflits"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Certains conflits ne sont pas résolus. Les conflits ne seront pas "
-"sauvegardés si vous ne les traitez pas. Continuer ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-msgid "Reject Conflicts and Save"
-msgstr "Rejeter les conflits et sauvegarder"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
-msgid "Save OSM file"
-msgstr "Sauvegarder le fichier OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
-msgid "Save GPX file"
-msgstr "Sauvegarder le fichier GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
-msgid "Save Layer"
-msgstr "Sauvegarder le calque"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
-msgid "Save As..."
-msgstr "Enregistrer sous…"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
-msgid "Save the current data to a new file."
-msgstr "Sauvegarder les données actuelles dans un nouveau fichier."
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid "Select All"
-msgstr "Tout sélectionner"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"Sélectionnez tous les objets non supprimés dans le calque de données. Cela "
-"sélectionne aussi les objets incomplets."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr "Afficher le rapport de statut"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-msgid "Show status report with useful information that can be attached to bugs"
-msgstr ""
-"Affiche le rapport de statut avec des informations utiles pouvant être "
-"attachées aux bogues."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
-#, java-format
-msgid "Help: {0}"
-msgstr "Aide : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-msgid "Status Report"
-msgstr "Rapport d'état"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-msgid "Copy to clipboard and close"
-msgstr "Copier vers le presse-papier et fermer"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
-msgid "Close"
-msgstr "Fermer"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-msgid "Split Way"
-msgstr "Couper un chemin"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-msgid "Split a way at the selected node."
-msgstr "Séparer un chemin au nœud sélectionné."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
-msgid "The current selection cannot be used for splitting."
-msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
-msgid "The selected node is not in the middle of any way."
-msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Le nœud sélectionné n'est pas au milieu d'un chemin."
-msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
-msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
-msgstr[0] ""
-"Il y a plus d'un chemin qui utilise le nœud sélectionné. Veuillez "
-"sélectionner le chemin également."
-msgstr[1] ""
-"Il y a plus d'un chemin qui utilise les nœuds sélectionnés. Veuillez "
-"sélectionner le chemin également."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
-msgid "The selected nodes do not share the same way."
-msgstr "Les nœuds sélectionnés ne font pas partie du même chemin."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Le chemin sélectionné ne contient pas le nœud sélectionné"
-msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
-msgid "You must select two or more nodes to split a circular way."
-msgstr ""
-"Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
-msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr ""
-"Le chemin ne peut pas être coupé aux nœuds sélectionnés. (Astuce : "
-"sélectionner les nœuds au milieu du chemin.)"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
-msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
-#, java-format
-msgid "Split way {0} into {1} parts"
-msgstr "Couper le chemin {0} en {1} parties"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-#, fuzzy
-msgid "Close current changeset"
-msgstr "Fermeture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#, fuzzy
-msgid "Close the current changeset ..."
-msgstr "Fermeture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-#, fuzzy
-msgid "There is currently no changeset open."
-msgstr "Il n'y a actuellement pas de calque WMS à ajuster."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-#, fuzzy
-msgid "No open changeset"
-msgstr "Ouverture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-#, fuzzy
-msgid "Closing changeset"
-msgstr "Fermeture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-msgid "Toggle GPX Lines"
-msgstr "Utiliser les lignes GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-msgid "Draw lines between raw gps points."
-msgstr "Dessiner des lignes entre les points GPS bruts."
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, java-format
-msgid "Toggles the global setting ''{0}''."
-msgstr "Passer à la configuration globale \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-msgid "UnGlue Ways"
-msgstr "Séparer les chemins"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Dupliquer les nœuds utilisés par plusieurs chemins."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
-msgid "This node is not glued to anything else."
-msgstr "Ce nœud n’est pas collé à quelque chose d’autre."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
-msgid "None of these nodes are glued to anything else."
-msgstr "Aucun de ces nœuds ne sont collés à autre chose."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
-msgid "None of this way's nodes are glued to anything else."
-msgstr "Aucun des nœuds de ce chemin ne sont collés à autre chose."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid "The current selection cannot be used for unglueing."
-msgstr "Rien ne peut être séparé dans la sélection actuelle."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "Select either:"
-msgstr "Sélectionner au choix :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
-msgid "* One tagged node, or"
-msgstr "* Un nœud taggué, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "* One node that is used by more than one way, or"
-msgstr "* Un nœud utilisé par plus d’un chemin, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
-"own copy and all nodes will be selected."
-msgstr ""
-"Note : Si un chemin est sélectionné,il recevra des nouvelles copies des\n"
-"nœuds séparés et les nouveaux nœuds seront sélectionnés. Sinon, tous\n"
-"les chemins recevront leur propre copie et tous les nœuds seront "
-"sélectionnés."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
-msgid "Unglued Node"
-msgstr "Nœud séparé"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
-#, java-format
-msgid "Dupe into {0} nodes"
-msgstr "Dupliquer en {0} nœuds"
-
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "Dupliquer {0} nœuds en {1} nœuds"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-msgid "Undo"
-msgstr "Annuler"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Annuler la dernière action."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
-msgid "Unselect All"
-msgstr "Tout dé-sélectionner"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-msgid "Unselect all objects."
-msgstr "Dé-sélectionner tous les objets."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-msgid "Unselect All (Focus)"
-msgstr "Désélectionner tout (Focus)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-msgid "Unselect All (Escape)"
-msgstr "Désélectionner tout (Echap)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
-msgid "Update Data"
-msgstr "Mettre à jour les données"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
-"Mettre à jour le calque de données depuis le serveur (télécharger à nouveau "
-"les données)"
-
-#. bounds defined? => use the bbox downloader
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Mise à jour des données"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
-msgid "No current dataset found"
-msgstr "Pas de jeu de données courant trouvé"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
-msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant."
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
-msgid "Update Selection"
-msgstr "Mettre à jour la sélection"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
-msgid "Updates the currently selected primitives from the server"
-msgstr "Met à jour la sélection de primitive depuis le serveur"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
-msgid "There are no selected primitives to update."
-msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour."
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
-msgid "Selection empty"
-msgstr "La sélection est vide"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
-msgid "Upload to OSM..."
-msgstr "Chargement vers OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-msgid "Upload all changes to the OSM server."
-msgstr "Envoyer tous les changements sur le serveur OSM."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#, fuzzy, java-format
-msgid ""
-"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-"resolve them first.<html>"
-msgstr ""
-"Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
-msgid "Nothing to upload. Get some data first."
-msgstr "Rien à envoyer. Obtenez d’abord des données."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
-msgid "No changes to upload."
-msgstr "Aucun changement à envoyer."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr "Synchroniser {0} {1} seulement"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
-msgid "Synchronize entire dataset"
-msgstr "Synchroniser tout le jeu de données"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>L’envoi <strong>a échoué</strong> car le serveur a une version plus "
-"récente de l’un de vos nœuds, chemins ou relations.<br>Le conflit est vient "
-"de <strong>{0}</strong> d’id <strong>{1}</strong>,<br>le serveur a la "
-"version {2}, votre version est la {3}.<br><br>Cliquez <strong>{4}</strong> "
-"pour synchroniser uniquement la primitive en conflit.<br>Cliquez <strong>{5}"
-"</strong> pour synchroniser le jeu de données local entièrement avec le "
-"serveur.<br>Cliquez <strong>{6}</strong> pour annuler et continuer l’édition."
-"<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
-msgid "Conflict detected"
-msgstr "Conflit détecté"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr "valeur inattendue retournée. Reçue {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>L’envoi <strong>a échoué</strong> car le serveur aune version plus "
-"récente de l’un de vos nœuds, chemins ou relations.<br><br>Cliquez <strong>"
-"{0}</strong> pour synchroniser l’ensemble de votre jeu de données local."
-"<br>Cliquez <strong>{1}</strong> pour annuler et continuer l’édition.<br></"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309
-#, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr ""
-"Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347
-#, java-format
-msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405
-msgid "Upload to OSM API failed"
-msgstr "L’envoi vers l’API OSM a échoué"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427
-msgid "Updating primitive"
-msgstr "Mise à jour des primitives"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474
-msgid "Upload these changes?"
-msgstr "Charger ces changements ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-msgid "Upload Changes"
-msgstr "Envoyer les changements"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527
-#, fuzzy, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr "éditer la nouvelle relation dans la couche \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658
-#, fuzzy
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Ajouter un nœud à un chemin existant."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680
-msgid "upload all changes in one request"
-msgstr "Charger tous les changements dans une requête"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Permettre l'envoi de tous les changements en une requête, désactivez pour "
-"utiliser une requête par primitive modifiée"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Fournissez un bref commentaire aux changements que vous envoyez :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731
-#, fuzzy
-msgid "Settings"
-msgstr "Réglages de la carte"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936
-#, fuzzy
-msgid "Tags of new changeset"
-msgstr "jeu de données"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755
-msgid "Objects to add:"
-msgstr "Objets à ajouter :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761
-msgid "Objects to modify:"
-msgstr "Objets à modifier :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767
-msgid "Objects to delete:"
-msgstr "Objets à supprimer :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:803
-#, fuzzy, java-format
-msgid "{0} object to add:"
-msgid_plural "{0} objects to add:"
-msgstr[0] "Objets à ajouter :"
-msgstr[1] "Objets à ajouter :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812
-#, fuzzy, java-format
-msgid "{0} object to modifiy:"
-msgid_plural "{0} objects to modify:"
-msgstr[0] "Objets à modifier :"
-msgstr[1] "Objets à modifier :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821
-#, fuzzy, java-format
-msgid "{0} object to delete:"
-msgid_plural "{0} objects to delete:"
-msgstr[0] "Objets à supprimer :"
-msgstr[1] "Objets à supprimer :"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942
-#, fuzzy, java-format
-msgid "Tags of changeset {0}"
-msgstr "Dernier changement le {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-msgid "Zoom In"
-msgstr "Zoom avant"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-msgid "Zoom Out"
-msgstr "Zoom arrière"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-msgid "Back"
-msgstr "Retour"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-msgid "Jump back."
-msgstr "Aller en arrière"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-#, java-format
-msgid "Audio: {0}"
-msgstr "Audio : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-msgid "Faster"
-msgstr "Accélérer"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-msgid "Faster Forward"
-msgstr "Avancer plus vite"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-msgid "Forward"
-msgstr "Avancer"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-msgid "Jump forward"
-msgstr "Aller en avant"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-msgid "Next Marker"
-msgstr "Marqueur suivant"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-msgid "Play next marker."
-msgstr "Lire le marqueur suivant"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-msgid "Play/Pause"
-msgstr "Lecture/Pause"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-msgid "Play/pause audio."
-msgstr "Lecture et pause du fichier audio"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-msgid "Previous Marker"
-msgstr "Marqueur précédent"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-msgid "Play previous marker."
-msgstr "Lire le marqueur précédent"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-msgid "Slower"
-msgstr "Plus lentement"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-msgid "Slower Forward"
-msgstr "Avancer plus lentement"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
-msgid "Downloading GPS data"
-msgstr "Téléchargement des données GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
-msgid "Downloaded GPX Data"
-msgstr "Données GPX téléchargées"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
-msgid "Raw GPS data"
-msgstr "Données GPS brutes"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
-msgid "Downloading data"
-msgstr "Téléchargement des données"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119
-msgid "No data imported."
-msgstr "Aucune donnée importée"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150
-msgid "OpenStreetMap data"
-msgstr "Données OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
-#, java-format
-msgid "Download {0} of {1} ({2} left)"
-msgstr "Téléchargement de {0} de {1} ({2} restant(s))"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110
-msgid "Errors during Download"
-msgstr "Erreurs durant le téléchargement"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175
-#, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-"<html>Il y a {0} primitives dans votre jeu de données local qui<br>semblent "
-"supprimées du serveur. Si vous tentez ultérieurement de les supprimer "
-"ou<br>de les mettre à jour, le serveur retournera probablement un<br>conflit."
-"<br><br>Cliquez sur <strong>{1}</strong> pour vérifier l’état de ces "
-"primitives<br>sur le serveur.<br>Cliquez sur <strong>{2}</strong> pour "
-"ignorer.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191
-msgid "Deleted or moved primitives"
-msgstr "Primitives supprimées ou déplacées"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
-msgid "Delete Mode"
-msgstr "Mode Suppression"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
-msgid "Delete nodes or ways."
-msgstr "Supprimer les nœuds ou les chemins."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
-#, java-format
-msgid "Mode: {0}"
-msgstr "Mode: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"Cliquer pour supprimer. Maj : supprimer le segment de chemin. Alt : Ne pas "
-"supprimer les nœuds non utilisés lors de la suppression du chemin. Ctrl : "
-"supprimer tous les objets utilisant cet objet."
-
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -2126,7 +1050,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
@@ -2135,6 +1060,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -2165,4 +1090,929 @@
 msgstr "le paramètre \"{0}\" ne doit pas être vide"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+msgid "Cannot merge nodes: Would have to delete a way that is still used."
+msgstr ""
+"Impossible de fusionner les nœuds : cela obligerait à supprimer un chemin "
+"encore utilisé"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "Fusionner {0} nœuds"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+msgid "Merge selection"
+msgstr "Fusionner la sélection"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+msgid "Merge the currently selected primitives into another layer"
+msgstr "Fusionne les primitives sélectionnées avec un autre calque"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+msgid "Mirror"
+msgstr "Mirroir"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+msgid "Mirror selected nodes and ways."
+msgstr "Inverse les nœuds et chemins sélectionnés"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgid "Please select at least one node or way."
+msgstr "Veuillez sélectionner au moins un nœud ou chemin"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+msgid "up"
+msgstr "haut"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#, java-format
+msgid "Move objects {0}"
+msgstr "Déplacer des objets {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+msgid "down"
+msgstr "bas"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+msgid "left"
+msgstr "gauche"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+msgid "right"
+msgstr "droite"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr "Déplacer {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "Déplacer les objets {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+msgid "Cannot move objects outside of the world."
+msgstr "Impossible de déplacer des objets en dehors de la Terre."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+msgid "New"
+msgstr "Nouveau"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+msgid "Create a new map."
+msgstr "Créer une nouvelle carte."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+msgid "Open..."
+msgstr "Ouvrir..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+msgid "Open a file."
+msgstr "Ouvrir un fichier"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+msgid "Opening files"
+msgstr "Ouverture des fichiers"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr "Ouverture du fichier ''{0}''..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+msgid "Open Location..."
+msgstr "Ouvrir un emplacement..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+msgid "Open an URL."
+msgstr "Ouvrir une URL."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
+msgid "Separate Layer"
+msgstr "Calque séparé"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
+msgid "Enter URL to download:"
+msgstr "Saisir l'URL à télécharger :"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
+msgid "Download Location"
+msgstr "Emplacement de téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+msgid "Download URL"
+msgstr "Télécharger l'URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
+msgid "Orthogonalize Shape"
+msgstr "Rendre une forme orthogonale"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
+msgid "Only two nodes allowed"
+msgstr "Seulement deux nœuds autorisés"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+msgid "Selection must consist only of ways."
+msgstr "La selection ne doit contenir uniquement que des chemins"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+msgid "Please select one or more closed ways of at least four nodes."
+msgstr ""
+"Veuillez sélectionner un ou plusieurs chemins fermés ou au moins quatre "
+"nœuds."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+"Vous utilisez la projection EPSG:4326 qui pourrait conduire<br> à "
+"d'indésirables résultats en faisant des alignements rectangulaires."
+"<br>Changez votre projection pour supprimer cet avertissement.<br>Voulez-"
+"vous continuer ?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
+msgid "Only one node selected"
+msgstr "Seulement un nœud sélectionné"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
+msgid "Orthogonalize"
+msgstr "Orthogonaliser"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+msgid "Paste"
+msgstr "Coller"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+msgid "Paste contents of paste buffer."
+msgstr "Coller les contenus du presse-papier."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+msgid "Paste Tags"
+msgstr "Coller les étiquettes"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr ""
+"Appliquer les étiquettes de la mémoire tampon aux éléments sélectionnés."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] "Collage du tag {0}"
+msgstr[1] "Collage des tags {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] "vers la primitive {0}"
+msgstr[1] "vers les primitives {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Preferences..."
+msgstr "Configuration..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Open a preferences page for global settings."
+msgstr "Ouvrir la page des préférences pour les réglages généraux."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo"
+msgstr "Refaire"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refaire la dernière action annulée"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+msgid "Rename layer"
+msgstr "Renommer le calque"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+msgid "Also rename the file"
+msgstr "Renommer également le fichier"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr "Impossible de renommer le fichier \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "Inverser les chemins"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "Inverser la direction de tous les chemins sélectionnés."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+msgid "Please select at least one way."
+msgstr "Veuillez sélectionner au moins un chemin."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+msgid "Reverse ways"
+msgstr "Inverser les chemins"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
+msgid "Save"
+msgstr "Sauvegarder"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
+msgid "Save the current data."
+msgstr "Sauvegarder les données actuelles."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "Le fichier {0} existe. L'écraser ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr "Aucun exportateur n'a été trouvés! Rien à sauver."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "Document vide"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "Sauvegarder tout de même"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "Le document ne contient pas de données."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "Conflits"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "Rejeter les conflits et sauvegarder"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Certains conflits ne sont pas résolus. Les conflits ne seront pas "
+"sauvegardés si vous ne les traitez pas. Continuer ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "Sauvegarder le fichier OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "Sauvegarder le fichier GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "Sauvegarder le calque"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
+msgid "Save As..."
+msgstr "Enregistrer sous…"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
+msgid "Save the current data to a new file."
+msgstr "Sauvegarder les données actuelles dans un nouveau fichier."
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+"Sélectionnez tous les objets non supprimés dans le calque de données. Cela "
+"sélectionne aussi les objets incomplets."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "Afficher le rapport de statut"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr ""
+"Affiche le rapport de statut avec des informations utiles pouvant être "
+"attachées aux bogues."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr "Aide : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+msgid "Status Report"
+msgstr "Rapport d'état"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+msgid "Copy to clipboard and close"
+msgstr "Copier vers le presse-papier et fermer"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
+msgid "Close"
+msgstr "Fermer"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+msgid "Split Way"
+msgstr "Couper un chemin"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+msgid "Split a way at the selected node."
+msgstr "Séparer un chemin au nœud sélectionné."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+msgid "The current selection cannot be used for splitting."
+msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "Le nœud sélectionné n'est pas au milieu d'un chemin."
+msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] ""
+"Il y a plus d'un chemin qui utilise le nœud sélectionné. Veuillez "
+"sélectionner le chemin également."
+msgstr[1] ""
+"Il y a plus d'un chemin qui utilise les nœuds sélectionnés. Veuillez "
+"sélectionner le chemin également."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+msgid "The selected nodes do not share the same way."
+msgstr "Les nœuds sélectionnés ne font pas partie du même chemin."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "Le chemin sélectionné ne contient pas le nœud sélectionné"
+msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+msgid "You must select two or more nodes to split a circular way."
+msgstr ""
+"Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr ""
+"Le chemin ne peut pas être coupé aux nœuds sélectionnés. (Astuce : "
+"sélectionner les nœuds au milieu du chemin.)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>L'appartenance à une relation basée sur un rôle a été copiée vers tous "
+"les nouveaux chemins.<br>Vous devriez vérifier cela et le corriger si "
+"nécessaire.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>L'appartenance à une relation a été copiée vers tous les nouveaux "
+"chemins.<br>Vous devriez vérifier cela et le corriger si nécessaire.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "Couper le chemin {0} en {1} parties"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
+msgid "Close current changeset"
+msgstr "Fermer ensemble de changements actuel"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
+msgid "Close the current changeset ..."
+msgstr "Fermer l'ensemble de changements actuel..."
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
+msgid "There is currently no changeset open."
+msgstr "Aucun ensemble de changements n'est actuellement ouvert."
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
+msgid "No open changeset"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
+msgid "Closing changeset"
+msgstr "Fermeture de l'ensemble de changements"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Toggle GPX Lines"
+msgstr "Utiliser les lignes GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Dessiner des lignes entre les points GPS bruts."
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr "Passer à la configuration globale \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+msgid "UnGlue Ways"
+msgstr "Séparer les chemins"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "Dupliquer les nœuds utilisés par plusieurs chemins."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgid "This node is not glued to anything else."
+msgstr "Ce nœud n’est pas collé à quelque chose d’autre."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+msgid "None of these nodes are glued to anything else."
+msgstr "Aucun de ces nœuds ne sont collés à autre chose."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+msgid "None of this way's nodes are glued to anything else."
+msgstr "Aucun des nœuds de ce chemin ne sont collés à autre chose."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "The current selection cannot be used for unglueing."
+msgstr "Rien ne peut être séparé dans la sélection actuelle."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "Select either:"
+msgstr "Sélectionner au choix :"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid "* One tagged node, or"
+msgstr "* Un nœud taggué, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid "* One node that is used by more than one way, or"
+msgstr "* Un nœud utilisé par plus d’un chemin, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr ""
+"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"Note : Si un chemin est sélectionné,il recevra des nouvelles copies des\n"
+"nœuds séparés et les nouveaux nœuds seront sélectionnés. Sinon, tous\n"
+"les chemins recevront leur propre copie et tous les nœuds seront "
+"sélectionnés."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+msgid "Unglued Node"
+msgstr "Nœud séparé"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr "Dupliquer en {0} nœuds"
+
+#. only one changeCommand for a way, else garbage will happen
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#, java-format
+msgid "Dupe {0} nodes into {1} nodes"
+msgstr "Dupliquer {0} nœuds en {1} nœuds"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo"
+msgstr "Annuler"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Annuler la dernière action."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+msgid "Unselect All"
+msgstr "Tout dé-sélectionner"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect all objects."
+msgstr "Dé-sélectionner tous les objets."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+msgid "Unselect All (Focus)"
+msgstr "Désélectionner tout (Focus)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+msgid "Unselect All (Escape)"
+msgstr "Désélectionner tout (Echap)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+msgid "Update Data"
+msgstr "Mettre à jour les données"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
+msgid "Updates the current data layer from the server (re-downloads data)"
+msgstr ""
+"Mettre à jour le calque de données depuis le serveur (télécharger à nouveau "
+"les données)"
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
+msgid "Updating data"
+msgstr "Mise à jour des données"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
+msgid "No current dataset found"
+msgstr "Pas de jeu de données courant trouvé"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+msgid "Didn't find a primitive with id {0} in the current dataset"
+msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
+msgid "Update Selection"
+msgstr "Mettre à jour la sélection"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
+msgid "Updates the currently selected primitives from the server"
+msgstr "Met à jour la sélection de primitive depuis le serveur"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
+msgid "There are no selected primitives to update."
+msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
+msgid "Selection empty"
+msgstr "La sélection est vide"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+msgid "Upload to OSM..."
+msgstr "Chargement vers OSM..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "Upload all changes to the OSM server."
+msgstr "Envoyer tous les changements sur le serveur OSM."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#, fuzzy, java-format
+msgid ""
+"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+"resolve them first.</html>"
+msgstr ""
+"<html>Il y a des conflits non résolus dans le calque ''{0}''.<br>Vous devez "
+"d'abord les résoudre.<html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+msgid "Nothing to upload. Get some data first."
+msgstr "Rien à envoyer. Obtenez d’abord des données."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+msgid "No changes to upload."
+msgstr "Aucun changement à envoyer."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr "Synchroniser {0} {1} seulement"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+msgid "Synchronize entire dataset"
+msgstr "Synchroniser tout le jeu de données"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>L’envoi <strong>a échoué</strong> car le serveur a une version plus "
+"récente de l’un de vos nœuds, chemins ou relations.<br>Le conflit est vient "
+"de <strong>{0}</strong> d’id <strong>{1}</strong>,<br>le serveur a la "
+"version {2}, votre version est la {3}.<br><br>Cliquez <strong>{4}</strong> "
+"pour synchroniser uniquement la primitive en conflit.<br>Cliquez <strong>{5}"
+"</strong> pour synchroniser le jeu de données local entièrement avec le "
+"serveur.<br>Cliquez <strong>{6}</strong> pour annuler et continuer l’édition."
+"<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+msgid "Conflict detected"
+msgstr "Conflit détecté"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#, java-format
+msgid "unexpected return value. Got {0}"
+msgstr "valeur inattendue retournée. Reçue {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>L’envoi <strong>a échoué</strong> car le serveur aune version plus "
+"récente de l’un de vos nœuds, chemins ou relations.<br><br>Cliquez <strong>"
+"{0}</strong> pour synchroniser l’ensemble de votre jeu de données local."
+"<br>Cliquez <strong>{1}</strong> pour annuler et continuer l’édition.<br></"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr ""
+"Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#, java-format
+msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
+msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#, java-format
+msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+msgid "Upload to OSM API failed"
+msgstr "L’envoi vers l’API OSM a échoué"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+msgid "Updating primitive"
+msgstr "Mise à jour des primitives"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "Envoie des données pour le calque ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+msgid "Zoom In"
+msgstr "Zoom avant"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+msgid "Zoom Out"
+msgstr "Zoom arrière"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgid "Back"
+msgstr "Retour"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+msgid "Jump back."
+msgstr "Aller en arrière"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#, java-format
+msgid "Audio: {0}"
+msgstr "Audio : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgid "Faster"
+msgstr "Accélérer"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+msgid "Faster Forward"
+msgstr "Avancer plus vite"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgid "Forward"
+msgstr "Avancer"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+msgid "Jump forward"
+msgstr "Aller en avant"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgid "Next Marker"
+msgstr "Marqueur suivant"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgid "Play next marker."
+msgstr "Lire le marqueur suivant"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/Pause"
+msgstr "Lecture/Pause"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "Lecture et pause du fichier audio"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgid "Previous Marker"
+msgstr "Marqueur précédent"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgid "Play previous marker."
+msgstr "Lire le marqueur précédent"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgid "Slower"
+msgstr "Plus lentement"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgid "Slower Forward"
+msgstr "Avancer plus lentement"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
+msgid "Downloading GPS data"
+msgstr "Téléchargement des données GPS"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
+msgid "Downloaded GPX Data"
+msgstr "Données GPX téléchargées"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
+msgid "Raw GPS data"
+msgstr "Données GPS brutes"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
+msgid "Downloading data"
+msgstr "Téléchargement des données"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+"Ignore l'exception car le téléchargement a été annulé. L'exception était : "
+"{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
+msgid "No data imported."
+msgstr "Aucune donnée importée"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
+msgid "OpenStreetMap data"
+msgstr "Données OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "Téléchargement de {0} de {1} ({2} restant(s))"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
+#, java-format
+msgid "The following errors occurred during mass download:{0}"
+msgstr ""
+"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
+msgid "Errors during Download"
+msgstr "Erreurs durant le téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them the "
+"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
+msgstr ""
+"<html>Il y a {0} primitives dans votre jeu de données local qui<br>semblent "
+"supprimées du serveur. Si vous tentez ultérieurement de les supprimer "
+"ou<br>de les mettre à jour, le serveur retournera probablement un<br>conflit."
+"<br><br>Cliquez sur <strong>{1}</strong> pour vérifier l’état de ces "
+"primitives<br>sur le serveur.<br>Cliquez sur <strong>{2}</strong> pour "
+"ignorer.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+msgid "Deleted or moved primitives"
+msgstr "Primitives supprimées ou déplacées"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+msgid "Delete Mode"
+msgstr "Mode Suppression"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
+msgid "Delete nodes or ways."
+msgstr "Supprimer les nœuds ou les chemins."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+#, java-format
+msgid "Mode: {0}"
+msgstr "Mode: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"Cliquer pour supprimer. Maj : supprimer le segment de chemin. Alt : Ne pas "
+"supprimer les nœuds non utilisés lors de la suppression du chemin. Ctrl : "
+"supprimer tous les objets utilisant cet objet."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
@@ -2281,18 +2131,18 @@
 "audio à ce point."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 msgid "Select, move and rotate objects"
 msgstr "Sélectionner, déplacer et tourner des objets"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2301,18 +2151,18 @@
 msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
 msgid "Move elements"
 msgstr "Déplacer des éléments"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr "Les déplacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr "Annuler déplacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
+#, java-format
 msgid ""
 "You moved more than {0} elements. Moving a large number of elements is often "
@@ -2320,11 +2170,11 @@
 "Really move them?"
 msgstr ""
-"Vous avez déplacer plus de {0} éléments. Le déplacement d'un aussi grand "
-"nombre d'éléments is souvent une erreur.\n"
-"Souhaitez vous les déplacer ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476
+"Vous avez déplacé plus de {0} éléments. Déplacer un grand nombre d'éléments "
+"est souvent une erreur.\n"
+"Confirmez-vous ce déplacement massif ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
 msgid "Always move and don't show dialog again"
-msgstr ""
+msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
@@ -2450,7 +2300,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
-#, fuzzy
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objet avec l'ID spécifié"
+msgstr "<b>id :</b>... - objet avec l'ID indiqué (0 pour les nouveaux objets)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
@@ -2506,41 +2355,41 @@
 msgstr "Chercher"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Start Search"
 msgstr "Commencer la recherche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Aucun résultat trouvé pour \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} résultats trouvés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
 #, java-format
 msgid ""
@@ -2554,5 +2403,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2560,10 +2409,10 @@
 "d'utilisation : clé=valeur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
+msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est illégal !"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2572,26 +2421,26 @@
 "relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Jeton inattendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530
 msgid "Missing arguments for or."
 msgstr "Arguments manquants pour le OU"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540
 msgid "Missing argument for not."
 msgstr "Arguments manquants pour le -"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550
 msgid "Expected closing parenthesis."
 msgstr "Les parenthèses doivent être fermées."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 #, java-format
 msgid ""
@@ -2603,5 +2452,5 @@
 "10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2638,62 +2487,62 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "Add node {0}"
-msgstr "Ajouter un nœud"
+msgstr "Ajouter le nœud {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#, fuzzy, java-format
+#, java-format
 msgid "Add way {0}"
-msgstr "Ajouter {0} {1}"
+msgstr "Ajouter le chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
-#, fuzzy, java-format
+#, java-format
 msgid "Add relation {0}"
-msgstr "Relations : {0}"
+msgstr "Ajouter la relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Change node {0}"
-msgstr "Ensemble de changements {0}"
+msgstr "Modifier le nœud {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
-#, fuzzy, java-format
+#, java-format
 msgid "Change way {0}"
-msgstr "Ensemble de changements {0}"
+msgstr "Modifier le chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
-#, fuzzy, java-format
+#, java-format
 msgid "Change relation {0}"
-msgstr "Changer la relation"
+msgstr "Modifier la relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "enlever \"{0}\" de {1} \"{2}\""
+msgstr "Supprimer \"{0}\" du nœud ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr "enlever \"{0}\" de {1} \"{2}\""
+msgstr "Supprimer \"{0}\" du chemin ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "enlever \"{0}\" de {1} \"{2}\""
+msgstr "Supprimer \"{0}\" de la relation ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr "Mettre {0}={1} pour {2}\"{3}\""
+msgstr "Mettre {0}={1} pour le nœud ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr "Mettre {0}={1} pour {2}\"{3}\""
+msgstr "Mettre {0}={1} pour le chemin ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr "Mettre {0}={1} pour {2}\"{3}\""
+msgstr "Mettre {0}={1} pour la relation ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -2739,9 +2588,11 @@
 "primitmive ''{1}''"
 msgstr ""
+"Attention : La couche ''{0}'' n'existe plus. Impossible de supprimer le "
+"conflit pour l'élément ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
 #, java-format
 msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "Ajouter conflit pour ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
@@ -2765,30 +2616,30 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] "Supprimer {0} {1}"
-msgstr[1] "Supprimer {0} {1}"
+msgstr[0] "Supprimer {0} objet"
+msgstr[1] "Supprimer {0} objets"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] "Mode Suppression"
-msgstr[1] "Mode Suppression"
+msgstr[0] "Supprimer {0} nœud"
+msgstr[1] "Supprimer {0} nœuds"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] "Supprimer {0} {1}"
-msgstr[1] "Supprimer {0} {1}"
+msgstr[0] "Supprimer {0} chemin"
+msgstr[1] "Supprimer {0} chemins"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] "Supprimer de la relation"
-msgstr[1] "Supprimer de la relation"
+msgstr[0] "Supprimer {0} relation"
+msgstr[1] "Supprimer {0} relations"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
@@ -2802,20 +2653,20 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
 "from relation?</html>"
 msgstr ""
-"Sélection \"{0}\" est utilisé par la relation \"{1}\" avec le role {2}.\n"
-"Supprimer de la relation ?"
+"<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le rôle "
+"{2}.<br>Enlever de la relation ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
 "</html>"
 msgstr ""
-"La sélection \"{0}\" est utilisée par la relation \"{1}\".\n"
-"Supprimer de la relation ?"
+"<html>La sélection \"{0}\" est utilisée par la relation \"{1}\".<br>Enlever "
+"de la relation ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
@@ -2826,5 +2677,5 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2883,15 +2734,15 @@
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Supprimer le nœud ''{0}'' à la position {1} de la relation ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Supprimer le chemin ''{0}'' à la position {1} de la relation ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
@@ -2907,17 +2758,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
+msgstr "Résoudre {0} conflits de tag pour le nœud {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
+msgstr "Résoudre {0} conflits de tag pour le chemin {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
+msgstr "Résoudre {0} conflits de tag pour la relation {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2927,17 +2778,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for node {0}"
-msgstr "Résoudre les conflits de version de {0} {1}"
+msgstr "Résoudre les conflits de version pour le nœud {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr "Résoudre les conflits de version de {0} {1}"
+msgstr "Résoudre les conflits de version pour le chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr "Résoudre les conflits de version de {0} {1}"
+msgstr "Résoudre les conflits de version pour la relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
@@ -3019,5 +2870,5 @@
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "Attention : impossible de forcer les préférences pour ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
@@ -3027,11 +2878,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
 "isn't a directory."
 msgstr ""
-"impossible de définir la référence. la référence d’id {0} ne correspond pas "
-"à l'historique d’id {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
@@ -3061,4 +2910,6 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"Attention : fichier de préférences ''{0}'' absent. Création d'un fichier de "
+"préférences par défaut."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
@@ -3068,4 +2919,6 @@
 "file."
 msgstr ""
+"Attention : remplacement du fichier de préférences existant ''{0}'' par un "
+"fichier par défaut."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
@@ -3077,11 +2930,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
 "<br> and creating a new default preference file.</html>"
 msgstr ""
-"Le fichier des préférences contient des erreurs. Sauvegarde de l’ancien "
-"fichier dans {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -3148,5 +2999,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
 #, java-format
@@ -3154,22 +3005,47 @@
 msgstr "Ensemble de changements {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "paramètre {0} > 0 requis. Reçu {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
+#, fuzzy, java-format
+msgid "paramete''{0}'' must not be null"
+msgstr "le paramètre \"{0}\" ne doit pas être vide"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
+#, fuzzy, java-format
+msgid "unsupported value ''{0}'' or parameter ''{1}''"
+msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Error: {0}"
 msgstr "Erreur : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Warning: {0}"
 msgstr "Attention : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#, fuzzy, java-format
+msgid "expected id >= 0. Got {0}"
+msgstr "index de colonne inattendu. Reçu {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#, fuzzy, java-format
+msgid "id > 0 expected. Got {0}"
+msgstr "Jeton inattendu : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#, fuzzy, java-format
+msgid "version > 0 expected. Got {0}"
+msgstr "Jeton inattendu : {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
@@ -3183,11 +3059,16 @@
 msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
 "tag collection can't be applied to a primitive because there are keys with "
 "multiple values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
+msgid "can't add node {0} to incomplete way {1}"
 msgstr ""
 
@@ -3241,9 +3122,9 @@
 "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
 msgid "Area style way is not closed."
 msgstr "La zone n'est pas fermée."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3252,105 +3133,105 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
 msgid "Empty member in relation."
 msgstr "Membre vide dans la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membre \"{0}\" supprimé de la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Chemin \"{0}\" comporte moins de deux points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Plus d'un chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Plus d'un chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Plus d'un \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rôle inconnu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Type de membre inconnu pour \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Pas de chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Pas de chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Pas de noeud ou de chemin \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:660
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:673
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:677
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Le style de la restriction {0} n'a pas été trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-chemin \"{0}\" dans le multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -3358,14 +3239,14 @@
 "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
 msgid "untagged"
 msgstr "non étiqueté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
 msgid "text"
 msgstr "texte"
@@ -3391,5 +3272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3400,5 +3281,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3409,5 +3290,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3490,7 +3371,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>Les signets ne peuvent être lus.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
@@ -3521,5 +3402,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "railway"
 msgstr "voie ferrée"
@@ -3551,138 +3432,34 @@
 msgstr[1] "{0} membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
-"the server URL in your preferences and your internet connection.</html>"
-msgstr ""
-"Impossible d’initialiser la communication avec le serveur OSM {0}.\n"
-"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion "
-"Internet."
-
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-msgid "unknown"
-msgstr "inconnu"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#, java-format
-msgid ""
-"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-"changeset will automatically be closed by the server after a timeout.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
-#, java-format
-msgid ""
-"<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
-msgstr ""
-"<html>L’envoi vers le serveur <strong>a échoué</strong> car votre jeu "
-"de<br>données courant ne rempli pas une condition préalable.<br>Le message "
-"d’erreur est :<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
 msgid "Precondition violation"
 msgstr "Condition préalable non remplie"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-"security reasons. This is most likely because you are running<br>in an "
-"applet and because you didn''t load your applet from ''{1}''.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
 msgid "Security exception"
 msgstr "Exception de sécurité"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
-"check your internet connection.</html>"
-msgstr ""
-"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
-"votre connexion internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
 msgid "Network exception"
 msgstr "Exception de réseau"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179
-#, java-format
-msgid ""
-"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
-"problem with transferring data.<br>Details(untranslated): {1}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
 msgid "IO Exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203
-#, java-format
-msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213
+msgstr "Exception E/S"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
-"preferences and your internet connection.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#, fuzzy
+msgid "Bad Request"
+msgstr "Éditer sports de raquette"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "Unknown host"
 msgstr "Hôte inconnu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because a primitive you tried "
-"to<br>delete on the server is already deleted.<br><br>The error message is:"
-"<br>{0}</html>"
-msgstr ""
-"<html>Le chargement <strong>a échoué</strong> car une primitive que "
-"vous<br>essayez de supprimer sur le serveur est déjà supprimée.<br><br>Le "
-"message d’erreur est :<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231
 msgid "Primitive already deleted"
 msgstr "Primitive déjà supprimée"
@@ -3832,9 +3609,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr ""
+msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/         "
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Change the folder for all user settings"
-msgstr ""
+msgstr "Changer le répertoire pour tous les paramètres utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
@@ -3844,4 +3621,7 @@
 "      Java option to increase the maximum size of allocated memory"
 msgstr ""
+"note : pour certaines tâches, JOSM requiert beaucoup de mémoire. Il est peut-"
+"être nécessaire d'ajouter l'option Java \n"
+"      pour augmenter la taille maximale de mémoire allouée"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
@@ -3904,5 +3684,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
 msgid "Menu: {0}"
@@ -4301,4 +4081,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
@@ -4374,8 +4156,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
@@ -4509,5 +4291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63
 msgid "deleted"
 msgstr "supprimé"
@@ -4567,10 +4349,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:197
 msgid "No, abort"
 msgstr "Non, annuler"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -4578,7 +4360,4 @@
 "yo agree?</html>"
 msgstr ""
-"<html>Pour conserver votre version locale, JOSM<br>doit réinitialiser l’id "
-"de {0} {1} à 0.<br>Lors du prochain envoi le serveur lui assignera un nouvel "
-"id<br>Êtes-vous d'accord ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590
@@ -4612,4 +4391,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/PropertiesDialog.java:488
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
@@ -4623,5 +4403,5 @@
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4732,4 +4512,40 @@
 msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
+msgid "Conflicts when combining primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
+#, java-format
+msgid "Conflicts when combining ways - combined way is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
+#, java-format
+msgid "Conflicts when merging nodes - merged node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
+#, fuzzy
+msgid "No conflicts to resolve"
+msgstr "Aucun conflit d’étiquette n'est résolu"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgid "Cancel conflict resolution"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgid "Apply resolved conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+msgid "Apply"
+msgstr "Appliquer"
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -4742,24 +4558,23 @@
 msgstr "all"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr "Choisir une couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43
+msgstr "Choisir une valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47
-#, fuzzy, java-format
+msgstr "Choisissez les valeurs à conserver"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
+#, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
+msgstr "La valeur ''{0}'' va être appliquée à la clé ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
@@ -4767,12 +4582,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' must not be empty"
-msgstr "le paramètre \"{0}\" ne doit pas être vide"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
@@ -4780,15 +4595,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
 msgid "not yet decided"
-msgstr "non supprimé"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr "Pas encore implémenté."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
@@ -4797,17 +4612,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-#, fuzzy
 msgid "Tags from ways"
-msgstr "chemin d'origine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-#, fuzzy
 msgid "Tags from relations"
-msgstr "Supprimer de la relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-#, fuzzy
 msgid "Conflicts in pasted tags"
-msgstr "Conflits dans les données"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
@@ -4831,24 +4643,8 @@
 msgstr[1] "{0} relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
-#, fuzzy
-msgid "Cancel conflict resolution"
-msgstr "Résolution de conflits"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
-#, fuzzy
-msgid "Apply resolved conflicts"
-msgstr "Résoudre les conflits"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-msgid "Apply"
-msgstr "Appliquer"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
-#, fuzzy
 msgid "Paste ..."
-msgstr "Coller"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
@@ -4863,9 +4659,75 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
-#, fuzzy, java-format
+#, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] "{0} voie"
-msgstr[1] "{0} voies"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "pos {0} is out of range. current number of members: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#, fuzzy
+msgid "Remove this relation member from the relation"
+msgstr "Supprimer le membre de cette relation de l'entrée actuelle de la table"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+#, fuzzy
+msgid "Replace"
+msgstr "lieu"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#, fuzzy
+msgid "Undecided"
+msgstr "Ne pas départager"
+
+#. --- role editing
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+msgid "Role:"
+msgstr "Rôle :"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
+msgid "Tag modified relations with   "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+msgid "Key:"
+msgstr "Clé :"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
+#, fuzzy
+msgid "Value:"
+msgstr "Valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
+msgid "Apply this role to all members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
+#, fuzzy
+msgid "Orig. Way"
+msgstr "Sens unique"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
+#, fuzzy
+msgid "Decision"
+msgstr "Révision"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4892,5 +4754,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 #, java-format
 msgid "Toggle: {0}"
@@ -4923,5 +4785,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -4996,13 +4858,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, fuzzy, java-format
+#, java-format
 msgid "Way {0}"
-msgstr "Couche : {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, fuzzy, java-format
+#, java-format
 msgid "Relation {0}"
-msgstr "Relations : {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
@@ -5088,5 +4950,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
 msgid "<different>"
 msgstr "<différent>"
@@ -5146,5 +5008,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
 msgstr "Ajouter"
@@ -5194,5 +5056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3109
 msgid "Relations"
 msgstr "Relations"
@@ -5290,9 +5152,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] "Auteur"
-msgstr[1] "Auteur"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
@@ -5301,20 +5163,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
-#, fuzzy
 msgid "Show info"
-msgstr "Afficher"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
-#, fuzzy
 msgid "Launches a browser with information about the user"
-msgstr "Plus d'informations à propos de cette balise"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
-"ATTENTION : ouverture des’ fenêtres du navigateur pour les {0} sur {1} "
-"primitives sélectionnées uniquement."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
@@ -5391,5 +5249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5409,9 +5267,4 @@
 msgid "Child Relations"
 msgstr "Relations enfants"
-
-#. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
-msgid "Role:"
-msgstr "Rôle :"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
@@ -5665,11 +5518,11 @@
 msgstr "Lié"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
 msgstr "télécharger les relations référentes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "child.id >0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#, java-format
+msgid "child.getId() >0 expected. Got {1}"
 msgstr ""
 
@@ -5683,7 +5536,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
-#, fuzzy
 msgid "Loading parent relations"
-msgstr "Charger les relations parentes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5813,5 +5665,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2747
 msgid "Places"
 msgstr "Lieux/endroits"
@@ -5889,9 +5741,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
+#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
 "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Click."
-msgstr ""
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"Zoom : molette de souris ou double-clic.   Déplacer la carte : garder le "
+"bouton droit de souris enfoncé et déplacer la souris.   Sélection : Clic"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5921,17 +5776,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, fuzzy, java-format
+#, java-format
 msgid "History for node {0}"
-msgstr "Historique de {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, fuzzy, java-format
+#, java-format
 msgid "History for way {0}"
-msgstr "Historique de {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "History for relation {0}"
-msgstr "Historique de {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
@@ -5940,7 +5795,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#, fuzzy
 msgid "Reload the history from the server"
-msgstr "Afficher l'historique de la primitive sélectionnée"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
@@ -5983,22 +5837,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "id > 0 expected, got {0}"
-msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
-#, fuzzy, java-format
+#, java-format
 msgid "Loading history for node {0}"
-msgstr "Chargement de l’historique de {0} d’id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
-#, fuzzy, java-format
+#, java-format
 msgid "Loading history for way {0}"
-msgstr "Chargement de l’historique de {0} d’id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Loading history for relation {0}"
-msgstr "Chargement de l’historique de {0} d’id {1}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6833,78 +6687,74 @@
 #: build/trans_presets.java:2332 build/trans_presets.java:2338
 #: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2448 build/trans_presets.java:2455
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2489
-#: build/trans_presets.java:2495 build/trans_presets.java:2501
-#: build/trans_presets.java:2523 build/trans_presets.java:2530
-#: build/trans_presets.java:2537 build/trans_presets.java:2543
-#: build/trans_presets.java:2550 build/trans_presets.java:2556
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2587 build/trans_presets.java:2594
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2674
-#: build/trans_presets.java:2683 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2712
-#: build/trans_presets.java:2719 build/trans_presets.java:2739
-#: build/trans_presets.java:2749 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2780
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: build/trans_presets.java:2828 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2897 build/trans_presets.java:2907
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2928 build/trans_presets.java:2933
-#: build/trans_presets.java:2939 build/trans_presets.java:2945
-#: build/trans_presets.java:2954 build/trans_presets.java:2960
-#: build/trans_presets.java:2966 build/trans_presets.java:2972
-#: build/trans_presets.java:2978 build/trans_presets.java:2984
-#: build/trans_presets.java:2990 build/trans_presets.java:2997
-#: build/trans_presets.java:3003 build/trans_presets.java:3008
-#: build/trans_presets.java:3015 build/trans_presets.java:3022
-#: build/trans_presets.java:3028 build/trans_presets.java:3037
-#: build/trans_presets.java:3045 build/trans_presets.java:3051
-#: build/trans_presets.java:3057 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3089
-#: build/trans_presets.java:3095 build/trans_presets.java:3101
-#: build/trans_presets.java:3114 build/trans_presets.java:3128
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:2451 build/trans_presets.java:2458
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2485 build/trans_presets.java:2492
+#: build/trans_presets.java:2498 build/trans_presets.java:2504
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2553 build/trans_presets.java:2559
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2590 build/trans_presets.java:2597
+#: build/trans_presets.java:2604 build/trans_presets.java:2610
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2677
+#: build/trans_presets.java:2686 build/trans_presets.java:2701
+#: build/trans_presets.java:2707 build/trans_presets.java:2715
+#: build/trans_presets.java:2722 build/trans_presets.java:2742
+#: build/trans_presets.java:2752 build/trans_presets.java:2758
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2783
+#: build/trans_presets.java:2790 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2824
+#: build/trans_presets.java:2831 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2851
+#: build/trans_presets.java:2858 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2885 build/trans_presets.java:2891
+#: build/trans_presets.java:2900 build/trans_presets.java:2910
+#: build/trans_presets.java:2919 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2948
+#: build/trans_presets.java:2957 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2987
+#: build/trans_presets.java:2993 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3018 build/trans_presets.java:3025
+#: build/trans_presets.java:3031 build/trans_presets.java:3040
+#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3080
+#: build/trans_presets.java:3086 build/trans_presets.java:3092
+#: build/trans_presets.java:3098 build/trans_presets.java:3104
+#: build/trans_presets.java:3117 build/trans_presets.java:3131
+#: build/trans_presets.java:3145
 msgid "Name"
 msgstr "Nom"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong> in changeset <strong>{3}</strong>"
-msgstr ""
-"<html>Version <strong>{0}</strong> créée le <strong>{1}</strong> par <strong>"
-"{2}</strong></html>"
+"<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
-#, fuzzy
 msgid "Changeset info"
-msgstr "Ensemble de changements {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
-#, fuzzy
 msgid "Launch browser with information about the changeset"
-msgstr "Plus d'informations à propos de cette balise"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
-#, fuzzy, java-format
+#, java-format
 msgid "Show changeset {0}"
-msgstr "Ensemble de changements {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6922,7 +6772,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
-#, fuzzy
 msgid "Select filename"
-msgstr "Nom de la rue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
@@ -6963,12 +6812,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
-#, fuzzy
 msgid "Please select a file"
-msgstr "Veuillez sélectionner une valeur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
-#, fuzzy, java-format
+#, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr "La couche \"{0}\" doit se trouver dans la liste des couches"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102
@@ -7013,6 +6861,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
 #, fuzzy
-msgid "Unsafed data and conflicts"
-msgstr "Corriger les conflits d'étiquettes"
+msgid "Unsaved data and conflicts"
+msgstr "Résoudre les conflits"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
@@ -7029,5 +6877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
-msgid "Unsafed data and missing associated file"
+msgid "Unsaved data and missing associated file"
 msgstr ""
 
@@ -7046,5 +6894,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-msgid "Unsafed data non-writable files"
+msgid "Unsaved data non-writable files"
 msgstr ""
 
@@ -7058,7 +6906,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-#, fuzzy
 msgid "Discard and Delete"
-msgstr "Annuler et quitter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
@@ -7071,7 +6918,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-#, fuzzy
 msgid "Save and Delete"
-msgstr "Enregistrer et quitter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
@@ -7149,7 +6995,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
-#, fuzzy
 msgid "Should upload?"
-msgstr "À l’envoi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
@@ -7158,17 +7003,158 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
+msgid "Filename"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
+msgid "Use a new changeset and close it"
+msgstr "Utiliser un nouvel ensemble de changements et le fermer"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+msgid ""
+"Select to upload the data using a new changeset and to close the changeset "
+"after the upload"
+msgstr ""
+"Choisir pour envoyer les données en utilisant un nouvel ensemble de "
+"changements et pour fermer ce dernier après l'envoi"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+msgid "Use a new changeset and leave it open"
+msgstr "Utiliser un nouvel ensemble de changements et le laisser ouvert"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+msgid ""
+"Select to upload the data using a new changeset and to leave the changeset "
+"open after the upload"
+msgstr ""
+"Choisir pour envoyer les données en utilisant un nouvel ensemble de "
+"changements et pour le laisser ouvert après l'envoi"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
+msgid "Upload to a new or to an existing changeset?"
+msgstr "Envoyer dans un ensemble de changements nouveau ou préexistant ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+msgid "upload all changes in one request"
+msgstr "Charger tous les changements dans une requête"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Permettre l'envoi de tous les changements en une requête, désactivez pour "
+"utiliser une requête par primitive modifiée"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Fournissez un bref commentaire aux changements que vous envoyez :"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
+msgid "Settings"
+msgstr "Paramètres"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+msgid "Tags of new changeset"
+msgstr "Tags du nouvel ensemble de changements"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+msgid "Objects to add:"
+msgstr "Objets à ajouter :"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+msgid "Objects to modify:"
+msgstr "Objets à modifier :"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+msgid "Objects to delete:"
+msgstr "Objets à supprimer :"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#, java-format
+msgid "{0} object to add:"
+msgid_plural "{0} objects to add:"
+msgstr[0] "{0} objet à ajouter :"
+msgstr[1] "{0} objets à ajouter :"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#, java-format
+msgid "{0} object to modifiy:"
+msgid_plural "{0} objects to modify:"
+msgstr[0] "{0} objet à modifier :"
+msgstr[1] "{0} objets à modifier :"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#, java-format
+msgid "{0} object to delete:"
+msgid_plural "{0} objects to delete:"
+msgstr[0] "{0} objet à supprimer :"
+msgstr[1] "{0} objets à supprimer :"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
+#, java-format
+msgid "Use the existing changeset {0} and close it after upload"
+msgstr ""
+"Utiliser la session de modification existante {0} et la fermer après l'envoi."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to close the changeset "
+"after this upload"
+msgstr ""
+"Envoyer avec la session de modification existante {0} et la fermer après cet "
+"envoi."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
+#, java-format
+msgid "Use the existing changeset {0} and leave it open"
+msgstr ""
+"Utiliser la session de modification existante {0} et la conserver ouverte."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to leave the changeset "
+"open for further uploads"
+msgstr ""
+"Envoyer avec la session de modification existante {0} et la laisser ouverte "
+"pour d'autres envois."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr "Attributs de la session de modification {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+msgid "Upload Changes"
+msgstr "Envoyer les changements"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
 #, fuzzy
-msgid "Filename"
-msgstr "Fichier"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload the changed primitives"
+msgstr "Charger ces changements ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
 #, fuzzy
-msgid "Upload"
-msgstr "Téléchargement"
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "Entrer un nom pour cet emplacement."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+#, fuzzy
+msgid "Cancel the upload and resume editing"
+msgstr "Annuler les changements et fermer"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
-#, fuzzy
 msgid "Preparing primitives to upload ..."
-msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7401,5 +7387,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7458,7 +7443,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
-#, fuzzy
 msgid "Download data"
-msgstr "Téléchargement des données"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
@@ -7527,4 +7511,14 @@
 msgid "Convert to GPX layer"
 msgstr "Convertir en calque GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#, fuzzy
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>L’envoi de données GPS non mises en forme comme données<br>sur la "
+"carte est considéré comme nuisible.<br>Si vous voulez envoyer des traces, "
+"regardez ici :"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
@@ -7723,5 +7717,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
 msgstr "Veuillez sélectionnez la rangée à supprimer."
@@ -8219,7 +8213,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
-#, fuzzy
 msgid "Show localized name in selection lists"
-msgstr "Montrer l'ID de l'objet dans les listes de sélections"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
@@ -8234,7 +8227,6 @@
 #. Show localized names
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89
-#, fuzzy
 msgid "Show localized name in selection lists, if available"
-msgstr "Montrer l'ID de l'objet dans les listes de sélections"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
@@ -8613,8 +8605,4 @@
 msgstr "Désactiver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
-msgid "Key:"
-msgstr "Clé :"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
@@ -8671,5 +8659,5 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
 #, java-format
@@ -8680,42 +8668,40 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
-#, fuzzy
 msgid "Add a new tag"
-msgstr "Ajouter un nouveau calque"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
-#, fuzzy
 msgid "Delete the selection in the tag table"
-msgstr "Supprimer le calque sélectionné."
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
 msgid "More information about this feature"
 msgstr "Plus d'informations à propos de cette balise"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Utiliser la balise \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 msgid "closedway"
 msgstr "voie sans issue"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
@@ -8726,15 +8712,15 @@
 msgstr "Impossible de lire la source des balises prédéfinies : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur de traitement {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont avalisés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8744,18 +8730,18 @@
 msgstr[1] "Changer {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Rien n'est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 msgid "Apply Preset"
 msgstr "Appliquer balise"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Change Properties"
 msgstr "Changer les propriétés"
@@ -8782,5 +8768,4 @@
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 msgid "NullPointerException, possibly some missing tags."
 msgstr ""
@@ -8798,7 +8783,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
 #, java-format
@@ -8876,5 +8858,5 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
 msgid "Markers from {0}"
@@ -8882,5 +8864,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8888,5 +8870,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -8911,6 +8892,6 @@
 "déduire le type de primitive"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
@@ -8920,20 +8901,20 @@
 msgstr "Téléchargement des données OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
+#, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr "éditer la relation #{0} dans la couche \"{1}"
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
@@ -8941,20 +8922,20 @@
 "Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
+#, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -9021,10 +9002,10 @@
 "Communication établie avec {0} en utilisant le protocole de version {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
 #, java-format
 msgid ""
@@ -9034,11 +9015,9 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
 msgid "Creating changeset..."
-msgstr "Ouverture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
 #, java-format
 msgid "Successfully opened changeset {0}"
@@ -9046,34 +9025,18 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
-msgid "No currently open changeset. Opening a new changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
-msgid ""
-"Warning: could not reuse an existing changeset as requested. Opening a new "
-"one."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
-#, fuzzy, java-format
-msgid "Reusing existing changeset {0}"
-msgstr "Ouverture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336
-#, fuzzy
 msgid "Updating changeset..."
-msgstr "Ouverture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 #, java-format
 msgid "Changeset {0} is unchanged. Skipping update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#, java-format
 msgid "Updating changeset {0}..."
-msgstr "Ouverture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 msgid ""
 "Failed to update changeset. Either there is no current changeset or the id "
@@ -9081,44 +9044,44 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 msgid "Closing changeset..."
 msgstr "Fermeture de la révision..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
+#, java-format
 msgid "Closing changeset {0}..."
-msgstr "Fermeture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+#, java-format
 msgid "Leaving changeset {0} open..."
-msgstr "Ouverture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
 msgid "No changeset present for diff upload"
 msgstr "Pas de nouveau changement à envoyer"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
 msgid "Preparing..."
 msgstr "Préparation en cours..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
 msgid "Uploading..."
 msgstr "Envoi en cours..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
 msgid "Waiting 10 seconds ... "
 msgstr "Attends 10 secondes… "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
 #, java-format
 msgid "Starting retry {0} of {1}."
@@ -9137,10 +9100,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
 msgid "OSM Server Files bzip2 compressed"
 msgstr "Fichiers compressés bzip2 du serveur OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29
 msgid "Invalid bz2 file."
 msgstr "Fichier bz2 invalide."
@@ -9203,6 +9166,11 @@
 "encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#, java-format
+msgid "(at line {0}, column {1})"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
 msgid "OSM Server Files"
 msgstr "Fichiers du serveur OSM"
@@ -9233,5 +9201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
 msgid "OSM Server Files gzip compressed"
 msgstr "Fichiers compressés gzip du serveur OSM"
@@ -9300,80 +9268,151 @@
 msgstr "Erreur pendant l’analyse syntaxique."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
-msgid "Unknown version"
-msgstr "Version inconnue"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
-msgid "Version number missing from OSM data"
-msgstr "Il manque le numéro de version dans les données OSM."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
-#, java-format
-msgid "Unknown version: {0}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
+#, fuzzy, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr "attribut obligatoire \"{0}\" manquant"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
+#, fuzzy, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr "attribut obligatoire \"{0}\" manquant"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#, fuzzy, java-format
+msgid "Unsupported version: {0}"
 msgstr "Version inconnue : {0}"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+msgid "found XML element <nd> element not as direct child of element <way>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#, fuzzy, java-format
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgstr "attribut obligatoire \"{0}\" manquant"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-msgid "Found <nd> element in non-way."
-msgstr "Élément <nd> trouvé sur un non-chemin."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
-msgid "<nd> has zero ref"
-msgstr "<nd> n’a pas de ref"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
-msgid "Found <member> element in non-relation."
-msgstr "Élément <member> trouvé dans une non-relation."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
-#, java-format
-msgid "Missing attribute \"ref\" on member in relation {0}"
-msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, java-format
-msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
+#, fuzzy, java-format
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 "Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, "
 "valeur {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
-#, java-format
-msgid "Missing attribute \"type\" on member {0} in relation {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgid "Found XML element <member> not as direct child of element <relation>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#, fuzzy, java-format
+msgid "Missing attribute ''ref'' on member in relation {0}"
+msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr ""
+"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, "
+"valeur {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#, fuzzy, java-format
+msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr "Attribut \"type\" manquant sur le membre {0} de la relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218
-#, java-format
-msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-msgstr ""
-"Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation {1}, "
-"valeur {2}"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#, fuzzy, java-format
+msgid ""
+"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
+msgstr ""
+"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, "
+"valeur {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Champ <member> incomplet avec ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#, java-format
+msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 msgid "Illegal object with id=0"
 msgstr "L’objet avec l’id=0 est illégal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
-#, java-format
-msgid ""
-"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#, fuzzy, java-format
+msgid ""
+"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
 "Donnée invalide pour l'attribut \"version\" sur la primitive OSM d'id {0}, "
 "valeur {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302
-#, java-format
-msgid "Missing attribute \"version\" on OSM primitive with id {0}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.6''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#. should not happen. API version has been checked before
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#, fuzzy, java-format
+msgid "Unknown or unsupported API version. Got {0}"
+msgstr "Version inconnue : {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#, fuzzy, java-format
+msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr "Attribut \"version\" manquant sur la primitive OSM d’id {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317
-#, java-format
-msgid "Missing required attribute \"{0}\"."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#, fuzzy, java-format
+msgid "Missing required attribute ''{0}''."
 msgstr "Attribut requis manquant \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#, fuzzy, java-format
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#, java-format
+msgid ""
+"way with external id ''{0}'' includes missing node with external id ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
 #, java-format
 msgid ""
@@ -9382,16 +9421,30 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#, java-format
+msgid ""
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, java-format
-msgid "Unknown relation member type {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
+#, fuzzy, java-format
+msgid ""
+"Relation with external id ''{0}'' refers to missing primitive with external "
+"id ''{1}''"
+msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Prepare OSM data..."
 msgstr "Préparation des données de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
-msgid "Ill-formed node id"
-msgstr "id du nœud mal formé"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
+#, fuzzy
+msgid "Parsing OSM data..."
+msgstr "Scrutation des données de l'historique d'OSM..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
+#, fuzzy
+msgid "Preparing data set..."
+msgstr "Préparation des données..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9438,33 +9491,43 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+msgid "Starting to upload with one request per primitive ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+msgid "Starting to upload in one request ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
+#, fuzzy
+msgid "Uploading data ..."
+msgstr "Envoi en cours..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgid ""
+"WARNING: no API version defined for data to upload. Falling back to version "
+"0.6"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
 #, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194
-#, fuzzy
-msgid "Starting to upload in one request ..."
-msgstr "Rien à envoyer. Obtenez d’abord des données."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197
-msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
@@ -9502,12 +9565,7 @@
 msgstr "Téléchargement du greffon {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 msgid "Skip download"
 msgstr "Annuler le téléchargement"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr "Version {0} de JOSM requise pour le greffon {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
@@ -9519,4 +9577,9 @@
 msgstr "Annuler le téléchargement"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "Version {0} de JOSM requise pour le greffon {1}."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
 #, java-format
@@ -9559,20 +9622,20 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 msgid "Disable plugin"
 msgstr "Désactiver le greffon"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+msgid "Keep plugin"
+msgstr "Garder le greffon"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-msgid "Keep plugin"
-msgstr "Garder le greffon"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9582,5 +9645,9 @@
 "l’autorisation de remplacer les greffons existants."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+msgid "<html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
 #, java-format
 msgid ""
@@ -9589,10 +9656,10 @@
 "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "D’après les informations du greffon, l’auteur est {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9601,9 +9668,9 @@
 "d'extension avant de rapporter un bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
 msgid "Should the plugin be disabled?"
 msgstr "Ce module d'extension doit-il être désactivé ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9613,14 +9680,14 @@
 "greffon ne soit plus chargé."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 "Le greffon ne peut pas être supprimé. Il était probablement déjà désactivé."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361
 msgid "Plugin information"
 msgstr "Informations sur le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -9676,4 +9743,35 @@
 "\n"
 "{0}"
+
+#. item "Ways/Cycleway" combo "Pedestrians"
+#. item "Ways/Footway" combo "Bikes"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: build/trans_presets.java:323 build/trans_presets.java:324
+#: build/trans_presets.java:325 build/trans_presets.java:326
+#: build/trans_presets.java:327 build/trans_presets.java:328
+#: build/trans_presets.java:329 build/trans_presets.java:330
+#: build/trans_presets.java:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:449
+#: build/trans_presets.java:469 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:773
+#: build/trans_presets.java:788 build/trans_presets.java:1330
+#: build/trans_presets.java:1397 build/trans_presets.java:1398
+#: build/trans_presets.java:1399 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+msgid "unknown"
+msgstr "inconnu"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
@@ -9751,4 +9849,102 @@
 msgstr "(Ce texte a déjà été copié dans votre presse-papier.)"
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:32
+#, java-format
+msgid ""
+"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
+"the server URL in your preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
+#, java-format
+msgid ""
+"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
+"changeset will automatically be closed by the server after a timeout.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>L’envoi vers le serveur <strong>a échoué</strong> car votre jeu "
+"de<br>données courant ne rempli pas une condition préalable.<br>Le message "
+"d’erreur est :<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you didn''t load your applet from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
+"votre connexion internet.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>Le serveur OSM<br>''{0}''<br>a rapporté une erreur interne du serveur."
+"<br>Il s'agit probablement d'un problème temporaire. Veuillez réessayer plus "
+"tard.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
+#, fuzzy
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
+msgstr ""
+"La taille maximum de la zone à télécharger est 0.25 et votre requête en "
+"demande plus. Demandez un plus petit nombre ou utilisez le planet.osm"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
+#, java-format
+msgid "<br>Error message(untranslated): {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because a primitive you tried "
+"to<br>delete on the server is already deleted.<br><br>The error message is:"
+"<br>{0}</html>"
+msgstr ""
+"<html>Le chargement <strong>a échoué</strong> car une primitive que "
+"vous<br>essayez de supprimer sur le serveur est déjà supprimée.<br><br>Le "
+"message d’erreur est :<br>{0}</html>"
+
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
 #, java-format
@@ -9821,5 +10017,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104
 #, java-format
 msgid ""
@@ -9828,5 +10024,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110
 #, java-format
 msgid ""
@@ -9835,5 +10031,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112
 #, java-format
 msgid ""
@@ -9842,5 +10038,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119
 #, java-format
 msgid ""
@@ -9849,5 +10045,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
 #, java-format
 msgid ""
@@ -9908,40 +10104,39 @@
 msgstr "Charger les traces"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
-#, fuzzy
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
 msgstr ""
 
 #. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
-#: build/trans_presets.java:3145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3148
 msgid "Description"
 msgstr "Description"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
 msgid "Please enter Description about your trace."
 msgstr "Veuillez saisir une description de votre trace."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
 msgid "Please enter tags about your trace."
 msgstr "Veuillez entrer des mot-clés liés à votre trace."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193
 #, java-format
 msgid "Selected track: {0}"
@@ -9949,47 +10144,47 @@
 
 #. Set progress dialog to indeterminate while connecting
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:216
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239
 msgid "Upload cancelled"
 msgstr "Envoi annulé"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249
 msgid "Error while uploading"
 msgstr "Erreur lors du chargement"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 msgid "GPX upload was successful"
 msgstr "Succès de l'envoi de la trace GPX"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "Upload failed. Server returned the following message: "
 msgstr "L'envoi a échoué. Le serveur a retourné le message suivant : "
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
 msgstr "Envoyer la trace GPX : {0}% ({1} ou {2})"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378
 msgid "No description provided. Please provide some description."
 msgstr "Pas de description fournie. Merci de fournir une description."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:381
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:403
 msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "Pas de calque GPX sélectionné. Impossible de téléverser une trace."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:384
 msgid "No username provided."
 msgstr "Pas de nom d'utilisateur fourni."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:387
 msgid "No password provided."
 msgstr "Pas de mot de passe fourni."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
 msgid "Uploading GPX Track"
 msgstr "Envoyer la trace GPX"
@@ -10209,5 +10404,5 @@
 msgstr "Images non encore étiquetées"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
 msgid "Correlate images with GPX track"
 msgstr "Correler les images avec la trace GPX"
@@ -10221,13 +10416,13 @@
 msgstr "Estimation automatique"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:591
 msgid "You should select a GPX track"
 msgstr "Vous devez sélectionner une trace GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592
 msgid "No selected GPX track"
 msgstr "Aucune trace GPX sélectionnée"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:604
 #, java-format
 msgid ""
@@ -10238,9 +10433,9 @@
 "Format attendu : {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
 msgid "Invalid timezone"
 msgstr "Fuseau horaire invalide"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:617
 #, java-format
 msgid ""
@@ -10251,27 +10446,27 @@
 "Format attendu : {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
 msgid "Invalid offset"
 msgstr "Décallage invalide"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:661
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
 msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:662
 msgid "GPX Track loaded"
 msgstr "Trace GPX chargée"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:697
 msgid "The selected photos don't contain time information."
 msgstr ""
 "Les photos sélectionnées ne contiennent pas d'information d'horodatage."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:698
 msgid "Photos don't contain time information"
 msgstr "Les photos ne contienne tpas d'information d'horodatage"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:732
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10280,39 +10475,39 @@
 "autre."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:733
 msgid "GPX Track has no time information"
 msgstr "La trace GPX n'a pas d'horodatage."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuseau horaire : {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes : {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondes : {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:797
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:800
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Différence de temps de {0} jours)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:807
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Différence entre la trace et les photos : {0}min. {1}sec."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10323,13 +10518,13 @@
 "manuellement."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
 msgid "Matching photos to track failed"
 msgstr "La correspondance des photos avec la trace a échoué"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Adjust timezone and offset"
 msgstr "Ajuster le fuseau horaire et le décalage"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
 msgid "Default Values"
 msgstr "Valeurs par défaut"
@@ -10370,5 +10565,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
@@ -10397,11 +10592,9 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Town/city {0} not found or not available\n"
 "or action canceled"
 msgstr ""
-"Ville {0} non trouvée ou non disponible sur le WMS.\n"
-"Veuillez vérifier sa disponibilité sur www.cadastre.gouv.fr"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -10417,13 +10610,13 @@
 msgstr "Choisir parmi..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
 msgid "Auto sourcing"
 msgstr "Enregistrement automatique de la source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10437,13 +10630,13 @@
 "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "Restore grab shortcut F11"
 msgstr "Restaurer la fontion de téléchargement à la touche F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM est arreté pour que la modification prenne effet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
 #, java-format
 msgid ""
@@ -10573,9 +10766,9 @@
 "taille est dépassée"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
 msgid "Auto-tag source added:"
 msgstr "Ajouter le commentaire de source suivant :"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
 msgid "Add \"source=...\" to elements?"
 msgstr "Ajouter \"source=...\" aux éléments ?"
@@ -10663,5 +10856,4 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -10669,6 +10861,4 @@
 "projections and retry"
 msgstr ""
-"Pour activer le greffon WMS du cadastre, changez\n"
-"la projection actuelle vers une du cadastre et réessayez."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
@@ -10688,7 +10878,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
-#, fuzzy
 msgid "Image cropping"
-msgstr "chargement de l’image..."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
@@ -10734,7 +10923,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-#, fuzzy
 msgid "Set "
-msgstr "Sélectionner"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -10825,5 +11013,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 msgid "Blank Layer"
 msgstr "Calque vide"
@@ -11789,18 +11977,18 @@
 msgstr "Etat du problème inconnu"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 msgid "Open Visible..."
 msgstr "Open Visible..."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
 msgid "Open only files that are visible in current view."
 msgstr "Ouvrir uniqueent les fichiers visibles sur la vue actuelle."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
 msgid "No view open - cannot determine boundaries!"
 msgstr "Aucune vue ouverte - impossible de déterminer la zone !"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
 #, java-format
 msgid "Unknown file extension: {0}"
@@ -11811,5 +11999,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:93
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -11819,9 +12007,9 @@
 "carte des Préférences."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "osmarender options"
 msgstr "options osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
 msgid "Firefox executable"
 msgstr "Exécutable Firefox"
@@ -11832,29 +12020,34 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#, fuzzy
+msgid "create new objects"
+msgstr "Créer un nouveau nœud."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "change the selection"
 msgstr "Changer la sélection"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the viewport"
 msgstr "changer le viewport"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "confirm all Remote Control actions manually"
 msgstr "confirmez toutes les actions Remote Control manuellement"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Un greffon permettant à JOSM d’être contrôlé par d’autres applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Settings for the Remote Control plugin."
 msgstr "Réglages du greffon Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -11866,28 +12059,35 @@
 "dialogant avec le greffon."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Permitted actions"
 msgstr "Actions permises"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il a été demandé à Remote Control de charger les données depuis l'API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Do you want to allow this?"
 msgstr "Voulez-vous permettre celà?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
 msgid "Confirm Remote Control action"
 msgstr "Confirmer l’action Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#, fuzzy
+msgid "Remote Control has been asked to create a new node."
+msgstr "Il a été demandé à Remote Control de charger les données depuis l'API."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12394,25 +12594,33 @@
 "Veuillez vérifier qu'aucune erreur n'a été introduite."
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+msgid "Enter values for all conflicts."
+msgstr "Entrer des valeurs pour tous les conflits."
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+msgid "Solve Conflicts"
+msgstr "Résoudre les conflits"
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
 msgid "Fix tag conflicts"
 msgstr "Corriger les conflits d'étiquettes"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
 msgid "Removed Element from Relations"
 msgstr "Élément supprimé des relations"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
 msgid "Join Areas: Remove Short Ways"
 msgstr "Aires jointes: enlever les voies courtes"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
 msgid "Closed Way"
 msgstr "Chemin fermé"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
 msgid "Remove tags from inner ways"
 msgstr "Supprime les étiquettes des chemins internes"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
 msgid "Join Areas Function"
 msgstr "Fonction de jointure des zones"
@@ -12488,6 +12696,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 msgid "Validation errors"
 msgstr "Erreurs de validation"
@@ -12497,10 +12705,10 @@
 msgstr "Aucune erreur de validation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
 msgid "Grid"
 msgstr "Grille"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #, java-format
 msgid ""
@@ -12593,51 +12801,66 @@
 msgstr "Validation des données"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
 msgid "Data with errors. Upload anyway?"
 msgstr "Les données contiennent des erreurs. Envoyer quand même ?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 msgid "Open the validation window."
 msgstr "Ouvrir la fenêtre de validation."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:89
 msgid "Zoom to problem"
 msgstr "Zoomer sur le problème"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix"
 msgstr "Réparer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix the selected errors."
 msgstr "Résoudre l'erreur sélectionné"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
 msgstr "Ignorer les erreurs sélectionnées à l'avenir."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Whole group"
 msgstr "Groupe complet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Single elements"
 msgstr "Eléments seuls"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Nothing"
 msgstr "Rien"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
 msgid "Ignore whole group or individual elements?"
 msgstr "Ignorer le groupe complet ou les éléments individuels ?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
 msgid "Ignoring elements"
 msgstr "Ignore les éléments"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
+#, fuzzy
+msgid "Fixing errors ..."
+msgstr "Attends 10 secondes… "
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
+#, java-format
+msgid "Fixing ({0}/{1}): ''{2}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
+#, fuzzy
+msgid "Updating map ..."
+msgstr "Mise à jour des données"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12663,16 +12886,12 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
-#, fuzzy
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
 msgstr ""
-"Ce test vérifie si deux routes, chemins de fer ou voies d’eau se croisent "
-"sur le même calque sans être connectés par un nœud."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
-#, fuzzy
 msgid "Crossing buildings"
-msgstr "Créer les bêtiments"
+msgstr "Bâtiments chevauchants"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -12680,20 +12899,19 @@
 msgstr "Chemins se croisant"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
 msgid "Duplicated nodes"
 msgstr "Nœuds dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Ce test vérifie si des nœuds ne sont pas exactement à la même position."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
 msgid "Nodes at same position"
-msgstr "Nœuds avec le même nom."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
+msgstr "Nœuds à la même position"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
 msgid "Confirmation"
 msgstr "Confirmation"
@@ -12701,20 +12919,18 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
-#, fuzzy
 msgid "Duplicated ways"
-msgstr "Chemin dupliqué"
+msgstr "Chemins dupliqués"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
-#, fuzzy
 msgid ""
 "This test checks that there are no ways with same tags and same node "
 "coordinates."
 msgstr ""
-"Ce test vérifie si des nœuds ne sont pas exactement à la même position."
+"Ce test vérifie qu'il n'existe pas deux chemins avec les mêmes tags et les "
+"coordonnées de nœuds."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
-#, fuzzy
 msgid "Delete duplicate ways"
-msgstr "Créer un chemin dupliqué"
+msgstr "Supprimer les chemins dupliqués."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -13308,5 +13524,5 @@
 msgstr "Intersection atteinte"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Une exception s’est produite"
@@ -13413,5 +13629,5 @@
 msgstr "Ajouter l'Image rectifiée"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -13421,5 +13637,5 @@
 "Veuillez réessayer."
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201
 msgid "No valid WMS URL or id"
 msgstr "Pas d’URL WMS valide ou d’id"
@@ -13437,17 +13653,17 @@
 msgstr "Veuillez sélectionner le calque WMS à ajuster."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Select WMS layer"
 msgstr "Sélectionnez le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Start adjusting"
 msgstr "Commencer à ajuster"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
 msgid "There are currently no WMS layer to adjust."
 msgstr "Il n'y a actuellement pas de calque WMS à ajuster."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
 msgid "No layers to adjust"
 msgstr "Pas de calque à ajuster."
@@ -13465,4 +13681,6 @@
 "settings."
 msgstr ""
+"Attention : la récupération de dalles WMS risque d'échouer. Veuillez "
+"vérifier vos réglages de préférences."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
@@ -13490,19 +13708,18 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
-#, fuzzy
 msgid "(deactivated)"
-msgstr "désigné"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
 #, 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:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
 #, 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:180
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
 #, java-format
 msgid ""
@@ -13513,14 +13730,13 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
 msgid "Yes, fetch images"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194
-#, fuzzy
+msgstr "Oui, récupérer les images"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr "Date non valide"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217
+msgstr "URL invalide ?"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -13529,37 +13745,37 @@
 "résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
 msgid "Save WMS layer"
 msgstr "Sauvegarder la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Load WMS layer"
 msgstr "Charger la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -13568,66 +13784,77 @@
 "attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 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:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 msgid "WMS Plugin Preferences"
 msgstr "Préférences du greffon WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Modifier la liste des serveurs WMS affichée dans le menu du greffon WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Menu Name"
 msgstr "Nom du menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
 msgid "WMS URL"
 msgstr "URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "Menu Name (Default)"
 msgstr "Nom du menu (Défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "WMS URL (Default)"
 msgstr "URL de WMS (Défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
 msgid "Enter a menu name and WMS URL"
 msgstr "Entrer un nom pour le menu et un URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
-#, fuzzy
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
 msgid "Copy Selected Default(s)"
-msgstr "Copier les valeurs par défaut"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
-#, fuzzy
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
 msgid "Please select at least one row to copy."
-msgstr "Veuillez sélectionner au moins un chemin."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154
+msgstr "Veuillez sélectionner au moins une ligne à copier."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
 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
+#, fuzzy
+msgid "% of east:"
+msgstr "% de lat. :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#, fuzzy
+msgid "% of north:"
+msgstr "% de lat. :"
+
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
-#, fuzzy
 msgid "WMS Files (*.wms)"
-msgstr "fichiers TCX (*.tcx)"
+msgstr "Fichiers WMS (*.wms)"
 
 #. *
@@ -14045,5 +14272,5 @@
 #: build/trans_presets.java:120 build/trans_presets.java:140
 #: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3143
+#: build/trans_presets.java:1557 build/trans_presets.java:3146
 msgid "Reference"
 msgstr "Référence"
@@ -14585,7 +14812,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "asphalt"
-msgstr "Châlet"
+msgstr "Asphalte"
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14606,8 +14832,7 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
-#, fuzzy
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
 msgid "metal"
-msgstr "Location"
+msgstr "Métal"
 
 #. color heath
@@ -14625,5 +14850,6 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_style.java:3367
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_style.java:3367
 msgid "wood"
 msgstr "bois"
@@ -14636,7 +14862,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "paving_stones"
-msgstr "parking_tickets"
+msgstr "Pavés"
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -14672,7 +14897,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "pebblestone"
-msgstr "pavés"
+msgstr "Graviers"
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14683,7 +14907,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "compacted"
-msgstr "incomplet"
+msgstr "Compact"
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14694,7 +14917,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "grass_paver"
-msgstr "herbe"
+msgstr "Herbe"
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14888,4 +15110,5 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Amenities/Toilets" combo "Fee"
+#. item "Amenities/Bench" combo "Backrest"
 #. item "Amenities/Hunting Stand" combo "Shelter"
 #. item "Amenities/Hunting Stand" combo "Hide"
@@ -14914,12 +15137,12 @@
 #: build/trans_presets.java:1398 build/trans_presets.java:1399
 #: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2397 build/trans_presets.java:2433
+#: build/trans_presets.java:2442 build/trans_presets.java:2443
+#: build/trans_presets.java:2444 build/trans_presets.java:2714
 msgid "yes"
 msgstr "oui"
 
 #. color permissive
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -14967,5 +15190,5 @@
 
 #. color private
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -15002,5 +15225,5 @@
 #. <rule>
 #. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -15064,6 +15287,7 @@
 #: build/trans_presets.java:1399 build/trans_presets.java:1763
 #: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2439 build/trans_presets.java:2440
-#: build/trans_presets.java:2441 build/trans_presets.java:2711
+#: build/trans_presets.java:2433 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:2714
 msgid "no"
 msgstr "non"
@@ -15209,6 +15433,6 @@
 #: build/trans_presets.java:788 build/trans_presets.java:1135
 #: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2898 build/trans_presets.java:2908
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2901 build/trans_presets.java:2911
+#: build/trans_presets.java:2920
 msgid "Type"
 msgstr "Type"
@@ -15479,7 +15703,6 @@
 #. item "Ways/Cycleway" check "Embankment"
 #: build/trans_presets.java:449
-#, fuzzy
 msgid "Pedestrians"
-msgstr "Rue Piétonne"
+msgstr "Piétons"
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -15498,7 +15721,6 @@
 #. item "Ways/Footway" check "Embankment"
 #: build/trans_presets.java:469
-#, fuzzy
 msgid "Bikes"
-msgstr "Pointes"
+msgstr "Vélos"
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -15790,7 +16012,7 @@
 #: build/trans_presets.java:2384 build/trans_presets.java:2395
 #: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2461 build/trans_presets.java:2509
-#: build/trans_presets.java:2675 build/trans_presets.java:2690
-#: build/trans_presets.java:2729 build/trans_presets.java:3148
+#: build/trans_presets.java:2464 build/trans_presets.java:2512
+#: build/trans_presets.java:2678 build/trans_presets.java:2693
+#: build/trans_presets.java:2732 build/trans_presets.java:3151
 msgid "Operator"
 msgstr "Compagnie"
@@ -16003,6 +16225,6 @@
 #. item "Places/Volcano" text "Name"
 #: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2842
-#: build/trans_presets.java:2849 build/trans_presets.java:2856
+#: build/trans_presets.java:1745 build/trans_presets.java:2845
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
 msgid "Elevation"
 msgstr "Altitude"
@@ -16252,10 +16474,10 @@
 #: build/trans_presets.java:1022
 msgid "Turnstile"
-msgstr ""
+msgstr "Tourniquet"
 
 #. item
 #: build/trans_presets.java:1023
 msgid "Edit Turnstile"
-msgstr ""
+msgstr "Éditer tourniquet"
 
 #. item "Barriers/Turnstile" check "Bicycle"
@@ -16914,7 +17136,4 @@
 #. item "Sport Facilities/Miniature Golf" text "Name"
 #. item "Buildings/Library" text "Name"
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
-#. <key key="amenity" value="bench" />
 #. item "Amenities/Baby Hatch" text "Operator"
 #. item "Shops/Supermarket" text "Name"
@@ -16962,23 +17181,23 @@
 #: build/trans_presets.java:1818 build/trans_presets.java:1909
 #: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2433
-#: build/trans_presets.java:2462 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2250 build/trans_presets.java:2465
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -17002,5 +17221,4 @@
 #. item "Buildings/Library" combo "Opening Hours"
 #. item "Buildings/Place of Worship" combo "Opening Hours"
-#. item "Amenities/Bench" combo "Opening Hours"
 #. item "Shops/Supermarket" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
@@ -17047,24 +17265,24 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "24/7"
-msgstr ""
+msgstr "24h/24 7j/7"
 
 #: build/trans_presets.java:1383 build/trans_presets.java:1621
@@ -17077,24 +17295,24 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Mo-Fr 08:30-20:00"
-msgstr ""
+msgstr "Lun-ven 08:30-20:00"
 
 #: build/trans_presets.java:1383 build/trans_presets.java:1621
@@ -17107,24 +17325,24 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Mar-dim 08:00-15:00; Sam 08:00-12:00"
 
 #. group "Bicycle"
@@ -17156,5 +17374,5 @@
 #: build/trans_presets.java:1391 build/trans_presets.java:1762
 #: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Reference number"
 msgstr "Numéro de référence"
@@ -17174,7 +17392,6 @@
 
 #: build/trans_presets.java:1393
-#, fuzzy
 msgid "Park and Ride"
-msgstr "Automobiles en libre service"
+msgstr "Parking relais"
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -17188,7 +17405,6 @@
 #. <space />
 #: build/trans_presets.java:1396
-#, fuzzy
 msgid "Capacity (overall)"
-msgstr "Capacité"
+msgstr "Capacité (globale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
@@ -17198,16 +17414,14 @@
 
 #: build/trans_presets.java:1398
-#, fuzzy
 msgid "Spaces for Women"
-msgstr "Espaces pour handicapés"
+msgstr "Emplacements pour femmes"
 
 #: build/trans_presets.java:1399
-#, fuzzy
 msgid "Spaces for Parents"
-msgstr "Espaces pour handicapés"
+msgstr "Emplacements pour parents"
 
 #: build/trans_presets.java:1400
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+msgstr "Voir le Wiki pour les autres types de capacité : [types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
@@ -17405,5 +17619,5 @@
 #. <separator/>
 #: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2442
 msgid "Shelter"
 msgstr "Abri"
@@ -17788,7 +18002,6 @@
 #. item "Tourism/Map" combo "Detail Grade"
 #: build/trans_presets.java:1720
-#, fuzzy
 msgid "topo"
-msgstr "Stop"
+msgstr ""
 
 #. color tertiary
@@ -17831,28 +18044,23 @@
 
 #: build/trans_presets.java:1720
-#, fuzzy
 msgid "scheme"
-msgstr "chinois"
+msgstr "Schéma"
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "Shown Area"
-msgstr "Télécharger zone"
+msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "site"
-msgstr "Coller"
+msgstr "Site"
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "city"
-msgstr "Ville de plus de 100 000 habitants"
+msgstr "Ville"
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "region"
-msgstr "régional"
+msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -17868,5 +18076,5 @@
 #: build/trans_presets.java:1724 build/trans_presets.java:1747
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Routes affichées pour :"
 
 #. item "Tourism/Map" check "Hiking"
@@ -17880,7 +18088,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #: build/trans_presets.java:1727 build/trans_presets.java:1750
-#, fuzzy
 msgid "Mountainbiking"
-msgstr "Chemin de randonnée en montagne"
+msgstr "VTT"
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -17894,7 +18101,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #: build/trans_presets.java:1729 build/trans_presets.java:1752
-#, fuzzy
 msgid "Riding"
-msgstr "voie de garage"
+msgstr ""
 
 #. item "Tourism/Map" check "Riding"
@@ -17902,5 +18108,5 @@
 #: build/trans_presets.java:1730 build/trans_presets.java:1753
 msgid "... other transportation modes possible"
-msgstr ""
+msgstr "... autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
@@ -17911,13 +18117,11 @@
 #. item "Tourism/Information Board" text "Name"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "Board Content"
-msgstr "Douane"
+msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "notice"
-msgstr "verte"
+msgstr "Remarque"
 
 #: build/trans_presets.java:1737
@@ -17934,40 +18138,34 @@
 
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "plants"
-msgstr "utilisation du terrain"
+msgstr "Usines"
 
 #. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1740
-#, fuzzy
 msgid "Guidepost"
-msgstr "Panneau de direction (randonnée)"
+msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
 #: build/trans_presets.java:1755
-#, fuzzy
 msgid "Information Terminal"
-msgstr "Information"
+msgstr ""
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
 #: build/trans_presets.java:1760 build/trans_presets.java:1770
-#, fuzzy
 msgid "Closer description"
-msgstr "Description détaillée"
+msgstr "Description précise"
 
 #: build/trans_presets.java:1765
-#, fuzzy
 msgid "Audioguide"
-msgstr "Audio"
+msgstr "Guide audio"
 
 #. <space />
 #: build/trans_presets.java:1775
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "Guide audio via téléphone mobile ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
 #: build/trans_presets.java:1776
-#, fuzzy
 msgid "Phone number"
 msgstr "Numéro de téléphone"
@@ -18293,5 +18491,5 @@
 #. <condition k="sport" v="dog_racing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="leisure/dog.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18325,5 +18523,5 @@
 #. <condition k="sport" v="gymnastics"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/multi.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19449,6 +19647,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "Religion"
 msgstr "Religion"
@@ -19457,66 +19655,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "Denomination"
 msgstr "Dénomination"
@@ -19525,76 +19723,76 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "catholic"
 msgstr "catholique"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "sunni"
 msgstr "sunni"
@@ -19926,5 +20124,5 @@
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2511
+#: build/trans_presets.java:2398 build/trans_presets.java:2514
 msgid "Note"
 msgstr "Note"
@@ -19949,5 +20147,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2512
+#: build/trans_presets.java:2411 build/trans_presets.java:2515
 msgid "Coins"
 msgstr "Pièces"
@@ -19955,5 +20153,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2513
+#: build/trans_presets.java:2412 build/trans_presets.java:2516
 msgid "Notes"
 msgstr "Billets"
@@ -19961,5 +20159,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2514
+#: build/trans_presets.java:2413 build/trans_presets.java:2517
 msgid "Electronic purses and Charge cards"
 msgstr "Cartes de crédit temporaire"
@@ -19967,5 +20165,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2515
+#: build/trans_presets.java:2414 build/trans_presets.java:2518
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -19973,5 +20171,5 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2516
+#: build/trans_presets.java:2415 build/trans_presets.java:2519
 msgid "Credit cards"
 msgstr "Cartes de crédits"
@@ -20030,10 +20228,144 @@
 msgstr "Banc"
 
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#: build/trans_presets.java:2433
+#, fuzzy
+msgid "Backrest"
+msgstr "Retour"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Material"
+msgstr "Mémorial"
+
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "stone"
+msgstr "rien"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "plastic"
+msgstr "lieu"
+
 #: build/trans_presets.java:2435
+#, fuzzy
+msgid "Colour"
+msgstr "Couleur"
+
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "black"
+msgstr "Retour"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "brown"
+msgstr "bas"
+
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color forest
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color cemetery
+#. <icon src="rendering/landuse/cemetery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_presets.java:2435 build/trans_style.java:3055
+#: build/trans_style.java:3063 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3127
+#: build/trans_style.java:3135 build/trans_style.java:3233
+#: build/trans_style.java:3241
+msgid "green"
+msgstr "espace vert"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "red"
+msgstr "fin"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "blue"
+msgstr "Valeur"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "white"
+msgstr "Site"
+
+#: build/trans_presets.java:2436
+#, fuzzy
+msgid "Amount of Seats"
+msgstr "Nombre de câbles"
+
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2438
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -20042,30 +20374,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2438 build/trans_presets.java:2899
+#: build/trans_presets.java:2441 build/trans_presets.java:2902
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Hide"
 msgstr "Masquer"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2446
 msgid "Fountain"
 msgstr "Fontaine"
@@ -20074,10 +20406,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Fountain"
 msgstr "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -20086,10 +20418,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2456
 msgid "Edit Drinking Water"
 msgstr "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -20097,35 +20429,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2462
 msgid "Edit Baby Hatch"
 msgstr "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2468
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2469
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
-#: build/trans_presets.java:2472
-#, fuzzy
+#: build/trans_presets.java:2475
 msgid "Chemist"
-msgstr "Châlet"
-
-#. item
-#: build/trans_presets.java:2473
-#, fuzzy
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2476
 msgid "Edit Chemist"
-msgstr "Editez un châlet"
-
-#: build/trans_presets.java:2478
+msgstr ""
+
+#: build/trans_presets.java:2481
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -20133,9 +20463,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2483
 msgid "Edit Convenience Store"
 msgstr "Éditer une épicerie"
 
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2488
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -20143,29 +20473,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2490
 msgid "Edit Kiosk"
 msgstr "Éditer un kiosque à journaux"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2495
 msgid "Book Store"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2493
-#, fuzzy
+msgstr "Librairie"
+
+#. item
+#: build/trans_presets.java:2496
 msgid "Edit Book Store"
-msgstr "Éditer un arrêt de bus"
-
-#: build/trans_presets.java:2498
+msgstr "Éditer librairie"
+
+#: build/trans_presets.java:2501
 msgid "Travel Agency"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2499
-#, fuzzy
+msgstr "Agence de voyage"
+
+#. item
+#: build/trans_presets.java:2502
 msgid "Edit Travel Agency"
-msgstr "Éditer un arbre isolé"
-
-#: build/trans_presets.java:2504
+msgstr "Éditer agence de voyage"
+
+#: build/trans_presets.java:2507
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -20173,5 +20501,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Vending machine"
 msgstr "Éditer un distributeur automatique"
@@ -20179,88 +20507,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2520
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2522
 msgid "Butcher"
 msgstr "Boucherie"
@@ -20268,9 +20596,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2524
 msgid "Edit Butcher"
 msgstr "Éditer une boucherie"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2529
 msgid "Baker"
 msgstr "Boulanger"
@@ -20278,9 +20606,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2531
 msgid "Edit Baker"
 msgstr "Éditer une boulangerie"
 
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2536
 msgid "Florist"
 msgstr "Fleuriste"
@@ -20288,18 +20616,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2538
 msgid "Edit Florist"
 msgstr "Modifier fleuriste"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2543
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2544
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2549
 msgid "Alcohol"
 msgstr "Alcool"
@@ -20307,54 +20635,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2551
 msgid "Edit Alcohol Shop"
 msgstr "Modifier commerce d'acool"
 
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:2556
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2557
 msgid "Edit Beverages Shop"
 msgstr "Modifier débit de boissons"
 
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2562
 msgid "Computer"
 msgstr "Informatique"
 
 #. item
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2563
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2569
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2574
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2575
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2580
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2581
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -20362,9 +20690,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2588
 msgid "Edit Garden Centre"
 msgstr "Modifier jardinerie"
 
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2593
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -20372,9 +20700,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2595
 msgid "Edit Hardware Store"
 msgstr "Modifier quincaillerie"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -20382,54 +20710,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2602
 msgid "Edit Do-it-yourself-store"
 msgstr "Éditer un magasin de bricolage"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2608
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2614
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2620
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Toys"
 msgstr "Jouets"
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2626
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2631
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2632
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2637
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -20437,9 +20765,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2639
 msgid "Edit Dry Cleaning"
 msgstr "Éditer un pressing"
 
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2644
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -20447,9 +20775,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2646
 msgid "Edit Laundry"
 msgstr "Éditer une laverie"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2651
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -20457,32 +20785,32 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2653
 msgid "Edit Outdoor Shop"
 msgstr "Éditer un magasin de sports d’extérieur"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2658
 msgid "Sports"
 msgstr "Sports"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2659
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2664
 msgid "Optician"
 msgstr "Opticien"
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2665
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2672
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2673
 msgid "Bank"
 msgstr "Banque"
@@ -20490,14 +20818,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2675
 msgid "Edit Bank"
 msgstr "Editez une banque"
 
-#: build/trans_presets.java:2677 build/trans_presets.java:2686
+#: build/trans_presets.java:2680 build/trans_presets.java:2689
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2682
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -20505,5 +20833,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2684
 msgid "Edit Money Exchange"
 msgstr "Éditer un bureau de change"
@@ -20511,15 +20839,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2691
 msgid "Edit Automated Teller Machine"
 msgstr "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2696
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2697
 msgid "Doctors"
 msgstr "Médecin"
@@ -20527,18 +20855,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2699
 msgid "Edit Doctors"
 msgstr "Modifier Médecin"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2704
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2705
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2710
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -20546,5 +20874,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2712
 msgid "Edit Pharmacy"
 msgstr "Éditer pharmacie"
@@ -20552,9 +20880,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2714
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2718
 msgid "Hospital"
 msgstr "Hôpital"
@@ -20562,10 +20890,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2720
 msgid "Edit Hospital"
 msgstr "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2724
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -20574,5 +20902,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2727
 msgid "Edit Emergency Access Point"
 msgstr "Éditer point d’accès d’urgence"
@@ -20581,20 +20909,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2730
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2731
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2733
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2734
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890"
@@ -20602,5 +20930,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2737
 msgid "Veterinary"
 msgstr "Vétérinaire"
@@ -20609,55 +20937,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2740
 msgid "Edit Veterinary"
 msgstr "Editez un Vétérinaire"
 
 #. group "Places"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2748
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2749
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2754
 msgid "Country"
 msgstr "Pays"
 
 #. item
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2755
 msgid "Edit Country"
 msgstr "Éditer un pays"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2760
 msgid "State"
 msgstr "Département"
 
 #. item
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2761
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2766
 msgid "Region"
 msgstr "Région"
 
 #. item
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2767
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2772
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2773
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
@@ -20665,15 +20993,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2779
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2780
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2785
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -20681,10 +21009,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2787
 msgid "Edit Town"
 msgstr "Editez la ville"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2792
 msgid "Suburb"
 msgstr "Banlieue"
@@ -20692,25 +21020,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2794
 msgid "Edit Suburb"
 msgstr "Éditer une banlieue"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2799
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2800
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2805
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2806
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
@@ -20718,5 +21046,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2812
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -20724,10 +21052,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2814
 msgid "Edit Locality"
 msgstr "Éditer un lieu-dit"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2819
 msgid "Island"
 msgstr "île"
@@ -20735,24 +21063,22 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2821
 msgid "Edit Island"
 msgstr "Éditer une île"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2823
-#, fuzzy
+#: build/trans_presets.java:2826
 msgid "Islet"
-msgstr "gauche"
+msgstr ""
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2825
-#, fuzzy
+#: build/trans_presets.java:2828
 msgid "Edit Islet"
-msgstr "Editez un châlet"
+msgstr ""
 
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2834
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -20760,10 +21086,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2836
 msgid "Edit Cave Entrance"
 msgstr "Éditer une entrée de grotte"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2840
 msgid "Peak"
 msgstr "Sommet"
@@ -20771,10 +21097,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2842
 msgid "Edit Peak"
 msgstr "Modifier un pic"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2847
 msgid "Glacier"
 msgstr "Glacier"
@@ -20782,10 +21108,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2849
 msgid "Edit Glacier"
 msgstr "Éditer un glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2854
 msgid "Volcano"
 msgstr "Volcan"
@@ -20793,70 +21119,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2856
 msgid "Edit Volcano"
 msgstr "Éditer un volcan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2862
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2863
 msgid "National"
 msgstr "Nationale"
 
 #. item
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2864
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2869
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2870
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2875
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2876
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2881
 msgid "Political"
 msgstr "Politique"
 
 #. item
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2882
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2887
 msgid "National park"
 msgstr "Parc national"
 
 #. item
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2888
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2894
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2895
 msgid "Tree"
 msgstr "Arbre"
@@ -20865,15 +21191,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2898
 msgid "Edit Tree"
 msgstr "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2903
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2905
 msgid "Wood"
 msgstr "Bois"
@@ -20882,5 +21208,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2908
 msgid "Edit Wood"
 msgstr "Éditer un bois"
@@ -20888,17 +21214,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2913
 msgid "Forest"
 msgstr "Forêt"
@@ -20907,14 +21233,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2916
 msgid "Edit Forest Landuse"
 msgstr "Éditer une forêt"
 
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2922
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2923
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
@@ -20922,25 +21248,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2928
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2929
 msgid "Edit Scree"
 msgstr "Éditer une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2933
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2934
 msgid "Edit Scrub"
 msgstr "Éditer des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2938
 msgid "Fell"
 msgstr "Talus"
@@ -20948,10 +21274,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2940
 msgid "Edit Fell"
 msgstr "Éditer un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2944
 msgid "Heath"
 msgstr "Lande"
@@ -20959,5 +21285,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2946
 msgid "Edit Heath"
 msgstr "Éditer une lande"
@@ -20965,5 +21291,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2951
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -20972,45 +21298,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2954
 msgid "Edit Farmyard Landuse"
 msgstr "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2959
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2960
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2965
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2966
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2971
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2972
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2977
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2978
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
@@ -21018,25 +21344,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2984
 msgid "Garden"
 msgstr "Jardin"
 
 #. item
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2985
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2989
 msgid "Grass"
 msgstr "Herbe"
 
 #. item
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2990
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2995
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -21044,10 +21370,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:2997
 msgid "Edit Village Green Landuse"
 msgstr "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3002
 msgid "Common"
 msgstr "Espace commun"
@@ -21055,20 +21381,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3004
 msgid "Edit Common"
 msgstr "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3008
 msgid "Park"
 msgstr "Parc"
 
 #. item
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3009
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3013
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -21076,5 +21402,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:3015
 msgid "Edit Recreation Ground Landuse"
 msgstr "Éditer une aire de jeux"
@@ -21082,15 +21408,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3021
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3022
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3027
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -21098,9 +21424,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3029
 msgid "Edit Graveyard"
 msgstr "Éditer un petit cimetière"
 
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3035
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -21108,39 +21434,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3037
 msgid "Edit Cemetery Landuse"
 msgstr "Éditer un cimetière"
 
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3044
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3045
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3050
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3051
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3056
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3057
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3062
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -21148,15 +21474,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3064
 msgid "Edit Railway Landuse"
 msgstr "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3069
 msgid "Military"
 msgstr "Militaire"
 
 #. item
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3070
 msgid "Edit Military Landuse"
 msgstr "Éditer un terrain militaire"
@@ -21164,55 +21490,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3076
 msgid "Construction area"
 msgstr "Zone de construction"
 
 #. item
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3077
 msgid "Edit Construction Landuse"
 msgstr "Éditer un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3082
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3083
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3088
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3089
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3094
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3095
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3100
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3101
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
 
 #. group "Relations"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3110
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -21222,5 +21548,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3114
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -21229,10 +21555,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3120
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3121
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -21240,5 +21566,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3124
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -21247,5 +21573,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3127
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -21253,34 +21579,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_straight_on"
 msgstr "Interdiction d'aller tout droit"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_straight_on"
 msgstr "Obligation d'aller tout droit"
@@ -21289,15 +21615,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3134
 msgid "from way"
 msgstr "chemin d'origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3135
 msgid "via node or way"
 msgstr "nœud ou chemin de passage"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3136
 msgid "to way"
 msgstr "chemin destination"
@@ -21305,5 +21631,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3139
 msgid "Route"
 msgstr "Route"
@@ -21312,5 +21638,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3142
 msgid "Edit Route"
 msgstr "Modifier une route"
@@ -21318,5 +21644,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "Route type"
 msgstr "Type de route"
@@ -21324,5 +21650,5 @@
 #. item "Relations/Route" combo "Route type"
 #. color destination
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -21388,5 +21714,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3141 build/trans_style.java:233
+#: build/trans_presets.java:3144 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21395,17 +21721,17 @@
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ski"
 msgstr "ski"
@@ -21458,5 +21784,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3141 build/trans_style.java:247
+#: build/trans_presets.java:3144 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21465,13 +21791,13 @@
 msgstr "piéton"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "detour"
 msgstr "détour"
@@ -21485,10 +21811,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3141 build/trans_style.java:1206
+#: build/trans_presets.java:3144 build/trans_style.java:1206
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3147
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -21496,31 +21822,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3150
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "Route state"
-msgstr ""
+msgstr "État de la route"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3153
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -21529,30 +21855,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3156
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3157
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3158
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3159
 msgid "halt point"
 msgstr "point d'arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3160
 msgid "forward halt point"
 msgstr "point d'arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3161
 msgid "backward halt point"
 msgstr "point d'arrêt précédent"
@@ -24705,76 +25031,4 @@
 msgstr "patrimoine"
 
-#. color historic
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--landuse tags -->
-#.
-#. <rule>
-#. <condition k="landuse" v="farm"/>
-#. color green
-#. <icon annotate="true" src="misc/landmark/farm.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="farmland"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="meadow"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="vineyard"/>
-#. color forest
-#. <icon src="misc/landmark/trees.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="allotments"/>
-#. color green
-#. <icon src="misc/landmark/plant.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="grass"/>
-#. color cemetery
-#. <icon src="rendering/landuse/cemetery.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="village_green"/>
-#. color green
-#. <icon src="leisure/common.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3055 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3127 build/trans_style.java:3135
-#: build/trans_style.java:3233 build/trans_style.java:3241
-msgid "green"
-msgstr "espace vert"
-
 #. color green
 #. <icon annotate="true" src="shop/groceries/fruits.png"/>
@@ -25742,116 +25996,63 @@
 msgstr "Terraserver Urbain"
 
-#~ msgid "Hint: Some changes came from uploading new data to the server."
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#. only for Czech Republic
+#: build/trans_wms.java:25
+msgid "Czech CUZK:KM"
+msgstr ""
+
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:26
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Toutes les voies étaient vides"
+
+#~ msgid "Merge nodes with different memberships?"
 #~ msgstr ""
-#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
-#~ "données sur le serveur."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Fusionner tout de même"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "Veuillez sélectionner des chemins avec des angles droits afin de les "
-#~ "orthogonaliser."
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
+#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. "
+#~ "Voulez-vous encore les fusionner ?"
+
+#~ msgid "Unknown version"
+#~ msgstr "Version inconnue"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Il manque le numéro de version dans les données OSM."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Élément <nd> trouvé sur un non-chemin."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> n’a pas de ref"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Élément <member> trouvé dans une non-relation."
+
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr ""
-#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier "
-#~ "plan. L'exception était : {0}"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. "
-#~ "Merci de signaler ceci comme une erreur."
+#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation "
+#~ "{1}, valeur {2}"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "id du nœud mal formé"
+
+#~ msgid "Move"
+#~ msgstr "Déplacer"
+
+#~ msgid "Data Layer"
+#~ msgstr "Calque de données"
 
 #~ msgid "No document open so nothing to save."
 #~ msgstr "Aucun document ouvert donc rien à sauvegarder."
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Changer {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Supprimer {1} {0}"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "supprimer le membre de la relation {0} {1}"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
-
-#~ msgid "nodes"
-#~ msgstr "nœuds"
-
-#~ msgid "ways"
-#~ msgstr "chemins"
-
-#~ msgid "relations"
-#~ msgstr "relations"
-
-#~ msgid "changesets"
-#~ msgstr "jeux de données"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Impossible de charger l’historique depuis le serveur. Détails :<br>"
-#~ "{0}</html>"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Supprimer le calque"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
-
-#~ msgid "Delete all"
-#~ msgstr "Tout supprimer"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Auteurs : {0}"
-
-#~ msgid "Public"
-#~ msgstr "Public"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de "
-#~ "charger."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continuer tout de même"
-
-#~ msgid "Copy Default"
-#~ msgstr "Copier défaut"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Modifier Office du Tourisme"
-
-#~ msgid "Map Type"
-#~ msgstr "Type de carte"
-
-#~ msgid "map"
-#~ msgstr "carte"
-
-#~ msgid "citymap"
-#~ msgstr "carte de la ville"
-
-#~ msgid "hikingmap"
-#~ msgstr "carte de randonnée"
-
-#~ msgid "bicyclemap"
-#~ msgstr "carte de randonnée cycliste"
-
-#~ msgid "Board Type"
-#~ msgstr "Type de bureau"
-
-#~ msgid "board"
-#~ msgstr "tableau"
-
-#~ msgid "Move"
-#~ msgstr "Déplacer"
-
-#~ msgid "Data Layer"
-#~ msgstr "Calque de données"
 
 #~ msgid "Unknown file extension."
@@ -25927,18 +26128,8 @@
 #~ msgstr "EPSG:4326"
 
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom : molette de souris ou double-clic.   Déplacer la carte : garder le "
-#~ "bouton droit de souris enfoncé et déplacer la souris.   Sélection : Clic"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr ""
 #~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
 
-#~ msgid "end"
-#~ msgstr "fin"
-
 #~ msgid "Metacarta Map Rectifier image id"
 #~ msgstr "Metacarta Map Rectifier image id"
@@ -25967,4 +26158,9 @@
 #~ msgid "Add Selected"
 #~ msgstr "Ajouter la sélection"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
+#~ "données sur le serveur."
 
 #~ msgid "Tags (empty value deletes tag)"
@@ -25985,4 +26181,7 @@
 #~ msgstr "Pivoter"
 
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Supprimer {1} {0}"
+
 #~ msgid "Error parsing server response."
 #~ msgstr "Erreur d'analyse de la réponse du serveur"
@@ -26000,9 +26199,32 @@
 #~ msgstr "Importer un fichier TCX..."
 
+#~ msgid "Copy Default"
+#~ msgstr "Copier défaut"
+
+#~ msgid "citymap"
+#~ msgstr "carte de la ville"
+
+#~ msgid "map"
+#~ msgstr "carte"
+
 #~ msgid "Charge"
 #~ msgstr "Charge"
 
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr ""
+#~ "Veuillez sélectionner des chemins avec des angles droits afin de les "
+#~ "orthogonaliser."
+
 #~ msgid "Drawbridge"
 #~ msgstr "Pont-levis"
+
+#~ msgid "hikingmap"
+#~ msgstr "carte de randonnée"
+
+#~ msgid "bicyclemap"
+#~ msgstr "carte de randonnée cycliste"
+
+#~ msgid "board"
+#~ msgstr "tableau"
 
 #~ msgid "Server does not support changesets"
@@ -26076,4 +26298,7 @@
 #~ msgstr "Herse"
 
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
+
 #~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
@@ -26107,4 +26332,7 @@
 #~ "{0}"
 
+#~ msgid "Authors: {0}"
+#~ msgstr "Auteurs : {0}"
+
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Conflits : {0}"
@@ -26128,4 +26356,10 @@
 #~ msgid "sports"
 #~ msgstr "Magasin de sport"
+
+#~ msgid "Selected makes your trace public in openstreetmap.org"
+#~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org"
+
+#~ msgid "Public"
+#~ msgstr "Public"
 
 #~ msgid "Select Tableau d'Assemblage"
@@ -26154,6 +26388,14 @@
 #~ msgstr "Supprimer et télécharger"
 
+#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
+#~ msgstr ""
+#~ "CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de "
+#~ "charger."
+
 #~ msgid "No intersections found. Nothing was changed."
 #~ msgstr "Pas d'intersection trouvée. Rien n'a été modifié."
+
+#~ msgid "Continue anyway"
+#~ msgstr "Continuer tout de même"
 
 #~ msgid "Commit comment"
@@ -26173,8 +26415,4 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Ajouter les objets sélectionnés en tant que membres"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr ""
-#~ "Supprimer le membre de cette relation de l'entrée actuelle de la table"
 
 #~ msgid "Click Reload to refresh list"
@@ -26191,4 +26429,7 @@
 #~ "préalablement sélectionnée dans la liste de l’historique."
 
+#~ msgid "Delete Layer"
+#~ msgstr "Supprimer le calque"
+
 #~ msgid "Layers: {0}"
 #~ msgstr "Calques: {0}"
@@ -26202,4 +26443,11 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki."
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. "
+#~ "Merci de signaler ceci comme une erreur."
 
 #~ msgid "Adjust the position of the WMS layer"
@@ -26246,4 +26494,13 @@
 #~ msgstr ""
 #~ "Les erreurs suivantes sont survenues durant le téléchargement groupé :"
+
+#~ msgid "Edit Information Office"
+#~ msgstr "Modifier Office du Tourisme"
+
+#~ msgid "Map Type"
+#~ msgstr "Type de carte"
+
+#~ msgid "Board Type"
+#~ msgstr "Type de bureau"
 
 #~ msgid "Edit Drawbridge"
@@ -26320,10 +26577,4 @@
 #~ msgstr "lié"
 
-#~ msgid "Overlap tiles"
-#~ msgstr "Tuiles se chevauchant"
-
-#~ msgid "% of lat:"
-#~ msgstr "% de lat. :"
-
 #~ msgid "% of lon:"
 #~ msgstr "% de lon. :"
@@ -26400,4 +26651,16 @@
 #~ msgstr "Primitive manquante"
 
+#~ msgid "nodes"
+#~ msgstr "nœuds"
+
+#~ msgid "ways"
+#~ msgstr "chemins"
+
+#~ msgid "relations"
+#~ msgstr "relations"
+
+#~ msgid "changesets"
+#~ msgstr "jeux de données"
+
 #~ msgid "Error when communicating with server."
 #~ msgstr "Erreur de communication avec le serveur"
@@ -26429,4 +26692,12 @@
 #~ msgstr "Échec d’initialisation de l’API"
 
+#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+#~ msgstr ""
+#~ "<html>Impossible de charger l’historique depuis le serveur. Détails :<br>"
+#~ "{0}</html>"
+
+#~ msgid "Change {0} {1}"
+#~ msgstr "Changer {0} {1}"
+
 #~ msgid "No data"
 #~ msgstr "Aucune donnée"
@@ -26434,2 +26705,16 @@
 #~ msgid "Conflict created"
 #~ msgstr "conflit créé"
+
+#~ msgid "Remove relation member {0} {1}"
+#~ msgstr "supprimer le membre de la relation {0} {1}"
+
+#~ msgid "Do you really want to delete layer ''{0}''?"
+#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
+
+#~ msgid "Delete all"
+#~ msgstr "Tout supprimer"
+
+#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
+#~ msgstr ""
+#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier "
+#~ "plan. L'exception était : {0}"
