Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 18847)
+++ applications/editors/josm/i18n/po/fr.po	(revision 18863)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 13:30+0100\n"
-"PO-Revision-Date: 2009-11-28 21:49+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-11-29 16:20+0100\n"
+"PO-Revision-Date: 2009-11-29 16:45+0000\n"
+"Last-Translator: François Blondel <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-11-29 12:13+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -73,5 +73,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
@@ -107,5 +107,6 @@
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
-"<html>Impossible de lire le fichier « {0} ».<br> L’erreur est : <br>{1}</html>"
+"<html>Impossible de lire le fichier « {0} ».<br> L’erreur est : "
+"<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:464
@@ -141,5 +142,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -338,5 +339,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -383,6 +384,6 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
+"to.</html>"
 msgstr ""
 "<html>Il n’y a pas de calque vers lequel <br>\"{0}\"</br> le calque source "
@@ -450,22 +451,18 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225
-#, fuzzy
 msgid "Please enter a valid latitude in the range -90..90"
-msgstr "Veuillez entrer une chaine de caractère comme filtre."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228
-#, fuzzy
 msgid "Please enter a latitude in the range -90..90"
-msgstr "Veuillez entrer une chaine de caractère comme filtre."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236
-#, fuzzy
 msgid "Please enter a valid longitude in the range -180..180"
-msgstr "Veuillez entrer une chaine de caractère comme filtre."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239
-#, fuzzy
 msgid "Please enter a longitude in the range -180..180"
-msgstr "Veuillez entrer une chaine de caractère comme filtre."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275
@@ -474,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
@@ -487,12 +484,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276
-#, fuzzy
 msgid "Close the dialog and create a new node"
-msgstr "Fermer cette fenêtre et annuler le téléchargement"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289
-#, fuzzy
 msgid "Close the dialog, don't create a new node"
-msgstr "Il a été demandé à Remote Control de créer un nouveau nœud."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
@@ -621,6 +616,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
 #, java-format
 msgid "View: {0}"
@@ -795,5 +790,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
-msgstr "Distribue les nœuds sélectionnés à égale distance le long d'une ligne."
+msgstr ""
+"Distribue les nœuds sélectionnés à égale distance le long d'une ligne."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
@@ -906,14 +902,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
 msgid "Fullscreen View"
-msgstr ""
+msgstr "Vue plein-écran"
 
 #. no icon
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
 msgid "Toggle fullscreen view"
-msgstr ""
+msgstr "Bascule en vue plein écran"
 
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle Fullscreen view"
-msgstr ""
+msgstr "Bascule en vue plein écran"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -1041,5 +1037,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Affiche les informations à propos des nœuds, chemins ou relations OSM."
+msgstr ""
+"Affiche les informations à propos des nœuds, chemins ou relations OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -1284,7 +1281,7 @@
 msgstr ""
 "Vous utilisez la projection EPSG:4326 qui pourrait conduire<br> à "
-"d'indésirables résultats en faisant des alignements rectangulaires."
-"<br>Changez votre projection pour supprimer cet avertissement.<br>Voulez-"
-"vous continuer ?</html>"
+"d'indésirables résultats en faisant des alignements "
+"rectangulaires.<br>Changez votre projection pour supprimer cet "
+"avertissement.<br>Voulez-vous continuer ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
@@ -1479,5 +1476,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Affiche le rapport de statut avec des informations utiles pouvant être "
@@ -1516,5 +1514,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:91
 msgid "The current selection cannot be used for splitting."
-msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin."
+msgstr ""
+"La sélection actuelle ne peut pas être utilisée pour couper un chemin."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
@@ -1636,5 +1635,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou"
 
@@ -1648,5 +1648,6 @@
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
-msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin."
+msgstr ""
+"* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
@@ -1715,7 +1716,7 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
 msgid "Download data"
 msgstr "Télécharger les données."
@@ -1815,8 +1816,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>L’envoi <strong>a échoué</strong> car le serveur a une version plus "
@@ -1824,8 +1826,8 @@
 "de <strong>{0}</strong> d’id <strong>{1}</strong>,<br>le serveur a la "
 "version {2}, votre version est la {3}.<br><br>Cliquez <strong>{4}</strong> "
-"pour synchroniser uniquement la primitive en conflit.<br>Cliquez <strong>{5}"
-"</strong> pour synchroniser le jeu de données local entièrement avec le "
-"serveur.<br>Cliquez <strong>{6}</strong> pour annuler et continuer l’édition."
-"<br></html>"
+"pour synchroniser uniquement la primitive en conflit.<br>Cliquez "
+"<strong>{5}</strong> pour synchroniser le jeu de données local entièrement "
+"avec le serveur.<br>Cliquez <strong>{6}</strong> pour annuler et continuer "
+"l’édition.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
@@ -1839,13 +1841,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>L’envoi <strong>a échoué</strong> car le serveur aune version plus "
-"récente de l’un de vos nœuds, chemins ou relations.<br><br>Cliquez <strong>"
-"{0}</strong> pour synchroniser l’ensemble de votre jeu de données local."
-"<br>Cliquez <strong>{1}</strong> pour annuler et continuer l’édition.<br></"
-"html>"
+"récente de l’un de vos nœuds, chemins ou relations.<br><br>Cliquez "
+"<strong>{0}</strong> pour synchroniser l’ensemble de votre jeu de données "
+"local.<br>Cliquez <strong>{1}</strong> pour annuler et continuer "
+"l’édition.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
@@ -1908,5 +1911,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611
 #, java-format
@@ -1928,5 +1931,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -1966,11 +1970,16 @@
 msgstr "Bascule vers l'affichage de la grille"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#. make numpad + behave like + (action is already registred)
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
+#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zoom arrière"
@@ -2110,13 +2119,13 @@
 "deleted on the server. If you later try to delete or<br>update them the "
 "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
+"to check the state of these primitives<br>on the server.<br>Click "
+"<strong>{2}</strong> to ignore.<br></html>"
 msgstr ""
 "<html>Il y a {0} primitives dans votre jeu de données local qui<br>semblent "
 "supprimées du serveur. Si vous tentez ultérieurement de les supprimer "
-"ou<br>de les mettre à jour, le serveur retournera probablement un<br>conflit."
-"<br><br>Cliquez sur <strong>{1}</strong> pour vérifier l’état de ces "
-"primitives<br>sur le serveur.<br>Cliquez sur <strong>{2}</strong> pour "
-"ignorer.<br></html>"
+"ou<br>de les mettre à jour, le serveur retournera probablement "
+"un<br>conflit.<br><br>Cliquez sur <strong>{1}</strong> pour vérifier l’état "
+"de ces primitives<br>sur le serveur.<br>Cliquez sur <strong>{2}</strong> "
+"pour ignorer.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
@@ -2272,6 +2281,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
+"Drag play head and release near track to play audio from there; "
+"SHIFT+release to synchronize audio at that point."
 msgstr ""
 "Déplacer le curseur de lecture et le relacher à côté de la trace pour lire "
@@ -2381,5 +2390,5 @@
 
 #. -- prepare the combo box with the search expressions
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
 msgid "Please enter a filter string."
@@ -2468,5 +2477,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 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)"
+msgstr ""
+"<b>id :</b>... - objet avec l'ID indiqué (0 pour les nouveaux objets)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
@@ -2694,6 +2704,6 @@
 "{0}, max is {1}"
 msgstr ""
-"Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
-"courant : {0}, maximum : {1}"
+"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
@@ -2938,7 +2948,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
 msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have "
+"downloaded.<br>This can cause problems because other objects (that you don't "
+"see) might use them.<br>Do you really want to delete?"
 msgstr ""
 "Vous êtes sur le point de supprimer des nœuds en dehors de la zone "
@@ -3011,5 +3021,6 @@
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''"
+msgstr ""
+"Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
@@ -3220,6 +3231,6 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to "
+"<br>{0}<br> and creating a new default preference file.</html>"
 msgstr ""
 "<html>Le fichier des préférences a des erreurs.<br> Création d'une "
@@ -3305,5 +3316,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3312,5 +3323,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3385,5 +3396,5 @@
 
 #. should not happen
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254
 #, java-format
@@ -3532,5 +3543,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114
 #, java-format
-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 ""
 
@@ -3686,5 +3698,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
 msgid_plural "nodes"
@@ -3694,5 +3706,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
 msgid_plural "ways"
@@ -3703,5 +3715,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
 msgid_plural "relations"
@@ -3765,5 +3777,5 @@
 #, java-format
 msgid "{0} (Corsica)"
-msgstr ""
+msgstr "{0} (Corse)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260
@@ -3786,18 +3798,18 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62
 msgid "PUWG (Poland)"
-msgstr ""
+msgstr "PUWG (Pologne)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:100
 msgid "PUWG Zone"
-msgstr ""
+msgstr "PUWG Zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:160
 msgid "PUWG 1992 (Poland)"
-msgstr ""
+msgstr "PUWG 1992 (Pologne)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:213
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr ""
+msgstr "PUWG 2000 Zone {0} (Pologne)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
@@ -3807,25 +3819,25 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351
 msgid "UTM"
-msgstr ""
+msgstr "UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:392
 msgid "UTM Zone"
-msgstr ""
+msgstr "Zone UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
 msgid "Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26
 msgid "Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27
 msgid "Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:386
 msgid "UTM 20N (France)"
-msgstr ""
+msgstr "UTM 20N (France)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:398
@@ -3835,5 +3847,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3849,5 +3862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
 msgid " [id: {0}]"
@@ -3954,5 +3967,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 msgid "Click to close the dialog"
-msgstr ""
+msgstr "Cliquer pour fermer la boîte de dialogue."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4003,6 +4016,6 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"Télécharger comme données GPS brutes. Peut être sous la forme x1,y1,x2,"
-"y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier."
+"Télécharger comme données GPS brutes. Peut être sous la forme "
+"x1,y1,x2,y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -4370,5 +4383,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4377,5 +4390,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
@@ -4384,5 +4397,5 @@
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
@@ -4550,5 +4563,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr "Liste des éléments de leur jeu de données, i.e. les données du serveur"
+msgstr ""
+"Liste des éléments de leur jeu de données, i.e. les données du serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
@@ -4558,5 +4572,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
 msgid "Copy my selected nodes to the start of the merged node list"
-msgstr "Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés"
+msgstr ""
+"Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
@@ -4593,5 +4608,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
-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 "
@@ -4643,5 +4659,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
 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"
+msgstr ""
+"Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
@@ -4666,6 +4683,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 "
@@ -4675,6 +4692,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
-"html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
 msgstr ""
 "<html>Clicquer <strong>{0}</strong> pour arrêter la fusion de leurs éléments "
@@ -4735,6 +4752,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
+"<html>An error occurred while communicating with the server<br>Details: "
+"{0}</html>"
 msgstr ""
 "<html>Une erreur est survenue durant la communication avec le "
@@ -4771,11 +4788,11 @@
 #, java-format
 msgid ""
-"<html>There are {0} additional primitives referred to by relation {1}"
-"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
-"</html>"
+"<html>There are {0} additional primitives referred to by relation "
+"{1}<br>which are deleted on the server.<br><br>Do you want to undelete them "
+"too?</html>"
 msgstr ""
 "<html>Il y a {0} primitives référencées dans la relation {1}<br>qui sont "
-"supprimées sur le serveur.<br><br>Voulez-vous les restaurer également ?</"
-"html>"
+"supprimées sur le serveur.<br><br>Voulez-vous les restaurer également "
+"?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
@@ -5357,9 +5374,10 @@
 #, java-format
 msgid ""
-"<html>You didn''t finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You didn''t finish to merge the differences in this "
+"conflict.<br>Conflict resolutions won't be applied unless all "
+"differences<br>are resolved.Click <strong>{0}</strong> to close "
+"anyway.<strong>Already<br>resolved differences won't be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5457,5 +5475,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
 msgid "Reload all currently selected objects and refresh the list."
-msgstr "Recharger les objets actuellement sélectionnés et rafraîchir la liste."
+msgstr ""
+"Recharger les objets actuellement sélectionnés et rafraîchir la liste."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
@@ -5859,6 +5878,6 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is discouraged."
-"<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is "
+"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>Il y a au moins un membre de cette relation qui réfère<br>à la "
@@ -5880,6 +5899,6 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
-"html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation "
+"member?</html>"
 msgstr ""
 
@@ -6019,6 +6038,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -6041,5 +6061,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
 msgid "Download all incomplete ways and nodes in relation"
-msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation"
+msgstr ""
+"Télécharger tous les chemins et les nœuds incomplets dans la relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
@@ -6084,9 +6105,9 @@
 
 #. download the relation
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427
 #, java-format
 msgid "Downloading relation ''{0}''"
-msgstr ""
+msgstr "Téléchargement de la relation ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190
@@ -6163,13 +6184,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr ""
+msgstr "Charger la relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid "Warning: ignoring exception because task was cancelled. Exception was: "
+msgid ""
+"Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr ""
+msgstr "le chemin est connecté"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
@@ -6226,5 +6248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
 msgid "Name of location"
-msgstr ""
+msgstr "Nom du lieu"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
@@ -6324,5 +6346,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "No area selected yet"
-msgstr ""
+msgstr "Pas de zone sélectionnée actuellement"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
@@ -6353,6 +6375,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -6363,5 +6386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
 msgid "Enter a place name to search for"
-msgstr ""
+msgstr "Enter le nom d'un lieu à rechercher"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6377,5 +6400,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255
 msgid "Search ..."
-msgstr ""
+msgstr "Chercher…"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257
@@ -7126,5 +7149,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7310,5 +7333,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410
 msgid "Near"
-msgstr ""
+msgstr "Près"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
@@ -7355,5 +7378,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
 msgid "JOSM Help Browser"
-msgstr ""
+msgstr "Navigateur d'aide de JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188
@@ -7365,6 +7388,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information.You can both edit the <a href=\"{2}\">help topic in your "
-"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
-"p></html>"
+"local language ({1})</a> and the <a href=\"{3}\">help topic in "
+"english</a>.</p></html>"
 msgstr ""
 
@@ -7374,6 +7397,6 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
-"p></html>"
+"could not be loaded. The error message is "
+"(untranslated):<br><tt>{1}</tt></p></html>"
 msgstr ""
 
@@ -7387,5 +7410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317
 msgid "Failed to open URL"
-msgstr ""
+msgstr "Impossible d'ouvrir l'URL"
 
 #. putValue(NAME, tr("Open in Browser"));
@@ -7409,15 +7432,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392
 msgid "Reload the current help page"
-msgstr ""
+msgstr "Recharger la page actuelle"
 
 #. putValue(NAME, tr("Back"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407
 msgid "Go to the previous page"
-msgstr ""
+msgstr "Aller à la page précédante"
 
 #. putValue(NAME, tr("Forward"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427
 msgid "Go to the next page"
-msgstr ""
+msgstr "Aller à la page suivante"
 
 #. putValue(NAME, tr("Home"));
@@ -7432,9 +7455,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
 msgid "Failed to open help page. The target URL is empty."
-msgstr ""
+msgstr "Impossible d'ouvrir la page d'aide. L'URL cible est vide."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
 msgid "Failed to open help page"
-msgstr ""
+msgstr "Impossible d'ouvrir la page d'aide."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
@@ -7448,13 +7471,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
 msgid "Latitude: "
-msgstr ""
+msgstr "Latitude: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
 msgid "Longitude: "
-msgstr ""
+msgstr "Longitude: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
 msgid "Coordinates"
-msgstr ""
+msgstr "Coordonées"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
@@ -7559,5 +7582,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
 msgid "Zoom to node"
-msgstr ""
+msgstr "Zoomer sur le nœud"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
@@ -7567,5 +7590,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
 msgid "Show history"
-msgstr ""
+msgstr "Montrer l'historique"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
@@ -7594,5 +7617,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
-msgstr ""
+msgstr "Ensemble de changement"
 
 #. item "Ways/Cycleway" combo "Pedestrians"
@@ -7675,5 +7698,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
 msgid "[deleted]"
-msgstr ""
+msgstr "[supprimé]"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
@@ -7705,6 +7728,6 @@
 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>"
+"<html>Veuillez sélectionner l'ensemble de changement que vous voulez "
+"fermer</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
@@ -7754,5 +7777,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -7832,6 +7856,6 @@
 msgstr[1] ""
 "<html>Les calques {0} comportent des conflits non résolus.<br>Résolvez-les "
-"ou abandonnez les modifications.<br>Calques qui comportent des conflits :</"
-"html>"
+"ou abandonnez les modifications.<br>Calques qui comportent des conflits "
+":</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
@@ -7846,6 +7870,6 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a file:</"
-"html>"
+"file for each of them or discard the changes.<br>Layers without a "
+"file:</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -7859,6 +7883,6 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which can't be "
-"written.<br>Either select another file for this layer or discard the changes."
-"<br>Layer with a non-writable file:</html>"
+"written.<br>Either select another file for this layer or discard the "
+"changes.<br>Layer with a non-writable file:</html>"
 msgid_plural ""
 "<html>{0} layers need saving but have associated files<br>which can't be "
@@ -8141,5 +8165,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
 #, java-format
@@ -8173,9 +8197,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
 msgid "Cancel uploading"
-msgstr ""
+msgstr "Annuler l'envoi."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
 msgid "Continue uploading"
-msgstr ""
+msgstr "Continuer à envoyer."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
@@ -8249,5 +8273,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -8285,5 +8309,5 @@
 msgstr "La date indiquée ne peut être analysée."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
@@ -8291,30 +8315,30 @@
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:129
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 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:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
@@ -8322,5 +8346,5 @@
 msgstr "Personnaliser la couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -8329,5 +8353,5 @@
 msgstr "Par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
@@ -8336,31 +8360,52 @@
 msgstr "Choisir une couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:191
 msgid "Markers From Named Points"
 msgstr "Marqueurs depuis des points nommés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Points de parcours nommés depuis {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
 msgid "Import Audio"
 msgstr "Importer Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points don''t include a timestamp we can''t "
+"correlate them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:247
 msgid "Wave Audio files (*.wav)"
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:283
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points don''t include a timestamp we can''t "
+"correlate them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
@@ -8368,5 +8413,5 @@
 msgstr "Nom : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -8374,5 +8419,5 @@
 msgstr "Description : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388
 #, java-format
 msgid "{0} track"
@@ -8382,5 +8427,5 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
 #: build/trans_presets.java:3190
@@ -8388,22 +8433,22 @@
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 msgid "Length"
 msgstr "Longueur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Longueur : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -8412,5 +8457,5 @@
 msgstr[1] "{0} chemins, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -8419,13 +8464,13 @@
 msgstr[1] "{0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>L’envoi de données GPS non mises en forme comme données<br>sur la "
@@ -8433,10 +8478,10 @@
 "regardez ici :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
@@ -8447,29 +8492,29 @@
 msgstr "Converti depuis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
 msgid "Download from OSM along this track"
 msgstr "Télécharger depuis OSM le long de cette trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 #, java-format
 msgid "{0} meters"
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
 #, java-format
 msgid ""
@@ -8480,5 +8525,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -8486,5 +8531,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8494,5 +8539,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8590,5 +8635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730
 msgid "No problems found"
-msgstr ""
+msgstr "Pas de problème trouvé."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
@@ -8598,6 +8643,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:</html>"
 msgstr ""
 
@@ -8858,5 +8903,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
 msgid "When importing audio, make markers from..."
-msgstr "Lors de l’import de fichiers audio, faire des marqueurs à partir de :"
+msgstr ""
+"Lors de l’import de fichiers audio, faire des marqueurs à partir de :"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
@@ -8898,5 +8944,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Quantité par laquelle la vitesse est multipliée pour l’avance rapide."
+msgstr ""
+"Quantité par laquelle la vitesse est multipliée pour l’avance rapide."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
@@ -9167,5 +9214,6 @@
 #. drawGpsArrowsFast
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
-msgid "Draw the direction arrows using table lookups instead of complex math."
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Dessiner les flèches de direction en utilisant un aperçu des données plutôt "
@@ -9233,5 +9281,6 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Appliquer un lissage des dessins de la carte."
 
@@ -9376,5 +9425,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
-msgstr ""
+msgstr "URL de description du greffon JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
@@ -9420,5 +9469,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
+msgstr ""
+"Vous devez redémarrer JOSM pour que certains réglages prennent effet."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79
@@ -9578,6 +9628,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources from<br>''{0}''."
-"<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources "
+"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 
@@ -9642,6 +9692,6 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes here."
-"</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes "
+"here.</p>"
 msgstr ""
 "<p>De plus, les raccourcis sont activés lorsque les actions sont assignées à "
@@ -9660,8 +9710,9 @@
 "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
 "there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/"
-"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not "
-"doing so may result in conflicts, as there is no way for JOSM to know that "
-"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...</p>"
+"(e.g. ':'/Colon). Please also do not use them, use the base key "
+"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
+"instead. Not doing so may result in conflicts, as there is no way for JOSM "
+"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
+"keyboard...</p>"
 msgstr ""
 "<p>Vous pouvez remarquer que la liste de sélection des clés sur la page "
@@ -9700,6 +9751,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
-"</p>"
+"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
+"encountered.</p>"
 msgstr "<p>Le pseudo-modifieur 'désactivé' désactivera le raccourci.</p>"
 
@@ -10008,5 +10059,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115
 #, 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 "
@@ -10331,7 +10383,7 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
+"<html>WARNING: The password is stored in plain text in the preferences "
+"file.<br>The password is transferred in plain text to the server, encoded in "
+"the URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>ATTENTION : Le mot de passe est stocké en texte clair dans le fichier "
@@ -10362,9 +10414,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
-msgstr ""
-"<html>Une erreur est survenue lors du chargement d'une sauvegarde."
-"<br>L'erreur est : <br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error "
+"is:<br>{0}</html>"
+msgstr ""
+"<html>Une erreur est survenue lors du chargement d'une "
+"sauvegarde.<br>L'erreur est : <br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113
@@ -10413,5 +10465,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
 msgid "<anonymous>"
-msgstr ""
+msgstr "<anonyme>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
@@ -10440,6 +10492,6 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Missing manadatory attributes on element ''bounds''. Got "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
@@ -10469,5 +10521,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -10568,5 +10621,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
-msgstr ""
+msgstr "Préparation des données d'OSM"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
@@ -10581,5 +10634,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr ""
+msgstr "Téléchargement depuis les serveurs OSM…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -10593,9 +10646,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Lecture des ensembles de changement…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "téléchargement des ensembles de changement…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
@@ -10640,5 +10693,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
 msgid "XML tag <user> is missing."
-msgstr ""
+msgstr "Le tag XML <user> est manquant."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
@@ -10683,5 +10736,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 msgid "Uploading data ..."
-msgstr ""
+msgstr "Envoi des données…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148
@@ -10723,6 +10776,6 @@
 msgid "{0} Plugin successfully downloaded."
 msgid_plural "{0} Plugins successfully downloaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Greffon chargé avec succès."
+msgstr[1] "{0} Greffons chargés avec succès."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10759,6 +10812,8 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
-msgid "Loading of {0} plugin was requested. This plugin is no longer required."
-msgstr ""
+msgid ""
+"Loading of {0} plugin was requested. This plugin is no longer required."
+msgstr ""
+"Le chargement du greffon {0} a été demandé. Ce greffon n'est plus nécessaire."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
@@ -10766,6 +10821,6 @@
 msgid ""
 "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-"developed and very likely will produce errors.<br>It should be disabled."
-"<br>Delete from preferences?</html>"
+"developed and very likely will produce errors.<br>It should be "
+"disabled.<br>Delete from preferences?</html>"
 msgstr ""
 
@@ -10785,9 +10840,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
 msgid "Update plugins"
-msgstr ""
+msgstr "Mettre à jour les greffons."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
 msgid "Skip update"
-msgstr ""
+msgstr "Passer la mise à jour."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
@@ -10799,5 +10854,6 @@
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
-msgstr "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
+msgstr ""
+"Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
@@ -10992,6 +11048,6 @@
 "<html><p>There the the error information provided below should already "
 "be<br>filled out for you. Please include information on how to "
-"reproduce<br>the error and try to supply as much detail as possible.</p></"
-"html>"
+"reproduce<br>the error and try to supply as much detail as "
+"possible.</p></html>"
 msgstr ""
 
@@ -11029,6 +11085,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
+"current<br>dataset violates a precondition.<br>The error message "
+"is:<br>{0}</html>"
 msgstr ""
 "<html>L’envoi vers le serveur <strong>a échoué</strong> car votre jeu "
@@ -11059,5 +11115,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
 msgid "<html>The server reported that it has detected a conflict.</html>"
-msgstr ""
+msgstr "<html>Le serveur à détecté un conflit.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
@@ -11095,10 +11151,11 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
-msgstr ""
-"<html>Le serveur OSM<br>''{0}''<br>a rapporté une erreur interne du serveur."
-"<br>Il s'agit probablement d'un problème temporaire. Veuillez réessayer plus "
-"tard.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
+msgstr ""
+"<html>Le serveur OSM<br>''{0}''<br>a rapporté une erreur interne du "
+"serveur.<br>Il s'agit probablement d'un problème temporaire. Veuillez "
+"réessayer plus tard.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
@@ -11109,7 +11166,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 msgid ""
-"The area you tried to download is too big or your request was too large."
-"<br>Either request a smaller area or use an export file provided by the OSM "
-"community."
+"The area you tried to download is too big or your request was too "
+"large.<br>Either request a smaller area or use an export file provided by "
+"the OSM community."
 msgstr ""
 
@@ -11141,22 +11198,20 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-#, fuzzy
 msgid "Loading available locales..."
-msgstr "Configurer les greffons disponibles."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-#, fuzzy
 msgid "Checking locales..."
-msgstr "Vérification du cache..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, fuzzy, java-format
+#, java-format
 msgid "Checking translation for locale ''{0}''"
-msgstr "Créer une nouvelle relation dans la couche \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
@@ -11441,5 +11496,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
-msgstr ""
+msgstr "Alphabétique"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
@@ -11471,17 +11526,17 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
-msgstr ""
+msgstr "Ville :"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
-msgstr ""
+msgstr "État :"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
-msgstr ""
+msgstr "Code postal :"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
-msgstr ""
+msgstr "Pays :"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
@@ -11599,5 +11654,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126
 msgid "One of the selected files was null"
-msgstr ""
+msgstr "Un des fichiers sélectionnés était vide."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:132
@@ -11665,7 +11720,7 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the time."
-"<br>Display that photo here.<br>And then, simply capture the time you read "
-"on the photo and select a timezone<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the "
+"time.<br>Display that photo here.<br>And then, simply capture the time you "
+"read on the photo and select a timezone<hr></html>"
 msgstr ""
 "<html>Prenez une photo de votre GPS quand il affiche l’heure.<br>Affichez "
@@ -11735,8 +11790,9 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
-msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-msgstr ""
-"<html>Je peux prendre un autre phot de mon GPS.<br>Cela peut-il aider ?</"
-"html>"
+msgid ""
+"<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+msgstr ""
+"<html>Je peux prendre un autre phot de mon GPS.<br>Cela peut-il aider "
+"?</html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
@@ -12049,14 +12105,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"Une prise en charge du WMS du cadastre français à l'adresse www.cadastre."
-"gouv.fr<BR><BR>Merci de lire les conditions d'utilisation ici : <br><a href="
-"\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
+msgstr ""
+"Une prise en charge du WMS du cadastre français à l'adresse "
+"www.cadastre.gouv.fr<BR><BR>Merci de lire les conditions d'utilisation ici : "
+"<br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
 "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
 "<BR>avant tout chargement de données créé à partir de ce greffon."
@@ -12180,5 +12239,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr "Veuillez activer l'auto-sourcing et vérifier le millésime du cadastre."
+msgstr ""
+"Veuillez activer l'auto-sourcing et vérifier le millésime du cadastre."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
@@ -12381,5 +12441,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
-msgstr ""
+msgstr "Fichiers PNG (*.png)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45
@@ -12659,5 +12719,6 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
 msgid "Disable data logging if distance falls below"
-msgstr "Désactiver l'enregistrement des données si la distance est de moins de"
+msgstr ""
+"Désactiver l'enregistrement des données si la distance est de moins de"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
@@ -12731,6 +12792,6 @@
 msgstr ""
 "Imoossible de lire la bibliothèque rxtxSerial. Si vous avez besoin d’aide "
-"pour l’installer, essayez la page d’accueil deGlobalsat sur http://www."
-"raphael-mack.de/josm-globalsat-gpx-import-plugin/"
+"pour l’installer, essayez la page d’accueil deGlobalsat sur "
+"http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105
@@ -12875,5 +12936,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:187
 msgid "Running vertex reduction..."
@@ -12935,7 +12996,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -12945,5 +13006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -12953,5 +13014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="drain"/>
@@ -12960,5 +13021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -12968,5 +13029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -13044,5 +13105,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Nombre maximum de segments autorisés dans chaque chemin généré (250 par "
@@ -13068,6 +13130,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Précision de la simplification des lignes par la méthode Douglas-Peucker, en "
@@ -13279,5 +13342,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 msgid "Michigan Left"
-msgstr ""
+msgstr "Michigan Left"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
@@ -13291,5 +13354,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65
 msgid "Please select 4 ways that form a closed relation."
-msgstr ""
+msgstr "Veuillez sélectionner 4 chemin qui forment une relation fermée."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
@@ -13300,5 +13363,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:183
 msgid "Create Michigan left turn restriction"
-msgstr ""
+msgstr "Créer une \"Michigan left turn restriction\""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:140
@@ -13321,12 +13384,13 @@
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
+"Un des chemins sélectionné fait déjà partie d'un autre multipolygone."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
-msgstr ""
+msgstr "Les Multipolygones doivent contenir seulement des chemin fermés."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
-msgstr ""
+msgstr "Vous devez sélectionner au moins deux chemins."
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -13348,7 +13412,8 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>Le greffon openstreetbugs utilise l’ancien serveur sur appspot.com."
-"<br>Un nouveau serveur est disponible sur schokokeks.org.<br>Voulez-vous "
-"passer au nouveau serveur ? (fortement recommandé)"
+"<html>Le greffon openstreetbugs utilise l’ancien serveur sur "
+"appspot.com.<br>Un nouveau serveur est disponible sur "
+"schokokeks.org.<br>Voulez-vous passer au nouveau serveur ? (fortement "
+"recommandé)"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
@@ -13361,7 +13426,7 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
-"<html>Les données sélectionnées contiennent des données de OpenStreetBugs."
-"<br>Vous ne pouvez pas téléverser ces données. Peut-être avez-vous "
-"sélectionné le mauvais calque ?"
+"<html>Les données sélectionnées contiennent des données de "
+"OpenStreetBugs.<br>Vous ne pouvez pas téléverser ces données. Peut-être avez-"
+"vous sélectionné le mauvais calque ?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -13377,5 +13442,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "L'en-tête contient plusieurs valeurs et ne peut être mappés en un seul Mot"
@@ -13535,5 +13601,6 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
-msgstr "Il a été demandé à Remote Control de charger les données depuis l'API."
+msgstr ""
+"Il a été demandé à Remote Control de charger les données depuis l'API."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
@@ -13658,5 +13725,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148
 msgid "Auto Zoom"
-msgstr ""
+msgstr "Zoom automatique"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157
@@ -14122,5 +14189,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use the error layer to display problematic elements."
-msgstr "Utiliser le calque d’erreur pour montrer les éléments problématiques."
+msgstr ""
+"Utiliser le calque d’erreur pour montrer les éléments problématiques."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
@@ -14564,6 +14632,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 "Les sources (URL ou nom de fichier) du vérificateur orthographique (voir "
@@ -14713,5 +14782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -14719,5 +14788,5 @@
 #. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -14727,5 +14796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -14734,5 +14803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -14741,5 +14810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -14748,5 +14817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -14755,5 +14824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -14762,9 +14831,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building" b="yes"/>
@@ -14809,5 +14878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -14862,5 +14931,6 @@
 #: ../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 attribut, vides ou avec un seul nœud."
+msgstr ""
+"Ce test vérifie les chemins sans attribut, vides ou avec un seul nœud."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
@@ -14947,10 +15017,10 @@
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr ""
+msgstr "Walking Papers"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
 msgid "Way Download"
-msgstr ""
+msgstr "Téléchargement de chemin"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
@@ -14993,5 +15063,5 @@
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195
 msgid "Merge duplicate node?"
-msgstr ""
+msgstr "Fusionner les nœuds dupliqués ?"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
@@ -15002,5 +15072,5 @@
 #, java-format
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
-msgstr ""
+msgstr "Le nœud ''{0}'' est une jonction avec plus de 2 chemins connectés."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
@@ -15089,6 +15159,6 @@
 "or a trailing '?'."
 msgstr ""
-"Attention : l’adresse du service WMS « {0} » ne se finit ni par « & », ni par "
-"« ? »."
+"Attention : l’adresse du service WMS « {0} » ne se finit ni par « & », ni "
+"par « ? »."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116
@@ -15284,5 +15354,5 @@
 #. This file can be used to add some special messages to the translation,
 #. which are not part of the programm texts, but should be translated nevertheless.
-#.
+#. 
 #: build/specialmessages.java:6
 msgid ""
@@ -15400,5 +15470,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 "Téléchargez les points GPS depuis un système d'enregistrement Globalsat "
@@ -15526,6 +15597,6 @@
 msgstr ""
 "Permet de faire un rendu des routes (bus, chemins de randonnées, itinéraires "
-"cyclables…). Les types de routes doivent être défini dans le fichier routes."
-"xml, dans le dossier du greffon."
+"cyclables…). Les types de routes doivent être défini dans le fichier "
+"routes.xml, dans le dossier du greffon."
 
 #. Plugin routing
@@ -15546,5 +15617,6 @@
 #: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr "Permet d'ajouter des marqueurs/points sur les positions GPS courantes."
+msgstr ""
+"Permet d'ajouter des marqueurs/points sur les positions GPS courantes."
 
 #. Plugin tageditor
@@ -15594,6 +15666,7 @@
 "plugin is still under early development and may be buggy."
 msgstr ""
-"Permet le téléchargement de cartes scannée et tuilées depuis walking-papers."
-"org. Ce plugin est encore en développement et pourrait contenir des bugs"
+"Permet le téléchargement de cartes scannée et tuilées depuis walking-"
+"papers.org. Ce plugin est encore en développement et pourrait contenir des "
+"bugs"
 
 #. Plugin waydownloader
@@ -15607,6 +15680,6 @@
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
 msgstr ""
-"Affiche des images géo-référencées en fond d'écran (serveurs WMS, "
-"Yahoo, ...)."
+"Affiche des images géo-référencées en fond d'écran (serveurs WMS, Yahoo, "
+"...)."
 
 #. <!--
@@ -16656,8 +16729,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#.
+#. 
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -16854,5 +16927,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -16862,5 +16935,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -16879,5 +16952,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -16887,5 +16960,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -16904,5 +16977,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -16912,5 +16985,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -16929,5 +17002,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -16937,5 +17010,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -16950,5 +17023,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -16966,5 +17039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -16982,5 +17055,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -16989,5 +17062,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -16997,5 +17070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -17015,5 +17088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -17022,5 +17095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -17030,5 +17103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -17078,7 +17151,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -17777,5 +17850,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:932
@@ -17814,5 +17887,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:954
@@ -17908,5 +17981,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -18063,5 +18136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -19448,5 +19521,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -19456,5 +19529,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -19464,5 +19537,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -19472,5 +19545,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -19828,7 +19901,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -19838,5 +19911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -19846,5 +19919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -19854,5 +19927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -19862,5 +19935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -19870,5 +19943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -19878,5 +19951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -19886,5 +19959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -19894,5 +19967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -19902,5 +19975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -19910,5 +19983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -19918,5 +19991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -19926,5 +19999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -19934,5 +20007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -19942,5 +20015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -19950,5 +20023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -19958,5 +20031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -19966,5 +20039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -19974,5 +20047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -19982,5 +20055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -19990,5 +20063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -19998,5 +20071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -20006,5 +20079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -20014,5 +20087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -20022,5 +20095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -20030,5 +20103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -20038,5 +20111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -20046,5 +20119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -20054,5 +20127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -20062,5 +20135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -20070,5 +20143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -20078,5 +20151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -20086,5 +20159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -20094,5 +20167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -20102,5 +20175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -20110,5 +20183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -20118,5 +20191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -20126,5 +20199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -20134,5 +20207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -20142,5 +20215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -20150,5 +20223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -20158,5 +20231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -20166,5 +20239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -20174,5 +20247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -20182,5 +20255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -20190,5 +20263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -20198,5 +20271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -21890,7 +21963,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -21900,5 +21973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -21908,5 +21981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -21916,5 +21989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -21924,5 +21997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -21932,5 +22005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -21940,5 +22013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -21948,5 +22021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -23277,5 +23350,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -23291,5 +23364,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -23300,7 +23373,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -23310,5 +23383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -23318,5 +23391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -23326,5 +23399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -23334,5 +23407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -23365,5 +23438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -23379,5 +23452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -23387,5 +23460,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -23395,5 +23468,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -23404,5 +23477,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -23431,5 +23504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -23544,9 +23617,9 @@
 #. 7. scale_min / scale_max
 #. - zoom scale for display
-#.
+#. 
 #. Using both area and line attributes for the same key/value pair does work. For areas
 #. first the rbest matching area rule is searched and the best matching line rule is
 #. connected with it. They need not have the same key/value pair.
-#.
+#. 
 #. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
 #. If both are given, the color name is introduced in preferences with that value. If only
@@ -23554,5 +23627,5 @@
 #. modified preferences or previous value is used. The 6 hex digit color code can also
 #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
+#. 
 #. Linemod's are drawn over or under the line they are associated with and modify the
 #. appearance. There can be multiple linemod's for one way (contrary to line styles,
@@ -23562,8 +23635,8 @@
 #. on the sides of the way or the waystyles itself must use alpha channel (which may
 #. look strange).
-#.
+#. 
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
 #. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
+#. 
 #. For external files the <rules> should have following elements:
 #. - author           the author of the style
@@ -23577,5 +23650,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -23583,5 +23656,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -23630,6 +23703,6 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
 #. <rule>
@@ -23709,5 +23782,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -23717,5 +23790,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -23724,5 +23797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -23732,5 +23805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -23739,5 +23812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -23746,5 +23819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -23753,5 +23826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -23760,5 +23833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -23767,5 +23840,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -23774,5 +23847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="gate"/>
@@ -23781,5 +23854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cattle_grid"/>
@@ -23788,5 +23861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="toll_booth"/>
@@ -23795,5 +23868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -23802,5 +23875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -23809,5 +23882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="viaduct"/>
@@ -23817,5 +23890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="viaduct"/>
@@ -23824,5 +23897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <!-- deprecated; use information=guidepost instead -->
@@ -23833,5 +23906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="marsh"/>
@@ -23843,11 +23916,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -23856,7 +23929,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--"deprecated" tags -->
-#.
+#. 
 #. <!-- historic=museum -> tourism=museum -->
 #. <rule>
@@ -23867,5 +23940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_wind -> power=generator and power_source=wind -->
 #. <rule>
@@ -23876,5 +23949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_hydro -> power=generator and power_source=hydro -->
 #. <rule>
@@ -23885,5 +23958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_fossil -> power=generator and power_source=fossil -->
 #. <rule>
@@ -23894,5 +23967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
 #. <rule>
@@ -23903,5 +23976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway classification now more detailed -->
 #. <rule>
@@ -23912,5 +23985,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- amenity=park_bench -> amenity=bench -->
 #. <rule>
@@ -23922,5 +23995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway=stile -> barrier=stile -->
 #. <rule>
@@ -23931,5 +24004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
 #. <rule>
@@ -23954,5 +24027,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -23961,5 +24034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -23968,5 +24041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -23982,5 +24055,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -23994,5 +24067,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -24001,5 +24074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -24008,5 +24081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -24015,5 +24088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -24022,5 +24095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -24029,5 +24102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -24036,5 +24109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -24043,5 +24116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -24050,5 +24123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -24057,5 +24130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -24064,5 +24137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -24071,5 +24144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -24078,5 +24151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -24085,5 +24158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -24092,5 +24165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24261,7 +24334,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -24275,5 +24348,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -24283,7 +24356,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -24293,5 +24366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -24301,5 +24374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -24309,5 +24382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -24317,5 +24390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -24331,5 +24404,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24339,5 +24412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24347,5 +24420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24355,5 +24428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24363,5 +24436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24371,5 +24444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24379,5 +24452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24396,5 +24469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -24403,5 +24476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -24415,10 +24488,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
 #: build/trans_style.java:847
 msgid "ford"
-msgstr "Ford"
+msgstr "gué"
 
 #. color ford
@@ -24427,5 +24500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -24434,5 +24507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -24446,5 +24519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -24452,5 +24525,5 @@
 #: build/trans_style.java:886
 msgid "emergency_access_point"
-msgstr "Accès d'urgence"
+msgstr "accès d'urgence"
 
 #. color water
@@ -24459,5 +24532,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -24472,5 +24545,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -24484,5 +24557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -24496,5 +24569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -24503,5 +24576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -24510,5 +24583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
@@ -24522,5 +24595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -24530,5 +24603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -24537,5 +24610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -24544,5 +24617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -24551,5 +24624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -24559,5 +24632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -24568,5 +24641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -24576,7 +24649,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -24586,5 +24659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -24594,5 +24667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -24602,5 +24675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -24611,5 +24684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -24619,5 +24692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -24627,5 +24700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -24635,5 +24708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -24643,5 +24716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -24651,5 +24724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -24659,5 +24732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -24667,5 +24740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -24675,5 +24748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -24696,7 +24769,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -24706,5 +24779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -24713,5 +24786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -24721,5 +24794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -24728,5 +24801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -24736,5 +24809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -24744,5 +24817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -24758,5 +24831,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -24767,5 +24840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -24784,5 +24857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -24792,5 +24865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24803,5 +24876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24819,5 +24892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -24826,5 +24899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -24833,5 +24906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -24840,7 +24913,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -24851,5 +24924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -24864,5 +24937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -24876,5 +24949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -24884,5 +24957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -24896,5 +24969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -24908,5 +24981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -24915,7 +24988,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -24925,5 +24998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -24933,5 +25006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -24941,5 +25014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -24949,5 +25022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -24963,7 +25036,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -24978,5 +25051,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -24991,5 +25064,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -25004,5 +25077,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -25017,5 +25090,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -25030,5 +25103,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -25043,7 +25116,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -25053,5 +25126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -25060,5 +25133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -25068,5 +25141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -25076,5 +25149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -25084,5 +25157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -25092,5 +25165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -25100,5 +25173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -25108,5 +25181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -25116,5 +25189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -25124,5 +25197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -25132,5 +25205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -25140,5 +25213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -25148,5 +25221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -25166,5 +25239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -25179,5 +25252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -25190,7 +25263,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -25200,5 +25273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -25208,5 +25281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -25216,5 +25289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -25224,5 +25297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -25232,5 +25305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -25240,5 +25313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -25248,5 +25321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -25256,5 +25329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -25264,5 +25337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -25272,5 +25345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -25280,5 +25353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -25288,5 +25361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -25296,5 +25369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -25304,5 +25377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -25323,5 +25396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -25329,5 +25402,5 @@
 #: build/trans_style.java:1749
 msgid "marina"
-msgstr "marina"
+msgstr "port"
 
 #. color leisure
@@ -25335,7 +25408,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -25345,5 +25418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -25353,5 +25426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -25361,5 +25434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -25369,5 +25442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -25377,5 +25450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -25385,5 +25458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -25393,5 +25466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -25408,5 +25481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -25416,5 +25489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -25424,5 +25497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -25432,5 +25505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -25440,5 +25513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -25448,5 +25521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -25456,5 +25529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -25464,5 +25537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -25472,5 +25545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -25480,5 +25553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -25488,5 +25561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -25496,5 +25569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -25513,5 +25586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -25521,5 +25594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -25528,5 +25601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -25536,5 +25609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -25544,5 +25617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -25552,5 +25625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -25559,5 +25632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -25567,5 +25640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -25575,5 +25648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -25583,5 +25656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -25591,5 +25664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -25598,5 +25671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -25605,5 +25678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -25612,5 +25685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -25619,5 +25692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -25626,5 +25699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -25633,5 +25706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -25640,5 +25713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -25647,5 +25720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -25654,5 +25727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -25661,5 +25734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -25668,5 +25741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -25675,5 +25748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -25682,5 +25755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -25690,5 +25763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -25698,5 +25771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -25706,5 +25779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -25714,5 +25787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -25722,5 +25795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -25730,5 +25803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -25738,5 +25811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -25746,5 +25819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -25754,5 +25827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -25763,5 +25836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -25771,5 +25844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -25779,5 +25852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -25787,5 +25860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -25795,5 +25868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -25803,5 +25876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -25811,5 +25884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -25819,5 +25892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -25827,5 +25900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -25835,5 +25908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -25843,5 +25916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -25851,5 +25924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -25859,5 +25932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -25867,5 +25940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -25875,5 +25948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -25883,5 +25956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -25891,5 +25964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -25899,5 +25972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -25907,5 +25980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -25914,5 +25987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -25944,5 +26017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -25952,5 +26025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -25960,7 +26033,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -25975,5 +26048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -25983,5 +26056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -25991,5 +26064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -25999,5 +26072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -26007,5 +26080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -26015,5 +26088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -26023,5 +26096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -26037,7 +26110,7 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -26047,5 +26120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -26055,5 +26128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -26063,5 +26136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -26071,5 +26144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -26079,5 +26152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -26087,5 +26160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -26095,5 +26168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -26103,5 +26176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -26111,5 +26184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -26119,5 +26192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -26127,5 +26200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -26135,5 +26208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -26143,5 +26216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -26151,5 +26224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -26159,5 +26232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -26167,5 +26240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -26175,5 +26248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -26183,5 +26256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -26191,5 +26264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -26199,5 +26272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -26207,5 +26280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -26215,5 +26288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -26223,5 +26296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -26231,5 +26304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -26239,5 +26312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -26247,5 +26320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -26255,5 +26328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -26263,5 +26336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -26271,5 +26344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -26279,5 +26352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -26287,5 +26360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -26295,5 +26368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -26303,5 +26376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -26311,5 +26384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -26319,5 +26392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -26327,5 +26400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -26335,5 +26408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -26343,5 +26416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -26351,5 +26424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -26359,5 +26432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -26367,5 +26440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -26375,5 +26448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -26409,7 +26482,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -26419,5 +26492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -26427,5 +26500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -26435,5 +26508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -26443,5 +26516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -26451,5 +26524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -26459,5 +26532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -26467,5 +26540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -26482,5 +26555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -26490,5 +26563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -26498,5 +26571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -26506,5 +26579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -26514,5 +26587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -26522,5 +26595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -26531,5 +26604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -26539,5 +26612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -26547,5 +26620,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -26555,5 +26628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -26562,5 +26635,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -26569,5 +26642,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -26585,7 +26658,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -26595,5 +26668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -26603,5 +26676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -26611,5 +26684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -26619,5 +26692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -26627,5 +26700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -26635,5 +26708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -26643,5 +26716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -26651,5 +26724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -26659,5 +26732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -26676,5 +26749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -26688,5 +26761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -26700,5 +26773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -26708,5 +26781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -26720,5 +26793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
@@ -26732,5 +26805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -26744,6 +26817,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -26753,5 +26826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -26765,5 +26838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -26777,5 +26850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -26789,5 +26862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -26801,5 +26874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -26813,5 +26886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -26821,7 +26894,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -26831,5 +26904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -26839,5 +26912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -26847,5 +26920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -26855,5 +26928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -26870,5 +26943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -26881,5 +26954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -26893,5 +26966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -26905,5 +26978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -26917,5 +26990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -26926,5 +26999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -26934,5 +27007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -26942,5 +27015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -26950,5 +27023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -26958,5 +27031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -26973,5 +27046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -26985,5 +27058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -26997,5 +27070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -27009,5 +27082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -27021,5 +27094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -27033,5 +27106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -27040,7 +27113,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -27050,5 +27123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -27058,5 +27131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -27066,5 +27139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -27074,5 +27147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -27082,5 +27155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -27090,5 +27163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -27098,5 +27171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
@@ -27113,7 +27186,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -27123,5 +27196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -27131,5 +27204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -27139,5 +27212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -27147,5 +27220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
@@ -27161,5 +27234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 #. XXX - maybe it's possible to use linemod's here?
@@ -27185,5 +27258,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -27194,11 +27267,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -27208,5 +27281,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -27216,5 +27289,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -27224,5 +27297,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -27232,5 +27305,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -27240,5 +27313,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -27248,5 +27321,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -27256,5 +27329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -27264,5 +27337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -27272,5 +27345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -27280,5 +27353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -27288,5 +27361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -27296,5 +27369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -27314,5 +27387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -27321,5 +27394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -27328,5 +27401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -27335,5 +27408,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -27342,5 +27415,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -27349,5 +27422,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -27389,5 +27462,5 @@
 #: build/trans_surveyor.java:33
 msgid "Church"
-msgstr "Eglise"
+msgstr "Église"
 
 #. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
@@ -27442,5 +27515,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -27448,28 +27521,28 @@
 #. relation    - a relation
 #. *           - all data types
-#.
+#. 
 #. Message type can be:
 #. E            - an error
 #. W            - a warning
 #. I            - an low priority informational warning
-#.
+#. 
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
 #. ends with // signs. If an 'i' is appended, the regular expression is
 #. case insensitive.
-#.
+#. 
 #. The * sign indicates any string.
 #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
 #. handling for boolean values (yes, true, 0, false, no, ...).
-#.
+#. 
 #. Expression can be:
 #. !=          - the key/value combination does not match
 #. ==          - the key/value combination does match
-#.
+#. 
 #. To have more complicated expressions, multiple elements can be grouped together
 #. with an logical and (&&).
-#.
+#. 
 #. The comment at the end of a rule is displayed in validator description
-#.
+#. 
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
@@ -27496,5 +27569,5 @@
 #: build/trans_validator.java:46
 msgid "wrong highway tag on a node"
-msgstr "valeur incorrecte de l’attribute « voie (highway) » sur un nœud"
+msgstr "valeur incorrecte de l’attribut « voie (highway) » sur un nœud"
 
 #. node : W : highway == track
@@ -27539,5 +27612,5 @@
 #: build/trans_validator.java:62
 msgid "separate cycleway as lane on a cycleway"
-msgstr "voie cyclable séparée étiquettée comme un couloir cyclable"
+msgstr "voie cyclable séparée étiquetée comme un couloir cyclable"
 
 #. way  : W : highway == cycleway && cycleway == lane
@@ -27556,5 +27629,5 @@
 #: build/trans_validator.java:69
 msgid "layer tag with + sign"
-msgstr "Etiquette du calque avec un signe +"
+msgstr "Étiquette du calque avec un signe +"
 
 #. *    : W : layer == /\+.*/
@@ -27584,5 +27657,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -27595,5 +27668,5 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#.
+#. 
 #. different forms for web access
 #. must be html:<url>
@@ -27618,6 +27691,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -27626,6 +27699,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -27640,6 +27713,6 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#.
-#.
+#. 
+#. 
 #. only for Czech Republic
 #: build/trans_wms.java:27
@@ -27653,6 +27726,6 @@
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#.
-#.
+#. 
+#. 
 #. only for GB
 #. fails with division by zero error
@@ -27672,6 +27745,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -27695,6 +27768,6 @@
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#.
-#.
+#. 
+#. 
 #. only for Italy
 #: build/trans_wms.java:46
@@ -27707,22 +27780,4 @@
 msgstr "Sicile - Italie"
 
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Veuillez rapporter un billet à {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Indiquer la procédure effectuée pour arriver à cette erreur (aussi "
-#~ "détaillée que possible) !"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant "
-#~ "de rapporter un bogue."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Soyez sûr(e) d'inclure l'information suivante :"
-
 #~ msgid "Move"
 #~ msgstr "Déplacer"
@@ -27755,4 +27810,5 @@
 #~ msgstr "Objet"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -27787,4 +27843,5 @@
 #~ msgstr "faux"
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Résoudre {0} conflits dans {1} objets"
@@ -27796,4 +27853,5 @@
 #~ msgstr "sans-nom"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Erreur durant le chargement de la page {0}"
@@ -27809,6 +27867,6 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous "
-#~ "avez obtenu JOSM."
+#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous avez "
+#~ "obtenu JOSM."
 
 #~ msgid "Occupied By"
@@ -27834,4 +27892,5 @@
 #~ msgstr "Montrer le status de la dalle"
 
+#, java-format
 #~ msgid "requested: {0}"
 #~ msgstr "demandé : {0}"
@@ -27840,4 +27899,5 @@
 #~ msgstr "Metacarta Map Rectifier image id"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -27861,4 +27921,5 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
@@ -27872,6 +27933,6 @@
 #~ 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."
+#~ "Indication : Certains changements viennent de l’envoi de nouvelles données "
+#~ "sur le serveur."
 
 #~ msgid "Tags (empty value deletes tag)"
@@ -27883,10 +27944,9 @@
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr ""
-#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de "
-#~ "JOSM"
+#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de JOSM"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want to "
+#~ "combine them?"
 #~ msgstr ""
 #~ "Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
@@ -27903,4 +27963,5 @@
 #~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -27908,4 +27969,5 @@
 #~ msgstr[1] "{0} Greffons mis à jour avec succès. Veuillez redémarrer JOSM."
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Impossible de télécharger le greffon : {0} de {1}"
@@ -27917,4 +27979,5 @@
 #~ msgstr "Pivoter"
 
+#, java-format
 #~ msgid "Delete {1} {0}"
 #~ msgstr "Supprimer {1} {0}"
@@ -27928,6 +27991,9 @@
 #~ msgstr ""
 #~ "(Vous pouvez changer le nombre de jours au bout duquel cet avertissement "
-#~ "s'affiche<br>en modifiant l'option de configuration 'pluginmanager."
-#~ "warntime'.)"
+#~ "s'affiche<br>en modifiant l'option de configuration "
+#~ "'pluginmanager.warntime'.)"
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Soyez sûr(e) d'inclure l'information suivante :"
 
 #~ msgid "Error parsing server response."
@@ -28005,4 +28071,9 @@
 #~ msgstr "Séparer le segment du chemin"
 
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Indiquer la procédure effectuée pour arriver à cette erreur (aussi détaillée "
+#~ "que possible) !"
+
 #~ msgid "Server does not support changesets"
 #~ msgstr "Le serveur ne supporte pas les révisions"
@@ -28012,12 +28083,18 @@
 
 #~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before reporting "
+#~ "a bug."
+#~ msgstr ""
+#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant de "
+#~ "rapporter un bogue."
+
+#~ msgid ""
 #~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ "file.<br>The password is transfered in plain text to the server, encoded in "
+#~ "the URL.<br><b>Do not use a valuable Password.</b></html>"
 #~ msgstr ""
-#~ "<html>ATTENTION : Le mot de passe est stocké en texte brut dans le "
-#~ "fichier de préférences.<br>Le mot de passe est transféré en texte brut au "
-#~ "serveur, encodé dans l’URL.<br><b>N’utilisez pas un mot de passe de "
-#~ "valeur.</b></html>"
+#~ "<html>ATTENTION : Le mot de passe est stocké en texte brut dans le fichier "
+#~ "de préférences.<br>Le mot de passe est transféré en texte brut au serveur, "
+#~ "encodé dans l’URL.<br><b>N’utilisez pas un mot de passe de valeur.</b></html>"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -28025,6 +28102,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -28041,6 +28118,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
+#~ "this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -28050,9 +28127,8 @@
 #~ msgstr ""
 #~ "Vous pouvez ajouter, éditer et supprimer des sources WMS dans l'onglet "
-#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu "
-#~ "WMS.\n"
+#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu WMS.\n"
 #~ "\n"
-#~ "Vous pouvez également faire cela manuellement dans les Préférences "
-#~ "avancées, en utilisant le schéma suivant :\n"
+#~ "Vous pouvez également faire cela manuellement dans les Préférences avancées, "
+#~ "en utilisant le schéma suivant :\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -28085,9 +28161,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still want "
+#~ "to merge them?"
 #~ msgstr ""
-#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. "
-#~ "Voulez-vous encore les fusionner ?"
+#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. Voulez-"
+#~ "vous encore les fusionner ?"
 
 #~ msgid "Only two nodes allowed"
@@ -28101,4 +28177,5 @@
 #~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
@@ -28132,11 +28209,12 @@
 #~ msgstr "Afficher la liste des auteurs"
 
+#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
 #~ msgstr ""
 #~ "Le greffon {0} semble endommagé ou n'a pas pu être téléchargé "
 #~ "automatiquement."
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -28155,4 +28233,5 @@
 #~ msgstr "Chargement vers OSM..."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -28161,12 +28240,14 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger "
-#~ "la version actuelle en supprimant l'archive existante?\n"
+#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger la "
+#~ "version actuelle en supprimant l'archive existante?\n"
 #~ "\n"
 #~ "{0}"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Auteurs : {0}"
 
+#, java-format
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Conflits : {0}"
@@ -28185,4 +28266,5 @@
 #~ msgstr "Ouvrir dans le navigateur"
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n"
@@ -28196,4 +28278,5 @@
 #~ msgstr "Le greffon est déjà installé"
 
+#, java-format
 #~ msgid "Error deleting plugin file: {0}"
 #~ msgstr "Impossible de supprimer le fichier du greffon : {0}"
@@ -28213,6 +28296,6 @@
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 #~ msgstr ""
-#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations "
-#~ "entre deux zones)"
+#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations entre "
+#~ "deux zones)"
 
 #~ msgid "Select Tableau d'Assemblage"
@@ -28225,9 +28308,8 @@
 #~ msgstr "Fichier tampon de la zone Lambert 3 (.3)"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
-#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante "
-#~ "{1}"
+#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante {1}"
 
 #~ msgid ""
@@ -28235,6 +28317,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone "
-#~ "à charger, et/ou attendez un peu avant de recommencer."
+#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone à "
+#~ "charger, et/ou attendez un peu avant de recommencer."
 
 #~ msgid "Remove Selected"
@@ -28261,4 +28343,8 @@
 #~ msgstr "Continuer tout de même"
 
+#, java-format
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Veuillez rapporter un billet à {0}"
+
 #~ msgid "Commit comment"
 #~ msgstr "Commentaire sur cette déposition"
@@ -28292,6 +28378,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
 #~ msgstr ""
 #~ "Rétablir l’état des objets actuellement sélectionnés à la version "
@@ -28301,4 +28387,5 @@
 #~ msgstr "Supprimer le calque"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Calques: {0}"
@@ -28333,6 +28420,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this as "
+#~ "a bug."
 #~ msgstr ""
 #~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. "
@@ -28351,4 +28438,5 @@
 #~ msgstr "Déplacer vers le bas"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editeur de relation : {0}"
@@ -28357,4 +28445,5 @@
 #~ msgstr "Déplacer vers le haut"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Changez auparavant la projection en {0}"
@@ -28363,4 +28452,5 @@
 #~ msgstr "Projection invalide"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -28378,9 +28468,9 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You can "
+#~ "adjust the sliders to manually match the photos."
 #~ msgstr ""
-#~ "Une erreur est survenue lors de l'association des photos avec la trace "
-#~ "GPX. Vous pouvez ajuster les curseurs pour faire correspondre les photos "
+#~ "Une erreur est survenue lors de l'association des photos avec la trace GPX. "
+#~ "Vous pouvez ajuster les curseurs pour faire correspondre les photos "
 #~ "manuellement."
 
@@ -28404,7 +28494,9 @@
 #~ msgstr "Modifier une herse"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Utiliser la balise \"{0}\""
@@ -28420,7 +28512,7 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des "
-#~ "balises prédéfinies. Voir http://josm.openstreetmap.de/wiki/"
-#~ "TaggingPresets pour plus d'informations"
+#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des balises "
+#~ "prédéfinies. Voir http://josm.openstreetmap.de/wiki/TaggingPresets pour plus "
+#~ "d'informations"
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -28428,10 +28520,10 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
+#~ "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."
+#~ "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."
@@ -28440,11 +28532,11 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
+#~ "eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "La principale fonction du greffon est de permettre la suppression de "
-#~ "points de la trace GPX. Ce greffon peut être utilisé pour préparer des "
-#~ "traces à être chargées vers OSM, par ex. en supprimant des parties "
-#~ "inintéressantes des traces."
+#~ "La principale fonction du greffon est de permettre la suppression de points "
+#~ "de la trace GPX. Ce greffon peut être utilisé pour préparer des traces à "
+#~ "être chargées vers OSM, par ex. en supprimant des parties inintéressantes "
+#~ "des traces."
 
 #~ msgid "Combine Anyway"
@@ -28466,4 +28558,5 @@
 #~ msgstr "Erreur lors du traitement de la réponse au changement envoyé"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -28477,6 +28570,5 @@
 #~ "les latitudes entre 45.7° et 47.9°\n"
 #~ "et les longitutes entre 5.7° et 10.6° uniquement.\n"
-#~ "Veuillez utiliser un autre système de projection si vous ne travaillez "
-#~ "pas\n"
+#~ "Veuillez utiliser un autre système de projection si vous ne travaillez pas\n"
 #~ "sur des données de Suisse ou du Liechtenstein.\n"
 #~ "Ne pas envoyer de données après ce message."
@@ -28491,12 +28583,15 @@
 #~ msgstr "% de lon. :"
 
+#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible."
 
+#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr ""
-#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation "
-#~ "{1}, valeur {2}"
-
+#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation {1}, "
+#~ "valeur {2}"
+
+#, java-format
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}"
@@ -28528,4 +28623,5 @@
 #~ msgstr "Intersection atteinte"
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Vérification si le nœud {0} est supprimé..."
@@ -28540,30 +28636,30 @@
 #~ msgstr "La mise à jour a échoué"
 
+#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Vérification si la primitive {0} est supprimée..."
 
+#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
+#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
+#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
+#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
+#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur "
-#~ "le serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> "
-#~ "pour garder votre primitive et ignorer l’état supprimé.<br>Votre "
-#~ "primitive obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour "
-#~ "accepter l’état du serveur et supprimer votre primitive.<br>Cliquez "
-#~ "<strong>{3}</strong> pour annuler.<br>"
-
+#~ "<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur le "
+#~ "serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> pour "
+#~ "garder votre primitive et ignorer l’état supprimé.<br>Votre primitive "
+#~ "obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour accepter l’état "
+#~ "du serveur et supprimer votre primitive.<br>Cliquez <strong>{3}</strong> "
+#~ "pour annuler.<br>"
+
+#, java-format
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
+#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
 #~ msgstr ""
-#~ "<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise "
-#~ "à jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</"
-#~ "html>"
+#~ "<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise à "
+#~ "jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</html>"
 
 #~ msgid "Selection too big"
@@ -28600,4 +28696,5 @@
 #~ msgstr "Suppression d’une primitive"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -28617,6 +28714,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -28632,6 +28729,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
+#~ "this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -28640,7 +28737,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet "
-#~ "des préférences de WMSplugin - ces options s’afficheront dans le menu "
-#~ "WMS.\n"
+#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet des "
+#~ "préférences de WMSplugin - ces options s’afficheront dans le menu WMS.\n"
 #~ "\n"
 #~ "Vous pouvez également effectuer ceci dans les Préférences Avancées, en "
@@ -28654,6 +28750,7 @@
 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 #~ "\n"
-#~ "Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/"
-#~ "rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n"
+#~ "Pour le Rectificateur de Carte Metacarta "
+#~ "http://labs.metacarta.com/rectifier/ , vous avez seulement besoin d’entrer "
+#~ "le bon ’id’.\n"
 #~ "Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez "
 #~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de "
@@ -28662,13 +28759,13 @@
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au "
-#~ "niveau du copyright, dans le doute, ne l'utilisez pas."
-
+#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au niveau "
+#~ "du copyright, dans le doute, ne l'utilisez pas."
+
+#, 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}\""
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "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 "
@@ -28681,4 +28778,5 @@
 #~ msgstr "Échec d’initialisation de l’API"
 
+#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "suppression de la référence du chemin {0}"
@@ -28693,4 +28791,5 @@
 #~ msgstr "conflit créé"
 
+#, java-format
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "supprimer le membre de la relation {0} {1}"
@@ -28719,4 +28818,5 @@
 #~ msgstr "Impossible de rechercher car il n’y a pas de données chargées."
 
+#, java-format
 #~ msgid "Do you really want to delete layer ''{0}''?"
 #~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
@@ -28729,7 +28829,8 @@
 #~ "found."
 #~ msgstr ""
-#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
-#~ "été trouvés."
-
+#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont été "
+#~ "trouvés."
+
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -28747,47 +28848,53 @@
 
 #~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
+#~ "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"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\"."
-#~ "<br>Enlever de la relation ?</html>"
-
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\".<br>Enlever "
+#~ "de la relation ?</html>"
+
+#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
+#~ "from relation?</html>"
 #~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le "
-#~ "rôle {2}.<br>Enlever de la relation ?</html>"
-
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le rôle "
+#~ "{2}.<br>Enlever de la relation ?</html>"
+
+#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
 #~ "open for further uploads"
 #~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la laisser "
-#~ "ouverte pour d'autres envois."
-
+#~ "Envoyer avec la session de modification existante {0} et la laisser ouverte "
+#~ "pour d'autres envois."
+
+#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
-#~ "Utiliser la session de modification existante {0} et la fermer après "
-#~ "l'envoi."
-
+#~ "Utiliser la session de modification existante {0} et la fermer après l'envoi."
+
+#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
 #~ "after this upload"
 #~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la fermer après "
-#~ "cet envoi."
-
+#~ "Envoyer avec la session de modification existante {0} et la fermer après cet "
+#~ "envoi."
+
+#, java-format
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr ""
 #~ "Utiliser la session de modification existante {0} et la conserver ouverte."
 
+#, java-format
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
@@ -28799,10 +28906,12 @@
 #~ msgstr "Remplacer"
 
+#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
 
+#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A> ou <A "
@@ -28816,10 +28925,11 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A> ou <A "
 #~ "HREF=\"{1}\">French</A>."
 
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -28829,4 +28939,5 @@
 #~ "primitives sélectionnées uniquement."
 
+#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valeur inattendue retournée. Reçue {0}"
@@ -28845,4 +28956,5 @@
 #~ msgstr "pas de version plus récente trouvée. L’historique est vide."
 
+#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "index en dehors des limites. Reçu {0}"
@@ -28851,22 +28963,24 @@
 #~ msgstr "Afficher l'historique de la primitive sélectionnée"
 
+#, java-format
 #~ 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}"
-
+#~ "impossible de définir la référence. la référence d’id {0} ne correspond pas "
+#~ "à l'historique d’id {1}"
+
+#, java-format
 #~ 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, "
+#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
+#~ "\"{1}\""
+
+#, java-format
+#~ msgid ""
+#~ "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), "
 #~ "reçu \"{1}\""
-
-#~ msgid ""
-#~ "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), reçu \"{1}\""
 
 #~ msgid "Please enter the desired coordinates first."
