Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 17708)
+++ applications/editors/josm/i18n/po/fr.po	(revision 17764)
@@ -6,16 +6,17 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:29+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:32+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
-"Language-Team: Fr\n"
+"Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+"X-Poedit-Language: French\n"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -23,5 +24,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -30,14 +31,14 @@
 msgstr "Aide"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, 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: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
+msgstr "La projection {0} ne peut être activée. Utilisation de Mercator."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -74,6 +75,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:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -88,4 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -101,6 +107,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -108,86 +114,11 @@
 msgstr "Erreur"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Il y a des modifications non sauvegardées dans {0} calque. Ignorer les "
-"modifications et continuer ?"
-msgstr[1] ""
-"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:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Enregistrer et quitter"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Annuler et quitter"
-
-#: ../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: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/DownloadAction.java:53
-#: ../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:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../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:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../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:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorant l’URL malformé : \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+msgstr "Ignorant l’URL mal-formée : \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -209,7 +140,7 @@
 #: ../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:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -223,5 +154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
@@ -248,13 +179,13 @@
 msgstr "Avertissement"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ignorant l URL malformé du fichier : \"{0}\""
-
-#: ../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
+msgstr "Ignorant l URL malformée du fichier : \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -276,5 +207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
 msgid "Display the about screen."
-msgstr "Afficher l’à propos."
+msgstr "Afficher l’À propos."
 
 #. TODO: put in a platformHook for system that have no console by default
@@ -289,5 +220,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
-msgstr "Editeur Java OpenStreetMap"
+msgstr "Éditeur Java OpenStreetMap"
 
 #. Add the version number
@@ -373,4 +304,7 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Attention : format de base du l'URL de l'API inattendu. Les redirections "
+"vers les pages utilisateurs OSM échouera probablement. L'URL de base de "
+"L'API est : ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -385,5 +319,5 @@
 "primitives only"
 msgstr ""
-"ATTENTION : ouverture des’ fenêtres du navigateur pour les {0} sur {1} "
+"ATTENTION : ouverture des fenêtres du navigateur pour les {0} sur {1} "
 "primitives sélectionnées uniquement."
 
@@ -401,4 +335,52 @@
 msgid "Merge"
 msgstr "Fusionner"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../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/DownloadAction.java:53
+#: ../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:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../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:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Annuler"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -494,4 +476,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -506,5 +489,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -541,6 +524,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../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/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -563,47 +546,4 @@
 msgstr "Veuillez sélectionner au moins trois nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
-"courant : {0}, maximum : {1}"
-
-#: ../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:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Attention : troncage automatique de la valeur du champ \"{0}\" sur la "
-"primitive supprimée {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"La longueur de la valeur du champ \"{0}\" de la primitive {1} excède la "
-"longueur maximale autorisée {2}. la longueur actuelle est de {3}."
-
-#: ../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:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} nœuds dans le chemin {1} excèdent le nombre maximum de nœuds autorisés "
-"{2}"
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -656,10 +596,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "Fermer les ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Ferme les ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -671,5 +611,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -679,15 +619,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
-msgstr ""
+msgstr "Il n'y a pas d'ensembles de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Pas d'ensembles de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "Téléchargement des ensembles de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -788,5 +728,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -802,5 +742,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../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/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -850,8 +790,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1024,5 +966,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "le paramètre \"{0}\" ne doit pas être vide"
 
@@ -1030,5 +972,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
 
@@ -1060,5 +1002,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Édition"
@@ -1769,14 +1711,14 @@
 msgstr "La sélection est vide"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Chargement vers OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 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
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1787,23 +1729,23 @@
 "les résoudre d'abord.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 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
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Aucun changement à envoyer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchroniser tout le jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1825,17 +1767,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 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}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, 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
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1851,16 +1793,17 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+msgstr "Ensemble de changement fermé"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1868,23 +1811,23 @@
 "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, 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:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, 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:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "L’envoi vers l’API OSM a échoué"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Mise à jour des primitives"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1998,8 +1941,4 @@
 "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
@@ -2283,5 +2222,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Veuillez entrer une chaine de caractère comme filtre."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2303,5 +2242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
 msgid "find in selection"
-msgstr ""
+msgstr "trouver dans une selection"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
@@ -2564,4 +2503,71 @@
 msgid "Error while communicating with server."
 msgstr "Erreur de communication avec le serveur"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
+"courant : {0}, maximum : {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Violation des capacités de l’API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Attention : troncage automatique de la valeur du champ \"{0}\" sur la "
+"primitive supprimée {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"La longueur de la valeur du champ \"{0}\" de la primitive {1} excède la "
+"longueur maximale autorisée {2}. la longueur actuelle est de {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Violation de la condition prédéfinie"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"{0} nœuds dans le chemin {1} excèdent le nombre maximum de nœuds autorisés "
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2664,9 +2670,7 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"Attention : La couche ''{0}'' n'existe plus. Impossible de supprimer le "
-"conflit pour l'élément ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr "un conflit est déjà enregistré pour la primitive \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2692,5 +2696,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "impossible de résoudre un conflit non arbitré"
 
@@ -2750,5 +2754,5 @@
 "de la relation ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Séparer le segment du chemin"
@@ -2756,6 +2760,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2767,5 +2771,5 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Confirmation de suppression"
@@ -2873,7 +2877,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3050,5 +3054,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "un conflit est déjà enregistré pour la primitive \"{0}\""
 
@@ -3067,18 +3071,21 @@
 msgstr "Degrés Minutes Secondes"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "E"
@@ -3092,43 +3099,65 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, 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/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "H"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "Texte"
+
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "C"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "I"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgstr "M"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgstr "R"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgstr "A"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgstr "D"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
-msgstr ""
+msgstr "F"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3144,29 +3173,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
 
@@ -3176,20 +3206,21 @@
 #: ../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"
+"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 "Impossible d'ajouter le nœud {0} au chemin incomplet {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr "Il n’y a pas de primitive de version {0} dans cet historique"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
@@ -3197,13 +3228,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "pas de verison plus ancienne trouvée. L’historique est vide."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "pas de version plus récente trouvée. L’historique est vide."
 
@@ -3217,12 +3248,6 @@
 "Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
 
@@ -3230,5 +3255,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}"
@@ -3384,5 +3409,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3393,5 +3418,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:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3402,5 +3427,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3890,9 +3915,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
 msgid "User:"
-msgstr ""
+msgstr "Utilisateur :"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
@@ -3958,5 +3983,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}"
 
@@ -4060,5 +4085,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "paramètre en dehors de la plage : reçu {0}"
 
@@ -4066,15 +4091,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "élément {0} non trouvé dans la liste"
 
@@ -4132,5 +4157,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
-msgid "Copy my selected elements to the end of the list of merged elements"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Copier mes éléments sélectionnés à la fin de la liste des éléments fusionnés"
@@ -4139,5 +4164,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copier mes éléments sélectionnés avant le premier élément sélectionné de la "
@@ -4147,5 +4172,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copier mes éléments sélectionnés après le premier élément sélectionné de la "
@@ -4153,5 +4178,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Copier leurs éléments sélectionnés au début de la liste des éléments "
@@ -4159,5 +4185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
-msgid "Copy their selected elements to the end of the list of merged elements"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copier leurs éléments sélectionnés à la fin de la liste des éléments "
@@ -4167,5 +4193,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Copier leurs éléments sélectionnés avant le premier élément sélectionné de "
@@ -4186,5 +4212,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Remonter les éléments sélectionnés d'un cran"
 
@@ -4195,5 +4221,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Descendre les éléments sélectionnés d'un cran"
 
@@ -4208,5 +4234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
 
@@ -4218,5 +4244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
-msgid "Freeze the current list of merged elements"
+msgid "Freeze the current list of merged elements."
 msgstr "Fige la liste courante des éléments fusionnés"
 
@@ -4226,5 +4252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Libérer la liste courante des éléments fusionnés"
 
@@ -4232,5 +4258,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Cliquer <strong>{0}</strong> pour commencer la fusion de leurs "
@@ -4240,5 +4267,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4271,13 +4298,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr "variable {0} non encore enregistrée."
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "variable {0} non encore enregistrée"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4286,5 +4313,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 "Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
@@ -4294,5 +4321,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "index de colonne inattendu. Reçu {0}"
 
@@ -4498,5 +4525,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
@@ -4560,5 +4587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 "impossible de fusionner un élément dont le conflit d’étiquette n’a pas été "
@@ -4568,5 +4595,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
 
@@ -4627,5 +4654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
-msgstr ""
+msgstr "Annuler la résolution des conflits"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
@@ -4676,14 +4703,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "Le paramètre \"{0}\" ne doit pas être vide."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "La suite d’attributs ne comprend pas la valeur sélectionnée « {0} »"
 
@@ -4692,91 +4719,94 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+msgid "Not decided yet."
+msgstr "Pas encore décidé."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "Attributs issus de nœuds"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "Attributs issus de chemins"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "Attributs issus de relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "Conflits entre des attributs collés"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} voie"
+msgstr[1] "{0} voies"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} relation"
+msgstr[1] "{0} relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "Paste ..."
+msgstr "Coller…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "From ..."
+msgstr "De…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "To ..."
+msgstr "Pour…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} attribut"
+msgstr[1] "{0} attributs"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+msgid "Remove this relation member from the relation"
+msgstr "Supprimer ce membre de la relation de la relation."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+msgid "Replace"
+msgstr "Remplacer"
+
+#: ../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
+msgid "Undecided"
+msgstr "Non décidé"
+
 #: ../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 décidé."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
-msgid "Tags from nodes"
-msgstr "Attributs issus de nœuds"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-msgid "Tags from ways"
-msgstr "Attributs issus de chemins"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-msgid "Tags from relations"
-msgstr "Attributs issus de relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-msgid "Conflicts in pasted tags"
-msgstr "Conflits entre des attributs collés"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0} voie"
-msgstr[1] "{0} voies"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} relation"
-msgstr[1] "{0} relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "Paste ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "From ..."
-msgstr "De…"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "To ..."
-msgstr "Pour…"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
-#, java-format
-msgid "{0} tag"
-msgid_plural "{0} tags"
-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
-msgid "Remove this relation member from the relation"
-msgstr "Supprimer ce membre de la relation de la relation."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Remplacer"
-
-#: ../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
-msgid "Undecided"
-msgstr "Non décidé"
 
 #. --- role editing
@@ -4935,5 +4965,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
 #: ../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/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4942,29 +4972,29 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Add filter."
-msgstr ""
+msgstr "Ajouter un filtre."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 msgid "Edit filter."
-msgstr ""
+msgstr "Éditer le filtre."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 msgid "Delete filter."
-msgstr ""
+msgstr "Supprimer le filtre."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Move filter up."
-msgstr ""
+msgstr "Déplacer le filtre vers le haut."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter down."
-msgstr ""
+msgstr "Déplacer le filtre vers le bas."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
 msgid "Enable filter"
-msgstr ""
+msgstr "Activer le filtre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Hide elements"
-msgstr ""
+msgstr "Cacher les éléments"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
@@ -4974,9 +5004,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Inverse filter"
-msgstr ""
+msgstr "Inverser le filtre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Filter mode"
-msgstr ""
+msgstr "Mode filtre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
@@ -4991,5 +5021,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "index en dehors des limites. Reçu {0}"
 
@@ -5005,5 +5035,5 @@
 #, java-format
 msgid "Way {0}"
-msgstr ""
+msgstr "Chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
@@ -5027,5 +5057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Afficher l'historique de la primitive sélectionnée"
 
@@ -5077,5 +5107,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
 msgid "Information about layer"
-msgstr ""
+msgstr "Informations à propos du calque."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
@@ -5095,5 +5125,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:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<différent>"
@@ -5314,5 +5344,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
 msgid "Missing encoding"
-msgstr ""
+msgstr "Encodage manquant"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
@@ -5325,6 +5355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "éditer la relation en référence du membre de relation sélectionné"
 
@@ -5378,5 +5407,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5611,4 +5639,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "éditer la relation en référence du membre de relation sélectionné"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5642,6 +5674,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
-msgstr ""
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+"Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5914,5 +5952,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "historique pas encore initialisé. Impossible de définir la référence de la "
@@ -5922,12 +5960,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
-msgstr ""
-"impossible de définir la référence. la référence d’id {0} ne correspond pas "
-"à l'historique d’id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 "échec de la définition de la référence. la référence de version {0} n’est "
@@ -5935,5 +5973,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 "historique non encore initialisé. Impossible de définir la primitive "
@@ -5942,5 +5980,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 "impossible de définir l’en-cours. la version actuelle {0} n’est pas "
@@ -5950,9 +5990,4 @@
 msgid "Load history"
 msgstr "Chargement de l'historique"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6865,9 +6900,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
 msgid "Changeset info"
-msgstr ""
+msgstr "Informations sur l'ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Launch browser with information about the changeset"
 msgstr ""
+"Lancer un navigateur avec les informations sur l'ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
@@ -6887,13 +6923,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr ""
+msgstr "Identifiant de l'ensemble de changements :"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr ""
+msgstr "Créé le :"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr ""
+msgstr "Commentaire sur l'ensemble de changement :"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -6904,21 +6940,23 @@
 msgid "<html>Please select the changesets you want to close</html>"
 msgstr ""
+"<html>Veuillez sélectionner l'ensemble de changement que vous voulez fermer</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
 msgid "Open changesets"
-msgstr ""
+msgstr "Ouvrir les ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
 msgid "Close changesets"
-msgstr ""
+msgstr "Fermer les ensembles de changements"
 
 #. putValue(SMALL_ICON, ImageProvider.get("cancel"));
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Fermer les ensembles de changements sélectionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Annuler la fermeture des ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
@@ -6969,9 +7007,9 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "Layer ''{0}'' has no modifications to be saved."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Pas de fichier associé à ce calque"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
@@ -6988,4 +7026,6 @@
 msgid "File ''{0}'' is not writable. Please enter another file name."
 msgstr ""
+"Le fichier ''{0}'' n'est pas inscriptible. Veuillez spécifier un autre nom "
+"de fichier."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110
@@ -6993,5 +7033,5 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Envoyer le calque ''{0}'' sur le serveur ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
@@ -7032,5 +7072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr ""
+msgstr "Il y a des données et des conflits non sauvegardés."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
@@ -7071,4 +7111,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Annuler et quitter"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7078,9 +7122,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
 msgid "Discard and Delete"
-msgstr ""
+msgstr "Abandonner et supprimer"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Enregistrer et quitter"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7109,4 +7157,6 @@
 "cancelled or has been failed.</html>"
 msgstr ""
+"<html>Une opération d'envoi et/ou de sauvegarde d'un calque avec des "
+"modifications<br>a été annulé ou a échoué.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
@@ -7170,13 +7220,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
 msgid "Should upload?"
-msgstr ""
+msgstr "Envoyer ?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
 msgid "Should save?"
-msgstr ""
+msgstr "Sauvegarder ?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
 msgid "Filename"
-msgstr ""
+msgstr "Nom de fichier"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
@@ -7240,4 +7290,6 @@
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
+"Veuillez entrer un commentaire sur cet ensemble de changements (minimum 3 "
+"caractères)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
@@ -7267,25 +7319,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 msgid "Open a new changeset"
-msgstr ""
+msgstr "Ouvrir un nouvel ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
+"Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 msgid "Use an open changeset"
-msgstr ""
+msgstr "Utiliser ensemble de changements ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
 msgid "Upload data to an already opened changeset"
-msgstr ""
+msgstr "Envoyer les données vers un ensemble de changements déjà ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Fermer l'ensemble de changements après l'envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
 msgid "Select to close the changeset after the next upload"
-msgstr ""
+msgstr "Fermer l'ensemble de changements après le prochain envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
@@ -7299,13 +7352,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Charger la liste de vos ensembles de changements depuis le serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Fermer l'ensemble de changements actuellement ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7421,36 +7477,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "point GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points pour ce calque."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7458,5 +7514,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7465,5 +7521,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7498,4 +7554,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7528,5 +7585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Length"
-msgstr ""
+msgstr "Longueur"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
@@ -7554,5 +7611,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
@@ -7568,5 +7625,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7574,5 +7631,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -7684,5 +7741,5 @@
 msgstr "Convertir en calque GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7690,28 +7747,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "trace"
-msgstr[1] "traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7719,5 +7760,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7726,5 +7767,5 @@
 msgstr[1] "une trace avec {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7733,5 +7774,5 @@
 msgstr[1] "{0} est constitué de {1} traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7871,5 +7912,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Veuille sélectionnez la rangée à éditer."
@@ -7885,5 +7926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../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/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -8074,4 +8115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8640,5 +8682,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Supprimer la source sélectionnée de la liste."
@@ -8850,33 +8892,34 @@
 msgstr "Supprimer la sélection dans la table des attributs"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Plus d'informations à propos de cette balise"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, 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:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Utiliser la balise \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "voie sans issue"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8887,15 +8930,15 @@
 msgstr "Impossible de lire la source des balises prédéfinies : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur de traitement {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, 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:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8905,18 +8948,18 @@
 msgstr[1] "Changer {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../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:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Appliquer balise"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Changer les propriétés"
@@ -8946,10 +8989,4 @@
 msgstr "Téléchargement des points {0} à {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8965,11 +9002,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Impossible de lire \"{0}\""
 
@@ -8988,5 +9024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "description de la trace GPS"
 
@@ -9050,5 +9086,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -9061,5 +9096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 "Erreur d'analyse syntaxique : la structure du document n’est pas valide pour "
@@ -9069,9 +9104,9 @@
 #, java-format
 msgid "Unknown mode {0}."
-msgstr ""
+msgstr "Mode {0} inconnu."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 "pas de primitive d’id {0} dans le jeu de données local. Impossible de "
@@ -9126,5 +9161,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Le serveur a répondu par une erreur 404, nouvelle tentative en utilisant des "
@@ -9166,5 +9201,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi"
 
@@ -9184,5 +9219,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 "Communication établie avec {0} en utilisant le protocole de version {1}"
@@ -9191,5 +9226,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\""
 
@@ -9197,5 +9232,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "format inattendu de nouvelle version d’une primitive modifiée \"{0}\", reçu "
@@ -9204,20 +9239,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
-msgstr ""
+msgstr "Création d'un ensemble de changements…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
+msgstr "ensemble de changements {0} ouvert avec succès"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr ""
+msgstr "Mise à jour de l'ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
@@ -9231,5 +9260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Pas de nouveau changement à envoyer"
 
@@ -9261,20 +9290,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9287,5 +9311,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Le serveur a renvoyé une erreur avec le code {0}"
 
@@ -9302,7 +9326,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "attribut obligatoire \"{0}\" manquant"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9312,15 +9342,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9328,11 +9358,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9351,5 +9375,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9432,5 +9456,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9438,5 +9462,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9454,15 +9478,8 @@
 msgstr "Fichiers compressés gzip du serveur OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "attribut obligatoire \"{0}\" manquant"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type long, reçu "
@@ -9472,5 +9489,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type long (>=0), "
@@ -9479,5 +9497,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
@@ -9487,5 +9505,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int (>=0), "
@@ -9495,5 +9513,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type booléen, "
@@ -9503,6 +9521,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type "
@@ -9517,32 +9535,37 @@
 msgstr "Erreur pendant l’analyse syntaxique."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Le fichier \"{0}\" n'existe pas"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9554,5 +9577,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9573,5 +9596,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "L’objet avec l’id=0 est illégal"
 
@@ -9580,26 +9603,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, 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:358
-#, 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:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9607,10 +9619,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9622,5 +9634,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9628,5 +9640,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9634,6 +9646,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9641,5 +9653,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9648,5 +9660,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9665,10 +9677,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9701,5 +9708,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
 
@@ -9714,5 +9721,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Echec de l’ouverture de connexion à l’API {0}"
 
@@ -9723,5 +9730,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Impossible de joindre le serveur OSM. Veuillez vérifier votre connectivité "
@@ -9729,5 +9736,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9737,5 +9744,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9745,5 +9752,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9784,5 +9791,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"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 ""
@@ -10200,5 +10207,5 @@
 "message d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10273,5 +10280,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10280,5 +10287,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10287,5 +10294,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10294,5 +10301,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10301,5 +10308,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10449,4 +10456,133 @@
 msgstr "CHarger les traces vers openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolation d’adresse"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Impair"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Pair"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10565,4 +10701,9 @@
 msgid "Error while parsing {0}"
 msgstr "Erreur pendant le traitement {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Impossible de lire \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10867,13 +11008,13 @@
 msgstr "Choisir parmi..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Enregistrement automatique de la source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10887,13 +11028,13 @@
 "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "Restaurer la fontion de téléchargement à la touche F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 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:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11278,28 +11419,28 @@
 msgstr "Calque vide"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "N'est pas vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Est vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Zone de délimitation de la commune : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11310,9 +11451,9 @@
 "Veuillez en créer un nouveau."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Erreur de format du tampon"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11321,5 +11462,5 @@
 "courante"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Erreur de tampon de zone Lambert"
@@ -12743,13 +12884,4 @@
 msgstr "Bâtiments mitoyens"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Pair"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Impair"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12773,41 +12905,4 @@
 msgid "Optional"
 msgstr "Optionnel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Utilisateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Afficher la liste des auteurs"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Ouvrir la page utilisateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Ouvrir la page utilisateur dans le navigateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Sélectionner les données de l'utilisateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Remplacer la sélection par les données utilisateurs"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Veuillez sélectionner quelques données"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Désolé, cela ne fonctionne pas avec des utilisateurs anonymes"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12989,10 +13084,10 @@
 msgstr "Aucune erreur de validation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Grille"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -13076,12 +13171,30 @@
 msgstr "validation autre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Validation des données"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13151,21 +13264,21 @@
 msgstr "Remplacer \"{0}\" par \"{1}\" pour"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Lignes de côte"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Ce test vérifie si les lignes de côte sont correctes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Ligne de côte désordonnée"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Chemins se croisant."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -13175,36 +13288,36 @@
 "croisent dans le même calque, mais ne sont pas connecté par un nœud."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr "Bâtiments chevauchants"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Chemins se croisant"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nœuds dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Nœuds à la même position"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "Chemins dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -13214,5 +13327,5 @@
 "coordonnées de nœuds."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr "Supprimer les chemins dupliqués."
@@ -13230,19 +13343,19 @@
 msgstr "Nœuds du chemin dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Nœuds avec le même nom."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 "Ce test trouve les neouds avec le même nom (ils pourraient être dupliqués)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Chemins superposés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13252,29 +13365,29 @@
 "d’un chemin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Zones superposées"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Routes superposées (avec une zone)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Chemins de fer superposés (avec une zone)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Chemins superposés (avec une zone)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Routes superposées"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Chemins de fer superposés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Chemins superposés"
@@ -13292,10 +13405,10 @@
 "plus d’un fois."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Chemins de nom similaire"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13304,23 +13417,23 @@
 "mal ortographiés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Vérificateur de propriétés :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Ce greffon vérifie les erreurs dans les clés et les valeurs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ligne du vérificateur d’étiquettes invalide - {0} : {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Erreur d’orthographe ligne : {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13331,7 +13444,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Combinaisons étiquette/valeur non valide"
@@ -13339,43 +13452,43 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problème de rendu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clé \"{0}\" non valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Étiquettes avec des valeurs vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Clé de propriété invalide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "espace blanc dans une clé non valide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "Les valeurs commencent ou finissent par un espace blanc"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Les valeurs contiennent du code HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "La clé \"{0}\" ne fait pas partie des balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Les balises ne contiennent pas de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
@@ -13383,39 +13496,39 @@
 "La valeur \"{0}\" pour la clé \"{1}\" n'est pas dans les balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Les balises ne contiennent pas de valeur de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Vérifier les clés de propriétés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Valider que les clés sont valides en comparasion avec une liste de mots?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Utiliser un vérificateur de propriétés complexe."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valider les étiquettes et les valeurs en utilisant des règles complexes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:626
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:648
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
 msgid "TagChecker source"
 msgstr "Source de TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13426,21 +13539,21 @@
 "données de vérification des étiquettes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "Ajouter une nouvelle source à la liste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 msgid "Edit the selected source."
 msgstr "Modifier la source sélectionnée."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
 msgstr "Sources de données"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Vérifier les valeurs des propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -13448,9 +13561,9 @@
 "prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Vérifier les FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -13458,102 +13571,102 @@
 "étiquette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Vérifier les notes de rendu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr "Vérifier si le rendu de carte a généré des erreurs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Utiliser le fichier de données par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Utiliser le fichier de données par défaut (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Utiliser la vérification orthographique par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Corriger les propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Impossible de trouver le type element"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Impossible de trouver le niveau d’avertissement"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expression interdite \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Expression rationnelle interdite \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Chemins non fermés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Cela vérifie si les chemins censés être circulaires sont fermés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "type nature {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "type utilisation du terrain {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "type équipements {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "type sport {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "type tourise {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "type magasin {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "type loisir {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13649,5 +13762,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13663,82 +13776,82 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "zone"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Chemin non fermé"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Chemins non liés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Ce test vérifie si un chemin a son dernier point très près d’un autre chemin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "Fin d’un chemin près d’une autre route"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "Fin d’un chemin près d’une autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Nœud d’un chemin à côté d’un autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "point final d’un chemin connecté à côté d’un autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Nœud non connectés et sans étiquettes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
 msgstr ""
 "Ce test vérifie les nœuds non étiquetés qui ne font partie d'aucun chemin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Chemins non étiquetés, vides ou avec un seul nœud."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
 "Ce test vérifie les chemins sans étiquette, vides ou avec un seul nœud."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Chemins non nommés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "carrefour sans nom"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Chemins non étiquettés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Chemins vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Chemins à un seul nœud"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Chemins mal ordonnés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
@@ -13746,14 +13859,14 @@
 "ou des lignes de côte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 "Ligne de côte inversée : la terre n’est pas sur le coté gauche du chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr "Eau inversée : la terre n’est pas sur le coté gauche du chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Terre inversée : la terre n’est pas sur le coté gauche du chemin"
@@ -14183,6 +14296,11 @@
 "données"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14193,10 +14311,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "Une prise en charge du serveur WMS du cadastre français."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14213,10 +14331,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Créer un reseau de voies"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -14225,10 +14343,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Permet d’importer divers formats de fichiers directement dans JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14239,10 +14357,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Voies dupliquées avec un décalage"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14253,5 +14371,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -14260,15 +14378,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualiser les informations de routage comme un claque de routage."
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fourni une couche d'arrière plan affichant une grille"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14281,10 +14399,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Aide à vectoriser des images WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14294,5 +14412,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14306,10 +14424,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14322,15 +14440,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Affiche une image d'arrière plan provenant d'OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importe les erreurs d'OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14340,5 +14458,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14348,5 +14466,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14357,15 +14475,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "L'apparence et le ressenti du superbe JGoodies Plastic"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet aux autres applications d'envoyer des commandes vers JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14377,10 +14495,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Fournit des capacités de routage/calcul d'itinéraire"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14391,10 +14509,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d'ajouter des marqueurs/points sur les positions GPS courantes."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -14403,5 +14521,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14414,17 +14532,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Crée des maisons mytoyennes depuis des blocs entiers."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une donnée "
-"de l'utilisateur sur la carte pour ouvrir un navigateur affichant la page du "
-"profil de l'auteur."
 
 #. Plugin utilsplugin
@@ -14519,5 +14627,5 @@
 #: build/trans_presets.java:57
 msgid "Highways"
-msgstr ""
+msgstr "Routes"
 
 #. group "Highways"
@@ -17153,5 +17261,5 @@
 #: build/trans_presets.java:1250
 msgid "Transport"
-msgstr ""
+msgstr "Transport"
 
 #. group "Transport"
@@ -17971,5 +18079,5 @@
 #: build/trans_presets.java:1567
 msgid "Travel"
-msgstr ""
+msgstr "Voyage"
 
 #. group "Travel"
@@ -18593,10 +18701,10 @@
 #: build/trans_presets.java:1852
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Pierre frontalière"
 
 #. item
 #: build/trans_presets.java:1853
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Éditer Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -19405,4 +19513,24 @@
 msgstr "stadium"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19755,5 +19883,5 @@
 #: build/trans_presets.java:2141
 msgid "Man-Made"
-msgstr ""
+msgstr "Artificial"
 
 #. group "Man-Made"
@@ -20157,10 +20285,4 @@
 msgid "Country code"
 msgstr "Indicatif du pays"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolation d’adresse"
 
 #. item
@@ -21249,5 +21371,5 @@
 #: build/trans_presets.java:2758
 msgid "Geography"
-msgstr ""
+msgstr "Géographie"
 
 #. group "Places"
@@ -22955,5 +23077,5 @@
 #: build/trans_style.java:542
 msgid "motorroad"
-msgstr ""
+msgstr "voie pour véhicules à moteur"
 
 #. color street
@@ -26319,13 +26441,16 @@
 #: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Czech CUZK:KM"
 
 #. 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 "parameter '{0}' must not be null"
-#~ msgstr "le paramètre {0} ne peut pas être vide"
+msgstr "Czech UHUL:ORTOFOTO"
+
+#~ msgid ""
+#~ "Hailed to set reference. Reference ID {0} does not match history ID {1}."
+#~ msgstr ""
+#~ "impossible de définir la référence. la référence d’id {0} ne correspond "
+#~ "pas à l'historique d’id {1}"
 
 #~ msgid "Move"
@@ -26334,4 +26459,7 @@
 #~ msgid "Data Layer"
 #~ msgstr "Calque de données"
+
+#~ msgid "No data imported."
+#~ msgstr "Aucune donnée importée"
 
 #~ msgid "No document open so nothing to save."
@@ -26606,4 +26734,32 @@
 #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
 
+#~ msgid "User"
+#~ msgstr "Utilisateur"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Remplacer la sélection par les données utilisateurs"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Ouvrir la page utilisateur dans le navigateur"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Sélectionner les données de l'utilisateur"
+
+#~ msgid "Open User Page"
+#~ msgstr "Ouvrir la page utilisateur"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr ""
+#~ "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Désolé, cela ne fonctionne pas avec des utilisateurs anonymes"
+
+#~ msgid "Please select some data"
+#~ msgstr "Veuillez sélectionner quelques données"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Afficher la liste des auteurs"
+
 #~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
@@ -26713,4 +26869,7 @@
 #~ msgstr "Interruption en cours..."
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Modifications non enregistrées"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
@@ -26835,9 +26994,11 @@
 #~ msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste."
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- version utilisée {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A>."
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une "
+#~ "donnée de l'utilisateur sur la carte pour ouvrir un navigateur affichant "
+#~ "la page du profil de l'auteur."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -26915,4 +27076,7 @@
 #~ "éléments lorsque les choix de fusion seront appliqués."
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "le paramètre {0} ne peut pas être vide"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Appliquer la résolution partielle"
@@ -26982,4 +27146,114 @@
 #~ msgstr "Erreur de communication avec le serveur"
 
+#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
+#~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
+
+#~ msgid "Adjust the position of the WMS layer (raster images only)"
+#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une "
+#~ "couche de données ?"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
+
+#~ msgid "API initialization failed"
+#~ 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 "No data"
+#~ msgstr "Aucune donnée"
+
+#~ 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 ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
+#~ "été trouvés."
+
+#~ 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}"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Il y a des modifications non sauvegardées dans {0} calque. Ignorer les "
+#~ "modifications et continuer ?"
+#~ msgstr[1] ""
+#~ "Il y a des modifications non sauvegardées dans {0} calques. Ignorer les "
+#~ "modifications et continuer ?"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert."
+
+#~ msgid "Close current changeset"
+#~ msgstr "Fermer ensemble de changements actuel"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer"
+
+#~ 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"
+
+#~ 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."
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr ""
+#~ "Utiliser la session de modification existante {0} et la conserver ouverte."
+
+#~ msgid "paramete''{0}'' must not be null"
+#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
+
+#~ msgid "not yet decided"
+#~ msgstr "Pas encore décidé."
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A>."
+
 #~ msgid ""
 #~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
@@ -26988,98 +27262,2 @@
 #~ "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A> ou <A "
 #~ "HREF=\"{1}\">French</A>."
-
-#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
-#~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
-
-#~ msgid "Adjust the position of the WMS layer (raster images only)"
-#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une "
-#~ "couche de données ?"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
-
-#~ msgid "API initialization failed"
-#~ 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 "No data"
-#~ msgstr "Aucune donnée"
-
-#~ 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 ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
-#~ "été trouvés."
-
-#~ 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}"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Fermer ensemble de changements actuel"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer"
-
-#~ 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"
-
-#~ 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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr ""
-#~ "Utiliser la session de modification existante {0} et la conserver ouverte."
-
-#~ msgid "paramete''{0}'' must not be null"
-#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
-
-#~ msgid "not yet decided"
-#~ msgstr "Pas encore décidé."
