Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 15802) +++ applications/editors/josm/i18n/po/fr.po (revision 15910) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-09 15:31+0000\n" -"Last-Translator: nin2jardin \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 17:52+0000\n" +"Last-Translator: Dirk Stöcker \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-06-09 16:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,9 +70,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 @@ -93,5 +93,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -102,4 +102,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Cancel" msgstr "Annuler" @@ -504,6 +505,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 msgid "Overwrite" msgstr "Écrire dessus" @@ -540,5 +541,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 #, java-format msgid "File: {0}" @@ -647,8 +648,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -660,5 +661,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356 msgid "Error" msgstr "Erreur" @@ -1043,5 +1044,5 @@ msgstr "Sauvegarder les données actuelles." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 #, java-format msgid "File {0} exists. Overwrite?" @@ -1167,5 +1168,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:208 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871 msgid "Close" @@ -1393,54 +1394,88 @@ "continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Upload to OSM..." msgstr "Chargement vers OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 msgid "Upload all changes to the OSM server." msgstr "Envoyer tous les changements sur le serveur OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Objets à ajouter :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objets à modifier :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Charger ces changements ?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Envoyer les changements" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154 msgid "Nothing to upload. Get some data first." msgstr "Rien à envoyer. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:159 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "" "Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Aucun changement à envoyer." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Envoi des données" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205 +msgid "Uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.
Please synchronize your " +"local dataset using
File->Update Data, " +"resolve
any conflicts and try to upload again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:260 +msgid "" +"Uploading failed because the server has a newer version of one
of " +"your nodes, ways or relations.
Please synchronize your local dataset " +"using
File->Update Data, resolve
any conflicts " +"and try to upload again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:287 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" +"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " +"Internet." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2336,5 +2371,5 @@ #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262 msgid "deleted" msgstr "supprimé" @@ -3186,5 +3221,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75 msgid "My version" msgstr "Ma version" @@ -3195,5 +3230,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3209,5 +3244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 msgid "Their version" msgstr "Leur version" @@ -3379,4 +3414,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:140 msgid "parameter '{0}' must not be null" msgstr "le paramètre {0} ne peut pas être vide" @@ -3410,9 +3446,9 @@ msgstr "index de colonne inattendu. Reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propriétés de mon jeu de données, i.e. les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3422,47 +3458,47 @@ "éléments lorsque les choix de fusion seront appliqués." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Propriétés de leur jeu de données, i.e. les données du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101 msgid "Coordinates:" msgstr "Coordonnées :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174 msgid "Deleted State:" msgstr "Etat supprimé :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(aucun)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:265 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "not deleted" msgstr "non supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334 msgid "Keep my coordiates" msgstr "Conserver mes coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349 msgid "Keep their coordiates" msgstr "Conserver leurs coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 msgid "Undecide conflict between different coordinates" msgstr "Ne pas résoudre le conflit de coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379 msgid "Keep my deleted state" msgstr "Conserver mon état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394 msgid "Keep their deleted state" msgstr "Conserver leur état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409 msgid "Undecide conflict between deleted state" msgstr "Ne pas résoudre le conflit d'état" @@ -6853,9 +6889,15 @@ msgstr "Erreur lors de l'import des trames NMEA !" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:153 +#, java-format +msgid "preference {0} missing. Can't initialize OsmApi" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:206 msgid "This version of JOSM is incompatible with the configured server." msgstr "Cette version de JOSM est incompatible avec le serveur défini." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6866,5 +6908,5 @@ "supporte que les versions {0} à {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:211 #, java-format msgid "Communications with {0} established using protocol version {1}" @@ -6872,42 +6914,28 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:192 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:250 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:265 msgid "Cannot read numeric value from response" msgstr "Impossible de lire une valeur numérique dans la réponse" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Ouverture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:367 msgid "No changeset present for diff upload" msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Envoi en cours..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "L'envoi de données a échoué pour une raison inconnue" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Non initialisé" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Hôte inconnu" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7049,16 +7077,5 @@ msgstr "Contact du serveur..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" -"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " -"Internet." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7075,5 +7092,12 @@ "charger, et/ou attendez un peu avant de recommencer." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103 +#, java-format +msgid "" +"WARNING: preference '{0}' or api version {1} of dataset requires to use " +"changesets, but API is not handle them. Ignoring changesets." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" @@ -7448,9 +7472,9 @@ msgstr "Créer un reseau de voies" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 msgid "Upload Trace" msgstr "Envoyer la trace" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7480,52 +7504,52 @@ msgstr "Veuillez entrer des mot-clés liés à votre trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:155 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 #, java-format msgid "Selected track: {0}" msgstr "Trace sélectionnée : {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Connexion..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:201 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 msgid "Upload cancelled" msgstr "Envoi annulé" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:211 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 msgid "Error while uploading" msgstr "Erreur lors du chargement" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "GPX upload was successful" msgstr "Succès de l'envoi de la trace GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "L'envoi a échoué. Le serveur a retourné le message suivant : " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Envoyer la trace GPX : {0}% ({1} ou {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:337 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 msgid "No description provided. Please provide some description." msgstr "Pas de description fournie. Merci de fournir une description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:340 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:362 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Pas de calque GPX sélectionné. Impossible de téléverser une trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:343 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 msgid "No username provided." msgstr "Pas de nom d'utilisateur fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 msgid "No password provided." msgstr "Pas de mot de passe fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 msgid "Uploading GPX Track" msgstr "Envoyer la trace GPX" @@ -7887,5 +7911,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" @@ -7934,22 +7958,22 @@ msgstr "Sélectionner le tableau d'assemblage" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Projection invalide" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166 #, java-format msgid "Change the projection to {0} first." msgstr "Changez auparavant la projection en {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7958,4 +7982,19 @@ "Pour activer le greffon cadastre WMS, modifiez\n" "la projection JOSM en Lambert et redémarrez" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8216,9 +8255,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Ajuster la position du calque WMS" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -8234,6 +8273,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Blank Layer" msgstr "Calque vide" @@ -8263,25 +8302,25 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 msgid "Load WMS layer" msgstr "Charger la couche WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -8291,5 +8330,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335 msgid "File Format Error" msgstr "Erreur de format de fichier" @@ -10637,5 +10676,5 @@ msgstr "Intersection atteinte" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Une exception s’est produite" @@ -10705,20 +10744,52 @@ msgstr "Aide sur le greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Rectifier l'image..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Télécharger une image rectifiée sur le WMS Metacarta's Map Rectifer" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier image id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10726,5 +10797,5 @@ msgstr "Ajuster la position du calque WMS sélectionné" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10739,15 +10810,15 @@ msgstr "Téléchargement automatique" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10756,25 +10827,25 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier" @@ -22273,4 +22344,10 @@ msgstr "Terraserver Urbain" +#~ msgid "Uploading data" +#~ msgstr "Envoi des données" + +#~ msgid "Unknown host" +#~ msgstr "Hôte inconnu" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki." @@ -22297,4 +22374,13 @@ #~ "bouton droit de souris enfoncé et déplacer la souris. Sélection : Clic" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Ajuster la position du calque WMS" + #~ msgid "Charge" #~ msgstr "Charge" @@ -22320,4 +22406,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Marquer ce problème comme \"fait\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Télécharger une image rectifiée sur le WMS Metacarta's Map Rectifer" #~ msgid "Portcullis" @@ -22375,2 +22464,8 @@ #~ msgid "Error processing changeset upload response" #~ msgstr "Erreur lors du traitement de la réponse au changement envoyé" + +#~ msgid "Not initialized" +#~ msgstr "Non initialisé" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "L'envoi de données a échoué pour une raison inconnue"