Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 17822)
+++ applications/editors/josm/i18n/po/fr.po	(revision 17946)
@@ -6,6 +6,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 16:38+0200\n"
-"PO-Revision-Date: 2009-09-25 17:27+0000\n"
+"POT-Creation-Date: 2009-10-02 22:03+0200\n"
+"PO-Revision-Date: 2009-10-01 20:06+0000\n"
 "Last-Translator: François Blondel <Unknown>\n"
 "Language-Team: Fr <>\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n"
+"X-Launchpad-Export-Date: 2009-10-02 19:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -46,5 +46,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -89,9 +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:593
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -124,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -146,5 +146,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
@@ -338,5 +338,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
@@ -348,12 +348,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 #: ../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/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
@@ -375,5 +375,5 @@
 #: ../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/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
@@ -464,9 +464,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -501,6 +501,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -630,22 +630,22 @@
 msgstr "Téléchargement des ensembles de changements ouverts"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine Way"
 msgstr "Fusionner des chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 msgid "Combine several ways into one."
 msgstr "Fusionner plusieurs chemins en un seul."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Change directions?"
 msgstr "Changer les directions ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
 msgid "Reverse and Combine"
 msgstr "Inverser et fusionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -655,5 +655,5 @@
 "la même direction. En retourner certaines ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -663,10 +663,10 @@
 "une seule chaîne de nœuds)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Fusionner {0} voies"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
 msgid "Please select at least two ways to combine."
 msgstr "Veuillez sélectionner au moins deux chemins à fusionner."
@@ -713,5 +713,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
@@ -779,5 +779,5 @@
 #: ../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:144
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
 msgid "OK"
@@ -864,8 +864,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
@@ -901,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
@@ -971,5 +971,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -1060,18 +1060,18 @@
 msgstr "Fusionne le calque courant avec un autre calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
 msgid "Merge Nodes"
 msgstr "Fusionner les nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
 msgid "Merge nodes into the oldest one."
 msgstr "Fusionner les nœuds sur le plus ancien"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 msgid "Please select at least two nodes to merge."
 msgstr "Veuillez sélectionner au moins deux nœuds à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1079,5 +1079,5 @@
 "encore utilisé"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
 #, java-format
 msgid "Merge {0} nodes"
@@ -1261,5 +1261,5 @@
 "Appliquer les attributs de la mémoire tampon aux éléments sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
 #, java-format
 msgid "Pasting {0} tag"
@@ -1268,5 +1268,5 @@
 msgstr[1] "Collage des tags {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
 #, java-format
 msgid "to {0} primitive"
@@ -1925,7 +1925,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-#, fuzzy
 msgid "No data found in this area."
-msgstr "Pas de données sur le périphérique"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2207,55 +2206,55 @@
 msgstr "Impossible de rechercher car il n’y a pas de données chargées."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
 msgid "Please enter a filter string."
 msgstr "Veuillez entrer une chaine de caractère comme filtre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
 msgid "Please enter a search string."
 msgstr "Entrer le texte à rechercher."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "replace selection"
 msgstr "remplacer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
 msgid "add to selection"
 msgstr "ajouter à la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
 msgid "remove from selection"
 msgstr "supprimer de la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76
 msgid "find in selection"
 msgstr "trouver dans une selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
 msgid "case sensitive"
 msgstr "respecter la casse"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "regular expression"
 msgstr "expression régulière"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - 'Baker' et 'Street' dans n'importe quelle clé ou nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - 'Baker Street' dans n'importe quelle clé ou nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak'  n'importe où dans le nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - clé 'type' avec la valeur exacte 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2265,17 +2264,17 @@
 "<b>*=valeur</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - pas 'Bak' dans le nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot avec n'importe quelle valeur."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<u>Special targets:</u>"
 msgstr "<u>Options spéciales :</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2283,33 +2282,33 @@
 "<b>type:</b> - type de l'objet (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - tous les objets modifiés par l'utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id :</b>... - objet avec l'ID indiqué (0 pour les nouveaux objets)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - objet avec le nombre de nœuds spécifié"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tous les objets modifiés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tous les objets sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tous les objets incomplets"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tous les objets non étiquetés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2318,5 +2317,5 @@
 "l'expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2325,18 +2324,18 @@
 "l'expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Utilisez <b>|</b> ou <b>OR</b> pour combiner avec le OU logique"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Utilisez <b>\"</b> pour citer des opérateurs (i.e. si la clé contient :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilisez <b>(</b> et <b>)</b> pour grouper des expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2346,51 +2345,51 @@
 msgstr "Filtrez"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Chercher"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid "Start Search"
 msgstr "Commencer la recherche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Aucun résultat trouvé pour \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
-#, java-format
-msgid "Nothing find in selection by searching for ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#, fuzzy, java-format
+msgid "Nothing found in selection by searching for ''{0}''"
+msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} résultats trouvés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
 msgid "RX"
 msgstr "RX"
@@ -2668,10 +2667,8 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
-"Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus "
-"présent."
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
@@ -2719,5 +2716,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
@@ -2775,12 +2772,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
-#, fuzzy, java-format
+#, java-format
 msgid "Purged object ''{0}''"
-msgstr "Déplacer des objets {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} objects"
-msgstr "Changer {0} objet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
@@ -2794,7 +2791,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Removing reference from relation {0}"
-msgstr "suppression de la référence de la relation {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
@@ -3166,14 +3163,14 @@
 msgstr "Attention : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
 #, java-format
@@ -3181,5 +3178,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3540,7 +3537,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3582,7 +3577,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
-#, fuzzy
 msgid "Not Found"
-msgstr "Pas connecté"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155
@@ -3902,9 +3896,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289
 msgid "(no object)"
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416
 msgid "User:"
 msgstr "Utilisateur :"
@@ -4405,5 +4399,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
 msgid "deleted"
 msgstr "supprimé"
@@ -4506,5 +4500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4554,6 +4548,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4567,6 +4561,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4624,34 +4618,34 @@
 msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 #, java-format
 msgid "Conflicts when merging nodes - merged node is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
 msgid "No conflicts to resolve"
 msgstr "Pas de conflits à résoudre."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Annuler la résolution des conflits"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Appliquer les conflits résolus."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
@@ -4669,23 +4663,24 @@
 msgstr "all"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66
 msgid "Choose a value"
 msgstr "Choisir une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
-msgid "Please decided which values to keep"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
+#, fuzzy
+msgid "Please decide which values to keep"
 msgstr "Choisissez les valeurs à conserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr "La valeur ''{0}'' va être appliquée à la clé ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79
 #, java-format
 msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr "La clé \"{0}\" et toutes ses valeurs vont être supprimées."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
@@ -4729,7 +4724,27 @@
 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/conflict/tags/PasteTagsConflictResolverDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
+msgid "Paste ..."
+msgstr "Coller…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
+msgid "From ..."
+msgstr "De…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
+msgid "To ..."
+msgstr "Pour…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444
+#, 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/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4739,7 +4754,5 @@
 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/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4748,26 +4761,4 @@
 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
@@ -4836,4 +4827,16 @@
 msgstr "Décision"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42
+#, fuzzy
+msgid "<html>Please select the values to keep for the following tags.</html>"
+msgstr ""
+"<html>Veuillez sélectionner l'ensemble de changement que vous voulez fermer</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47
+#, fuzzy
+msgid "Show tags with conflicts only"
+msgstr "Nœuds (avec conflits)"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -4851,5 +4854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
@@ -4946,5 +4949,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
@@ -5100,6 +5103,6 @@
 msgstr "Informations à propos du calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
 #, java-format
 msgid "This will change up to {0} object."
@@ -5108,22 +5111,22 @@
 msgstr[1] "Cela modifiera {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
 msgid "An empty value deletes the key."
 msgstr "Une valeur vide supprime la clé."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../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/dialogs/PropertiesDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5132,70 +5135,70 @@
 msgstr[1] "Modifier les propriétés de {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
 msgid "Please select a key"
 msgstr "Veuillez sélectionner une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
 msgid "Please select a value"
 msgstr "Veuillez sélectionner une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Veuillez sélectionner les objets dont vous voulez changer les propriétés."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
 msgid "Properties for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
 msgid "Add Properties"
 msgstr "Ajouter des Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
 msgid "Edit Properties"
 msgstr "Éditer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
 msgid "Change relation"
 msgstr "Changer la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Supprimer vraiment la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
 msgid "Delete Properties"
 msgstr "Supprimer les propriétés"
@@ -5239,7 +5242,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440
-#, fuzzy
 msgid "Set the current selection to the list of selected relations"
-msgstr "éditer la relation sélectionnée"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5280,9 +5282,9 @@
 msgstr "Sélection : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307
 msgid "Undock the panel"
 msgstr "Détacher le panneau"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5291,5 +5293,5 @@
 "d'outils de gauche."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliquer pour minimiser/maximiser le contenu du panneau"
@@ -6736,5 +6738,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:67 build/trans_presets.java:103
 #: build/trans_presets.java:143 build/trans_presets.java:180
@@ -7127,7 +7129,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-#, fuzzy
 msgid "Save/Upload and Exit"
-msgstr "Enregistrer et quitter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7137,7 +7138,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
-#, fuzzy
 msgid "Save/Upload and Delete"
-msgstr "Sauvegarder et supprimer."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
@@ -7153,11 +7153,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
-#, fuzzy
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
 "cancelled or has 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
@@ -7361,5 +7358,5 @@
 #: ../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:627
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -7718,9 +7715,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict detected."
 msgid_plural "There were {0} conflicts detected."
-msgstr[0] "Il y a eu {0} conflits durant l'import."
-msgstr[1] "Il y a eu {0} conflits durant l'import."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
@@ -7736,7 +7733,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345
-#, fuzzy
 msgid "Conflicts detected"
-msgstr "Conflit détecté"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472
@@ -8098,5 +8094,5 @@
 msgstr "Calibration de l’enregistrement de la voix"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 msgid "Color"
 msgstr "Couleur"
@@ -9117,5 +9113,5 @@
 msgstr "Échec de l’analyse du fichier \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9306,19 +9302,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604
 msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -9801,7 +9797,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
-#, fuzzy, java-format
+#, java-format
 msgid "Parameter ''{0}'' must not be null"
-msgstr "le paramètre \"{0}\" ne doit pas être vide"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
@@ -10551,69 +10547,73 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -19571,5 +19571,5 @@
 #: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
-msgstr ""
+msgstr "№piste"
 
 #: build/trans_presets.java:1935
@@ -19923,5 +19923,5 @@
 #: build/trans_presets.java:2141
 msgid "Man-Made"
-msgstr "Artificial"
+msgstr "Artificiel"
 
 #. group "Man-Made"
@@ -20378,24 +20378,20 @@
 #. item "Man Made/Tower" text "Name"
 #: build/trans_presets.java:2296
-#, fuzzy
 msgid "Tower type"
-msgstr "Type de route"
+msgstr "Type de pylône"
 
 #. item "Man Made/Tower" combo "Tower type"
 #: build/trans_presets.java:2296
-#, fuzzy
 msgid "communication"
-msgstr "connexion"
+msgstr ""
 
 #: build/trans_presets.java:2296
-#, fuzzy
 msgid "observation"
-msgstr "Altitude"
+msgstr "observation"
 
 #. <optional>
 #: build/trans_presets.java:2298
-#, fuzzy
 msgid "Height (meters)"
-msgstr "Hauteur max. (mètres)"
+msgstr "Hauteur (mètres)"
 
 #. item "Man Made/Tower" text "Operator"
@@ -20455,7 +20451,6 @@
 
 #: build/trans_presets.java:2330
-#, fuzzy
 msgid "oil"
-msgstr "fossil"
+msgstr ""
 
 #: build/trans_presets.java:2330 build/trans_presets.java:2372
@@ -20464,27 +20459,22 @@
 
 #: build/trans_presets.java:2330
-#, fuzzy
 msgid "sewage"
-msgstr "usage"
+msgstr ""
 
 #: build/trans_presets.java:2330
-#, fuzzy
 msgid "heat"
-msgstr "lande/bruyère"
+msgstr ""
 
 #: build/trans_presets.java:2330
-#, fuzzy
 msgid "any substance"
-msgstr "A Par distance"
+msgstr ""
 
 #: build/trans_presets.java:2331
-#, fuzzy
 msgid "underwater"
-msgstr "eau"
+msgstr ""
 
 #: build/trans_presets.java:2331
-#, fuzzy
 msgid "overground"
-msgstr "souterrain"
+msgstr ""
 
 #: build/trans_presets.java:2333
@@ -20629,17 +20619,14 @@
 #. item "Man Made/Power Tower" combo "Type"
 #: build/trans_presets.java:2398
-#, fuzzy
 msgid "tower"
-msgstr "Structure de hauteur"
+msgstr "pylônes"
 
 #: build/trans_presets.java:2398
-#, fuzzy
 msgid "pole"
-msgstr "Rôle"
+msgstr ""
 
 #: build/trans_presets.java:2399
-#, fuzzy
 msgid "Tower reference"
-msgstr "Champ de vision"
+msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
@@ -20657,18 +20644,15 @@
 #. item "Man Made/Power Line" label "Edit Power Line"
 #: build/trans_presets.java:2405
-#, fuzzy
 msgid "Line type"
-msgstr "Type de piste"
+msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
 #: build/trans_presets.java:2405
-#, fuzzy
 msgid "line"
-msgstr "lié"
+msgstr "ligne"
 
 #: build/trans_presets.java:2405
-#, fuzzy
 msgid "minor_line"
-msgstr "motorway_link"
+msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
@@ -20679,5 +20663,4 @@
 #. item "Man Made/Power Line" text "Voltage"
 #: build/trans_presets.java:2409
-#, fuzzy
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
@@ -20686,26 +20669,22 @@
 #: build/trans_presets.java:2410
 msgid "Number of wires (better: conductors) per power cable"
-msgstr ""
+msgstr "Nombre de conducteurs par câbles"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
 #: build/trans_presets.java:2410
-#, fuzzy
 msgid "single"
-msgstr "Angle"
+msgstr "simple"
 
 #: build/trans_presets.java:2410
-#, fuzzy
 msgid "double"
-msgstr "Boules"
+msgstr "double"
 
 #: build/trans_presets.java:2410
-#, fuzzy
 msgid "triple"
-msgstr "Échalier"
+msgstr "triple"
 
 #: build/trans_presets.java:2410
-#, fuzzy
 msgid "quad"
-msgstr "quaker"
+msgstr "quadruple"
 
 #: build/trans_presets.java:2413
@@ -21654,5 +21633,5 @@
 #: build/trans_presets.java:2850
 msgid "Islet"
-msgstr ""
+msgstr "îlot"
 
 #. item
@@ -21660,5 +21639,5 @@
 #: build/trans_presets.java:2852
 msgid "Edit Islet"
-msgstr ""
+msgstr "Éditer l'îlot"
 
 #. item "Places/Islet" text "Name"
@@ -26600,10 +26579,129 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "Combine ways with different memberships?"
+#~ msgid "Move"
+#~ msgstr "Déplacer"
+
+#~ 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."
+#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extension de fichier inconnue."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Résoudre les conflits"
+
+#~ msgid "Object"
+#~ msgstr "Objet"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objet est conflictuel :"
+#~ msgstr[1] "{0} objets sont conflictuels :"
+
+#~ msgid "my version:"
+#~ msgstr "ma version :"
+
+#~ msgid "their version:"
+#~ msgstr "version du serveur :"
+
+#~ msgid "resolved version:"
+#~ msgstr "version choisie :"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contact du serveur OSM..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Version inconnue"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "différent"
+
+#~ msgid "true"
+#~ msgstr "vrai"
+
+#~ msgid "false"
+#~ msgstr "faux"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Résoudre {0} conflits dans {1} objets"
+
+#~ msgid "Change"
+#~ msgstr "Changer"
+
+#~ msgid "unnamed"
+#~ msgstr "sans-nom"
+
+#~ msgid "Validate"
+#~ msgstr "Valider"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
 #~ msgstr ""
-#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Fusionner quand même"
+#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous "
+#~ "avez obtenu JOSM."
+
+#~ msgid "Occupied By"
+#~ msgstr "Occupé par"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Impossible de se connecter au serveur."
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr ""
+#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
+
+#~ msgid "Metacarta Map Rectifier image id"
+#~ msgstr "Metacarta Map Rectifier image id"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "rectifier id={0}"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO·(GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO·(GNOME·Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO·(WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> n’a pas de ref"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
+#~ "données sur le serveur."
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
 
 #~ msgid ""
@@ -26614,141 +26712,7 @@
 #~ "Voulez-vous encore les fusionner ?"
 
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Suppression d’une primitive"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "suppression de la référence du chemin {0}"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Membre vide dans la relation."
-
-#~ msgid "Move"
-#~ msgstr "Déplacer"
-
-#~ 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."
-#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extension de fichier inconnue."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Résoudre les conflits"
-
-#~ msgid "Object"
-#~ msgstr "Objet"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objet est conflictuel :"
-#~ msgstr[1] "{0} objets sont conflictuels :"
-
-#~ msgid "my version:"
-#~ msgstr "ma version :"
-
-#~ msgid "their version:"
-#~ msgstr "version du serveur :"
-
-#~ msgid "resolved version:"
-#~ msgstr "version choisie :"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contact du serveur OSM..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Version inconnue"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "différent"
-
-#~ msgid "true"
-#~ msgstr "vrai"
-
-#~ msgid "false"
-#~ msgstr "faux"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Résoudre {0} conflits dans {1} objets"
-
-#~ msgid "Change"
-#~ msgstr "Changer"
-
-#~ msgid "unnamed"
-#~ msgstr "sans-nom"
-
-#~ msgid "Validate"
-#~ msgstr "Valider"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
+#~ msgid "Combine ways with different memberships?"
 #~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous "
-#~ "avez obtenu JOSM."
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupé par"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Impossible de se connecter au serveur."
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr ""
-#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier image id"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO·(GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO·(GNOME·Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO·(WebKit)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> n’a pas de ref"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
-#~ "données sur le serveur."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
+#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -26906,4 +26870,7 @@
 #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
 
+#~ msgid "Empty member in relation."
+#~ msgstr "Membre vide dans la relation."
+
 #~ msgid "User"
 #~ msgstr "Utilisateur"
@@ -27186,4 +27153,7 @@
 #~ "traces à être chargées vers OSM, par ex. en supprimant des parties "
 #~ "inintéressantes des traces."
+
+#~ msgid "Combine Anyway"
+#~ msgstr "Fusionner quand même"
 
 #~ msgid "All the ways were empty"
@@ -27315,4 +27285,7 @@
 #~ msgstr "Erreur de communication avec le serveur"
 
+#~ msgid "Purging 1 primitive"
+#~ msgstr "Suppression d’une primitive"
+
 #~ 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"
@@ -27320,4 +27293,7 @@
 #~ msgid "Adjust the position of the WMS layer (raster images only)"
 #~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)"
+
+#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
+#~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
 
 #~ msgid ""
@@ -27333,4 +27309,7 @@
 #~ msgid "API initialization failed"
 #~ msgstr "Échec d’initialisation de l’API"
+
+#~ msgid "removing reference from way {0}"
+#~ msgstr "suppression de la référence du chemin {0}"
 
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
