Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 18975) +++ applications/editors/josm/i18n/po/fr.po (revision 19199) @@ -2,10 +2,11 @@ # # Frederic Bonifas , 2006. +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187 msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-06 14:57+0100\n" -"PO-Revision-Date: 2009-12-03 18:07+0000\n" +"POT-Creation-Date: 2009-12-23 17:04+0100\n" +"PO-Revision-Date: 2009-12-20 10:44+0000\n" "Last-Translator: François Blondel \n" "Language-Team: Fr <>\n" @@ -14,39 +15,39 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-12-06 13:16+0000\n" +"X-Launchpad-Export-Date: 2009-12-23 15:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" -#: ../core/src/org/openstreetmap/josm/Main.java:207 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../core/src/org/openstreetmap/josm/Main.java:208 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Creating main GUI" msgstr "Création de l’interface utilisateur" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:217 +#: ../core/src/org/openstreetmap/josm/Main.java:218 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Aide" -#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "URL malformée ignorée : « {0} »" -#: ../core/src/org/openstreetmap/josm/Main.java:431 -#: ../core/src/org/openstreetmap/josm/Main.java:451 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 @@ -58,21 +59,21 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266 @@ -93,18 +94,8 @@ msgstr "Avertissement" -#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "URL malformée ignorée dans le fichier : « {0} »" - -#: ../core/src/org/openstreetmap/josm/Main.java:463 -#: ../core/src/org/openstreetmap/josm/Main.java:471 -#: ../core/src/org/openstreetmap/josm/Main.java:502 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"Impossible de lire le fichier « {0} ».
L’erreur est :
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -112,8 +103,18 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"Impossible de lire le fichier « {0} ».
L’erreur est :
{1}" + +#: ../core/src/org/openstreetmap/josm/Main.java:465 +#: ../core/src/org/openstreetmap/josm/Main.java:473 +#: ../core/src/org/openstreetmap/josm/Main.java:504 +#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -121,10 +122,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79 @@ -136,9 +137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -147,6 +149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -201,8 +203,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -268,7 +270,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87 msgid "About JOSM..." -msgstr "À propos de JOSM..." - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40 +msgstr "À propos de JOSM…" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 #, java-format msgid "" @@ -280,5 +282,5 @@ "L'URL de base de l'API est : ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #, java-format msgid "" @@ -290,5 +292,5 @@ "L'API est : ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 #, java-format msgid "" @@ -300,15 +302,20 @@ "temps." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" msgstr "Continuer" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 +#, java-format +msgid "Click to continue and to open {0} browsers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 @@ -317,29 +324,30 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 @@ -356,5 +364,10 @@ msgstr "Annuler" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 +#, fuzzy +msgid "Click to abort launching external browsers" +msgstr "Clicker pour fusionner les noeuds" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -371,5 +384,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge" msgstr "Fusionner" @@ -389,15 +402,15 @@ #. modal +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164 msgid "Add Node..." -msgstr "Ajouter un nœud..." - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 +msgstr "Ajouter un nœud…" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56 msgid "Add a node by entering latitude and longitude." msgstr "Ajouter un nœud en indiquant une latitude et une longitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 @@ -413,22 +426,22 @@ #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71 #, java-format msgid "Edit: {0}" msgstr "Modifier : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102 msgid "Enter the coordinates for the new node." msgstr "Entrer les coordonnées pour le nouveau nœud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103 msgid "Use decimal degrees." msgstr "Utiliser des degrés décimaux." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104 msgid "Negative values denote Western/Southern hemisphere." msgstr "Les valeurs négatives indiquent la partie Ouest/Sud de l'hémisphère." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 @@ -437,5 +450,5 @@ msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 @@ -444,28 +457,29 @@ msgstr "Longitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224 msgid "Please enter a valid latitude in the range -90..90" msgstr "Veuillez entrer une latitude valide entre -90° et 90°" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227 msgid "Please enter a latitude in the range -90..90" msgstr "Veuillez entrer une latitude entre -90° et 90°" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235 msgid "Please enter a valid longitude in the range -180..180" msgstr "Veuillez entrer une longitude valide entre -180° et 180°" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238 msgid "Please enter a longitude in the range -180..180" msgstr "Veuillez entrer une longitude entre -180° et 180°" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 @@ -477,9 +491,9 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 msgid "Close the dialog and create a new node" msgstr "Fermer la boîte de dialogue et créer un nouveau nœud." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288 msgid "Close the dialog, don't create a new node" msgstr "Fermer la boîte de dialogue sans créer de nouveau nœud." @@ -500,18 +514,18 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 @@ -523,5 +537,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:55 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -543,6 +557,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 @@ -589,5 +603,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "le conflit" @@ -624,14 +638,15 @@ msgstr "Aucun conflit sur lequel zoomer" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360 msgid "Close open changesets" msgstr "Fermer les ensembles de changements" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" msgstr "Ferme les ensembles de changements" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 @@ -641,23 +656,23 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 #, java-format msgid "File: {0}" msgstr "Fichier : {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "There are no open changesets" msgstr "Il n'y a pas d'ensembles de changements ouverts" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66 msgid "No open changesets" msgstr "Pas d'ensembles de changements ouverts" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 -#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89 +#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44 msgid "Downloading open changesets ..." -msgstr "Téléchargement des ensembles de changements ouverts" +msgstr "Téléchargement des ensembles de changements ouverts…" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 @@ -742,11 +757,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -789,5 +805,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 msgid "Download from OSM..." -msgstr "Téléchargement depuis OSM..." +msgstr "Téléchargement depuis OSM…" #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32 @@ -798,5 +814,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 msgid "Download parent ways/relations..." -msgstr "é" +msgstr "Télécharge les chemins/relations parents…" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 @@ -826,16 +842,21 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117 +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33 +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -871,5 +892,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "Duplicate" msgstr "Dupliquer" @@ -912,10 +933,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269 msgid "Export to GPX..." -msgstr "Exporter en GPX..." +msgstr "Exporter en GPX…" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268 msgid "Export the data to GPX file." msgstr "Exporter les données vers un fichier GPX." @@ -930,12 +951,12 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 @@ -960,8 +981,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -972,10 +993,10 @@ #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81 @@ -988,17 +1009,17 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 @@ -1035,22 +1056,27 @@ msgstr "Affiche les informations à propos des nœuds, chemins ou relations OSM." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Join overlapping Areas" msgstr "Joindre zones superposées" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113 msgid "Joins areas that overlap each other" msgstr "Joint les zones qui se superposent l'une l'autre" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125 +#, fuzzy +msgid "Please select at least one closed way that should be joined." +msgstr "Veuillez sélectionner au moins un chemin clos devant être fusionné." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131 msgid "Only up to two areas can be joined at the moment." msgstr "Seul un maximum de deux zones peuvent être jointes pour le moment." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" n'est pas fermé et ne peut donc être joint." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "" @@ -1064,39 +1090,35 @@ "Voulez-vous vraiment continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Veuillez abandonner si vous n'êtes pas sûr(e)" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 -msgid "Please select at least one closed way the should be joined." -msgstr "Veuillez sélectionner au moins un chemin clos devant être fusionné." - -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168 msgid "No intersection found. Nothing was changed." msgstr "Pas d’intersection trouvée. Rien n’a été modifié." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190 msgid "Added node on all intersections" msgstr "Noeuds ajoutés sur toutes les intersections" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" "Supprimer les chemins qui ne font pas partie d'un multipolygone intérieur" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222 msgid "Fix relations" msgstr "Corriger les relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227 msgid "Joined self-overlapping area" msgstr "Ai fusionné une aire superposée sur elle même" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228 msgid "Joined overlapping areas" msgstr "Ai fusionné des aires superposées" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1106,33 +1128,33 @@ "Veuillez vérifier qu'aucune erreur n'a été introduite." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294 msgid "Enter values for all conflicts." msgstr "Entrer des valeurs pour tous les conflits." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295 msgid "Solve Conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310 msgid "Fix tag conflicts" msgstr "Corriger les conflits d’attribut" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471 msgid "Removed Element from Relations" msgstr "Élément supprimé des relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595 msgid "Join Areas: Remove Short Ways" msgstr "Aires jointes: enlever les voies courtes" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611 msgid "Closed Way" msgstr "Chemin fermé" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899 msgid "Remove tags from inner ways" msgstr "Supprime les attributs des chemins internes" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931 msgid "Join Areas Function" msgstr "Fonction de jointure des zones" @@ -1299,5 +1321,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Impossible de déplacer des objets en dehors de la Terre." @@ -1317,5 +1339,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38 msgid "Open..." -msgstr "Ouvrir..." +msgstr "Ouvrir…" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 @@ -1330,10 +1352,10 @@ #, java-format msgid "Opening file ''{0}'' ..." -msgstr "Ouverture du fichier ''{0}''..." +msgstr "Ouverture du fichier ''{0}''…" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40 msgid "Open Location..." -msgstr "Ouvrir un emplacement..." +msgstr "Ouvrir un emplacement…" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39 @@ -1378,28 +1400,28 @@ msgstr "Télécharger des données" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197 msgid "Orthogonalize Shape" msgstr "Rendre une forme orthogonale" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 msgid "Orthogonalize Shape / Undo" msgstr "Mise en forme orthogonale / Annuler" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Undo orthogonalization for certain nodes" msgstr "Annuler la mise forme orthogonale de certains nœuds" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99 msgid "Orthogonalize / Undo" msgstr "Mise en forme orthogonale / Annuler" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 msgid "" "Orthogonalize Shape / Undo\n" @@ -1411,9 +1433,9 @@ "forme orthogonale" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 msgid "Undo Orthogonalize Shape" msgstr "Annuler la mise en forme orthogonale" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1426,16 +1448,16 @@ "vous continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186 +msgid "Orthogonalize" +msgstr "Orthogonaliser" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203 msgid "Usage" msgstr "Utilisation" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204 msgid "Selected Elements cannot be orthogonalized" msgstr "Les éléments sélectionnés ne peuvent être mis en forme orthogonale" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 -msgid "Orthogonalize" -msgstr "Orthogonaliser" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 @@ -1475,5 +1497,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 msgid "Preferences..." -msgstr "Configuration..." +msgstr "Configuration…" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 @@ -1509,18 +1531,18 @@ msgstr "Impossible de renommer le fichier \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" msgstr "Inverser les chemins" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." msgstr "Inverser la direction de tous les chemins sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 msgid "Please select at least one way." msgstr "Veuillez sélectionner au moins un chemin." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" msgstr "Inverser les chemins" @@ -1529,10 +1551,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 msgid "Save" msgstr "Sauvegarder" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." msgstr "Sauvegarder les données actuelles." @@ -1589,10 +1611,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254 msgid "Save As..." msgstr "Enregistrer sous…" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253 msgid "Save the current data to a new file." msgstr "Sauvegarder les données actuelles dans un nouveau fichier." @@ -1637,6 +1659,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 msgid "Close" @@ -1670,5 +1691,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format msgid "Simplify Way (remove {0} node)" @@ -1734,5 +1755,5 @@ "sélectionner les nœuds au milieu du chemin.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1743,5 +1764,5 @@ "nécessaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1751,5 +1772,5 @@ "chemins.
Vous devriez vérifier cela et le corriger si nécessaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437 #, java-format msgid "Split way {0} into {1} parts" @@ -1783,44 +1804,44 @@ msgstr "Ce nœud n’est pas collé à quelque chose d’autre." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102 msgid "None of these nodes are glued to anything else." msgstr "Aucun de ces nœuds ne sont collés à autre chose." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of this way's nodes are glued to anything else." msgstr "Aucun des nœuds de ce chemin ne sont collés à autre chose." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "The current selection cannot be used for unglueing." msgstr "Rien ne peut être séparé dans la sélection actuelle." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "Select either:" msgstr "Sélectionner au choix :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 msgid "* One tagged node, or" msgstr "* Un nœud taggué, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 msgid "* One node that is used by more than one way, or" msgstr "* Un nœud utilisé par plus d’un chemin, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" + #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1834,9 +1855,9 @@ "sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164 msgid "Unglued Node" msgstr "Nœud séparé" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366 #, java-format msgid "Dupe into {0} nodes" @@ -1844,5 +1865,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1877,10 +1898,10 @@ msgstr "Désélectionner tout (Echap)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" msgstr "Actualiser les données." -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." msgstr "Met à jour les objets dans la couche active depuis le serveur." @@ -1888,14 +1909,14 @@ #. bounds defined? => use the bbox downloader #. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 msgid "Download data" msgstr "Télécharger les données." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 msgid "No current dataset found" msgstr "Pas de jeu de données courant trouvé" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" @@ -1904,9 +1925,9 @@ "courant" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85 msgid "Update selection" msgstr "Mettre à jour la sélection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1915,26 +1936,22 @@ "les données)." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update Selection" msgstr "Mettre à jour la sélection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected objects to update." msgstr "Il n'y a pas d'objets sélectionné à mettre à jour." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "La sélection est vide" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 -msgid "Update objects" -msgstr "Mettre à jour les objets" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload data" msgstr "Envoyer les données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" @@ -1942,5 +1959,5 @@ "OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 #, java-format msgid "" @@ -1951,5 +1968,5 @@ "les résoudre d'abord." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 @@ -1957,149 +1974,7 @@ msgstr "Aucun changement à envoyer." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 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:232 -#, java-format -msgid "Synchronize node {0} only" -msgstr "Synchroniser seulement les noeuds {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format -msgid "Synchronize way {0} only" -msgstr "Synchroniser seulement les chemins {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 -#, java-format -msgid "Synchronize relation {0} only" -msgstr "Synchroniser seulement les relations {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 -msgid "Synchronize entire dataset" -msgstr "Synchroniser tout le jeu de données" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 -#, 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}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " -"{6} to abort and continue editing.
" -msgstr "" -"L’envoi a échoué car le serveur a une version plus " -"récente de l’un de vos nœuds, chemins ou relations.
Le conflit est vient " -"de {0} d’id {1},
le serveur a la " -"version {2}, votre version est la {3}.

Cliquez {4} " -"pour synchroniser uniquement la primitive en conflit.
Cliquez {5}" -" pour synchroniser le jeu de données local entièrement avec le " -"serveur.
Cliquez {6} pour annuler et continuer l’édition." -"
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 -msgid "Conflicts detected" -msgstr "Conflits détectés" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 -#, java-format -msgid "" -"Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click {0}" -" to synchronize the entire local dataset with the server.
Click " -"{1} to abort and continue editing.
" -msgstr "" -"L’envoi a échoué car le serveur aune version plus " -"récente de l’un de vos nœuds, chemins ou relations.

Cliquez " -"{0} pour synchroniser l’ensemble de votre jeu de données local." -"
Cliquez {1} pour annuler et continuer l’édition.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 -#, java-format -msgid "" -"Uploading failed because you''ve been " -"using
changeset {0} which was already closed at {1}.
Please upload " -"again with a new or an existing open changeset." -msgstr "" -"Le téléchargement a échouéparce que vous utilisé " -"le
changeset n° {0} qui a été fermé à {1}.
veuillé télécharger de " -"nouveau avec un nouveau changeset ou avec un changeset existant." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 -msgid "Changeset closed" -msgstr "Ensemble de changement fermé" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "Prépare la résolution de conflits" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 -#, java-format -msgid "Click to download all parent ways for node {0}" -msgstr "Cliquer pour télécharger tous les ways parents du nœud {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 -msgid "Click to cancel and to resume editing the map" -msgstr "Cliquer pour annuler et reprendre l'édition de la carte" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 -#, java-format -msgid "" -"Uploading failed because you tried to delete node {0} " -"which is still in use in way {1}.

Click {2} to " -"download all parent ways of node {0}.
If necessary JOSM will create " -"conflicts which you can resolve in the Conflict Resolution Dialog." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 -msgid "Node still in use" -msgstr "Le nœud est encore utilisé" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 -#, java-format -msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" -"Avertissement : l'entête d'erreur \"{0}\" ne correspond à aucun motif " -"attendu." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 -msgid "Updating primitive" -msgstr "Mise à jour des primitives" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "Envoi des données pour le calque ''{0}''" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 -#, java-format -msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 -#, java-format -msgid "Uploading {0} objects ..." -msgstr "Envoi de {0} objets…" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 -#, java-format -msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 @@ -2235,9 +2110,9 @@ msgstr "Données GPX téléchargées" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82 msgid "Downloading data" msgstr "Téléchargement des données" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94 #, java-format msgid "" @@ -2247,5 +2122,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144 msgid "No data found in this area." msgstr "Pas de donnée trouvée dans cette zone." @@ -2325,7 +2200,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -2343,58 +2218,52 @@ "supprimer tous les objets utilisant cet objet." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Draw" msgstr "Dessiner" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92 msgid "Draw nodes" msgstr "Dessiner des nœuds" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" msgstr "Mode : Desssiner" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -msgid "selected" -msgstr "sélectionné" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 msgid "Cannot add a node outside of the world." msgstr "Impossible d'ajouter un nœud en dehors du monde" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531 msgid "Add node" msgstr "Ajouter un nœud" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 msgid "Add node into way" msgstr "Ajouter un nœud au chemin." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 msgid "Connect existing way to node" msgstr "Connecter le chemin existant au nœud" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 msgid "Add a new node to an existing way" msgstr "Ajouter un nœud à un chemin existant." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Add node into way and connect" msgstr "Ajouter un nœud sur le chemin et le connecter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934 msgid "Create new node." msgstr "Créer un nouveau nœud." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 msgid "Select node under cursor." msgstr "Sélectionner le nœud sous le curseur." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941 #, java-format msgid "Insert new node into way." @@ -2403,14 +2272,14 @@ msgstr[1] "Ajouter un nouveau nœud aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Start new way from last node." msgstr "Commencer un nouveau chemin à partir du dernier nœud." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953 msgid "Continue way from last node." msgstr "Continuer le chemin à partir du dernier nœud." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976 msgid "Finish drawing." msgstr "Terminer le tracé." @@ -2456,18 +2325,19 @@ "audio à ce point." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Sélectionner" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 msgid "Select, move and rotate objects" msgstr "Sélectionner, déplacer et tourner des objets" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 #, java-format msgid "Add and move a virtual new node to way" @@ -2476,17 +2346,17 @@ msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 msgid "Move elements" msgstr "Déplacer des éléments" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move them" msgstr "Les déplacer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Undo move" msgstr "Annuler déplacer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 #, java-format msgid "" @@ -2499,14 +2369,14 @@ "Confirmez-vous ce déplacement massif ?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 msgid "Always move and don't show dialog again" msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" "Relacher le bouton de souris pour sélectionner les objets dans le rectangle." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2515,9 +2385,9 @@ "fusionner avec le nœud le plus proche." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "Release the mouse button to stop rotating." msgstr "Relacher le bouton de souris pour arrêter la rotation." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2530,5 +2400,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416 msgid "Zoom" msgstr "Zoom" @@ -2550,8 +2420,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 msgid "Search..." -msgstr "Recherche..." +msgstr "Recherche…" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search for objects." msgstr "Rechercher des objets." @@ -2641,20 +2511,29 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" -msgstr "user:... - tous les objets modifiés par l'utilisateur" +msgstr "user:… - tous les objets modifiés par l'utilisateur" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -#, fuzzy msgid "user:anonymous - all objects changed by anonymous users" -msgstr "user:... - tous les objets modifiés par l'utilisateur" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" -msgstr "id :... - objet avec l'ID indiqué (0 pour les nouveaux objets)" +msgstr "id :… - objet avec l'ID indiqué (0 pour les nouveaux objets)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:... - objet avec le nombre de nœuds spécifié" +#, fuzzy +msgid "" +"changeset:... - object with given changeset id (0 objects without " +"assigned changeset)" +msgstr "nodes:… - objet avec le nombre de nœuds spécifié" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#, fuzzy +msgid "" +"nodes:... - object with given number of nodes (nodes:count or nodes:" +"min-max)" +msgstr "nodes:… - objet avec le nombre de nœuds spécifié" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2662,21 +2541,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +msgid "" +"timestamp:... - objects with this timestamp (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "modified - all changed objects" msgstr "modified - tous les objets modifiés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "selected - all selected objects" msgstr "selected - tous les objets sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "incomplete - all incomplete objects" msgstr "incomplete - tous les objets incomplets" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "untagged - all untagged objects" msgstr "untagged - tous les objets non étiquetés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "" "child expr - all children of objects matching the expression" @@ -2685,5 +2570,5 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "" "parent expr - all parents of objects matching the expression" @@ -2692,20 +2577,20 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use | or OR to combine with logical or" msgstr "Utilisez | ou OR pour combiner avec le OU logique" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Utilisez \" pour citer des opérateurs (i.e. si la clé contient :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140 msgid "Use ( and ) to group expressions" msgstr "Utilisez ( et ) pour grouper des expressions" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2713,33 +2598,33 @@ msgstr "Filtrez" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Search" msgstr "Chercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Submit filter" msgstr "appliquer le filtre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "Start Search" msgstr "Commencer la recherche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "No match found for ''{0}''" msgstr "Aucun résultat trouvé pour \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278 #, java-format msgid "Nothing found in selection by searching for ''{0}''" @@ -2747,22 +2632,22 @@ "Aucun résultat lors de la recherche dans la sélection en cherchant ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288 #, java-format msgid "Found {0} matches" msgstr "{0} résultats trouvés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 #, java-format msgid "" @@ -2776,5 +2661,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2782,10 +2667,10 @@ "d'utilisation : clé=valeur" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est illégal !" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2794,26 +2679,29 @@ "relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594 #, java-format msgid "Unexpected token: {0}" msgstr "Jeton inattendu : {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 -msgid "Missing arguments for or." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605 +#, fuzzy +msgid "Missing parameter for OR" msgstr "Arguments manquants pour le OU" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 -msgid "Missing argument for not." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627 +#, fuzzy +msgid "Missing right parent" msgstr "Arguments manquants pour le -" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 -msgid "Expected closing parenthesis." -msgstr "Les parenthèses doivent être fermées." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630 +#, fuzzy +msgid "Missing operator for NOT" +msgstr "Arguments manquants pour le OU" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683 #, java-format msgid "" @@ -2822,9 +2710,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 msgid "Wrong number of parameters for nodes operator." msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 #, java-format msgid "" @@ -2836,7 +2724,12 @@ "10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708 +#, fuzzy, java-format +msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu." @@ -2848,9 +2741,9 @@ #, java-format msgid "Contact {0}..." -msgstr "Contact de {0}..." +msgstr "Contact de {0}…" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." -msgstr "Téléchargement..." +msgstr "Téléchargement…" #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63 @@ -2870,45 +2763,31 @@ msgstr "Erreur de communication avec le serveur" -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50 -#, java-format -msgid "" -"Current number of changes exceeds the max. number of changes, current is " -"{0}, max is {1}" -msgstr "" -"Le nombre actuel de changements dépasse le maximum autorisé. Nombre " -"courant : {0}, maximum : {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104 +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 +msgid "Precondition Violation" +msgstr "Violation de la condition prédéfinie" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" +"{0} nœuds dans le chemin {1} excèdent le nombre maximum de nœuds autorisés " +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" msgstr "Violation des capacités de l’API" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, fuzzy, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" -"Attention : troncage automatique de la valeur du champ \"{0}\" sur la " -"primitive supprimée {1}" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, fuzzy, java-format -msgid "" -"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " -"length {2}. Values length is {3}." -msgstr "" -"La longueur de la valeur du champ \"{0}\" de la primitive {1} excède la " -"longueur maximale autorisée {2}. la longueur actuelle est de {3}." - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 -msgid "Precondition Violation" -msgstr "Violation de la condition prédéfinie" - -#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 -#, java-format -msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} nœuds dans le chemin {1} excèdent le nombre maximum de nœuds autorisés " -"{2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2929,5 +2808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 msgid "Relation ..." -msgstr "Relation ..." +msgstr "Relation…" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54 @@ -3023,5 +2902,5 @@ msgstr "Mettre {0}={1} pour {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71 #, java-format msgid "Change relation member role for {0} {1}" @@ -3036,5 +2915,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Double conflict" msgstr "Double conflit" @@ -3137,4 +3016,19 @@ msgstr "Résoudre les conflits de suppression dans {0}" +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41 +#, java-format +msgid "Set the 'modified' flag for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 +#, java-format +msgid "Set the 'modified' flag for way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 +#, java-format +msgid "Set the 'modified' flag for relation {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format @@ -3248,5 +3142,5 @@ msgstr "Appliquer ?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3330,15 +3224,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "Attention : impossible de forcer les préférences pour ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442 #, java-format msgid "Malformed config file at lines {0}" msgstr "Erreur dans le fichier de configuration aux lignes {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451 #, java-format msgid "" @@ -3347,5 +3241,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 #, java-format msgid "" @@ -3354,5 +3248,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3361,5 +3255,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465 #, java-format msgid "" @@ -3368,5 +3262,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 #, java-format msgid "" @@ -3376,5 +3270,5 @@ "préférences par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480 #, java-format msgid "" @@ -3385,5 +3279,5 @@ "fichier par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "" @@ -3392,5 +3286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3402,5 +3296,5 @@ "préférences par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511 #, java-format msgid "" @@ -3409,10 +3303,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547 #, java-format msgid "" @@ -3420,24 +3314,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90 #, java-format msgid "Preferences stored on {0}" msgstr "Préférences sauvegardées sur {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98 #, java-format msgid "Could not upload preferences. Reason: {0}" msgstr "Impossible de charger les préférences. Raison : {0}" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114 msgid "Could not load preferences from server." msgstr "Impossible de charger les préférences depuis le serveur." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208 #, java-format msgid "" @@ -3446,5 +3340,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225 #, java-format msgid "" @@ -3473,5 +3367,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75 #, java-format msgid "Already registered a conflict for primitive ''{0}''." @@ -3493,31 +3387,24 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 -#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 -#, java-format -msgid "Changeset {0}" -msgstr "Ensemble de changements {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195 #, java-format msgid "" @@ -3525,5 +3412,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637 #, java-format msgid "" @@ -3534,27 +3421,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#, java-format +msgid "Missing merge target for object with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241 +#, java-format +msgid "Missing merge target for relation with id {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 #, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 -#, java-format -msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 -#, java-format -msgid "Missing merge target for relation with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 -#, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" @@ -3562,5 +3449,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 #, java-format msgid "" @@ -3572,5 +3459,5 @@ #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" msgid "E" @@ -3578,25 +3465,25 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 msgid "H" msgstr "H" #. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "Text" msgstr "Texte" #. column header: apply filter for children -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "C" msgstr "C" #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "I" msgstr "I" #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "M" msgstr "M" @@ -3604,43 +3491,55 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgid "R" msgstr "R" #. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgid "A" msgstr "A" #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgid "D" msgstr "D" #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402 msgid "A primitive with ID = 0 can't be invisible." msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654 +#, fuzzy, java-format +msgid "Parameter ''{0}'' >= 0 expected, got {1}" +msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656 +#, java-format +msgid "" +"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3648,5 +3547,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031 #, java-format msgid "" @@ -3674,10 +3573,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 -msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3685,7 +3580,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118 #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" @@ -3700,5 +3595,5 @@ #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86 #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." @@ -3715,111 +3610,111 @@ msgid "Parameter {0} not in range 0..{1}. Got ''{2}''." msgstr "" -"le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 +"le paramètre {0} n’est pas dans la plage 0…{1}, il est actuellement de {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232 msgid "Area style way is not closed." msgstr "La zone n'est pas fermée." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "Le multipolygone \"{0}\" n'est pas fermé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Membre \"{0}\" supprimé de la relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Chemin \"{0}\" comporte moins de deux points." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520 msgid "More than one \"from\" way found." msgstr "Plus d'un chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526 msgid "More than one \"to\" way found." msgstr "Plus d'un chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546 msgid "More than one \"via\" found." msgstr "Plus d'un \"via\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551 #, java-format msgid "Unknown role ''{0}''." msgstr "Rôle inconnu \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Type de membre inconnu pour \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560 msgid "No \"from\" way found." msgstr "Pas de chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564 msgid "No \"to\" way found." msgstr "Pas de chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568 msgid "No \"via\" node or way found." msgstr "Pas de noeud ou de chemin \"via\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707 #, java-format msgid "Style for restriction {0} not found." msgstr "Le style de la restriction {0} n'a pas été trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Le chemin intérieur \"{0}\" est à l'extérieur." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-chemin \"{0}\" dans le multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." @@ -3827,38 +3722,30 @@ "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 -msgid "untagged" -msgstr "non étiqueté" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 -msgid "text" -msgstr "texte" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 -msgid "areatext" -msgstr "zone de texte" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Error: {0}" msgstr "Erreur : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249 #, java-format msgid "Warning: {0}" msgstr "Attention : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 msgid "inactive" msgstr "inactif" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "sélectionné" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3867,6 +3754,6 @@ msgstr[1] "nœuds" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3875,7 +3762,8 @@ msgstr[1] "voies" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3884,21 +3772,37 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#. teal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "untagged way" msgstr "chemin non étiqueté" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 +#. dark green +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 msgid "incomplete way" msgstr "chemin incomplet" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#. darker blue +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "arrière-plan" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21 msgid "highlight" msgstr "surligner" + +#. lighteal +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 +msgid "untagged" +msgstr "non étiqueté" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 +msgid "text" +msgstr "texte" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25 +msgid "areatext" +msgstr "zone de texte" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4040,5 +3944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "railway" msgstr "voie ferrée" @@ -4054,7 +3958,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 #, java-format msgid "{0} node" @@ -4070,4 +3974,10 @@ msgstr[1] "{0} membres" +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 +#, java-format +msgid "Changeset {0}" +msgstr "Ensemble de changements {0}" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74 msgid "Precondition violation" @@ -4099,6 +4009,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 msgid "Conflict" msgstr "Conflit" @@ -4112,7 +4022,7 @@ msgstr "Objet effacé" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4163,5 +4073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." -msgstr "texte;texte;..." +msgstr "texte;texte;…" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -4199,74 +4109,74 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nom d’utilisateur" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" msgstr "Mot de passe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 msgid "options" msgstr "Options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Show this help" msgstr "Montrer cette aide" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "Standard unix geometry argument" msgstr "Argument de géométrie standard UNIX" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120 msgid "Download the bounding box" msgstr "Télécharge la zone sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Télécharge l’emplacement donné par l’URL (avec lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122 msgid "Open file (as raw gps, if .gpx)" msgstr "Ouvrir fichier (données brutes gps, si .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123 msgid "Download the bounding box as raw gps" msgstr "Télécharger la zone sélectionnée en données GPS brut." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Select with the given search" msgstr "Sélectionner avec la recherche actuelle" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125 msgid "Launch in maximized mode" msgstr "Lancer maximisé" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "Reset the preferences to default" msgstr "Rétablir les préférences par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Set the language." msgstr "Définir la langue" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 msgid "options provided as Java system properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 msgid "Change the folder for all user settings" msgstr "Changer le répertoire pour tous les paramètres utilisateur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4278,9 +4188,9 @@ " pour augmenter la taille maximale de mémoire allouée" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "examples" msgstr "exemples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -4291,36 +4201,36 @@ "sur d’avoir chargé des données avant --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 msgid "Instead of --download= you may specify osm://\n" msgstr "Au lieu de --download= vous devriez indiquer osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Activating updated plugins" msgstr "Activation des greffons mis à jour" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Loading early plugins" msgstr "Chargement des premiers greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Setting defaults" msgstr "Régalage des valeurs par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161 msgid "Loading plugins" msgstr "Chargement des greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "L’option {0} a été supprimée car elle n’est plus utilisée." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "File" msgstr "Fichier" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -4335,22 +4245,22 @@ msgstr "Édition" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "Outils" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Balises" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format @@ -4358,5 +4268,5 @@ msgstr "Menu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 msgid "Audio" msgstr "Audio" @@ -4435,13 +4345,14 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121 msgid "User:" msgstr "Utilisateur :" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391 msgid "Layer not in list." msgstr "le calque n’est pas dans la liste." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4477,5 +4388,5 @@ msgstr "Initialisation" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 msgid "" "Please confirm to remove 1 object from 1 " @@ -4485,6 +4396,6 @@ "depuis1 relation." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154 #, java-format msgid "" @@ -4493,5 +4404,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156 #, java-format msgid "" @@ -4502,5 +4413,5 @@ "depuis{1} relation." -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165 #, java-format msgid "Deleting {0} object" @@ -4509,25 +4420,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167 msgid "Delete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4535,9 +4446,9 @@ msgstr "Rôle" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352 msgid "Click to close the dialog and remove the object from the relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" @@ -4569,11 +4480,11 @@ msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "Properties" msgstr "Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 @@ -4582,6 +4493,6 @@ msgstr "Étiquettes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4589,6 +4500,6 @@ msgstr "Nœuds" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4596,23 +4507,23 @@ msgstr "Membres" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" msgstr "Aucun conflit d’attribut n'est résolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" msgstr "Étiquettes ({0} conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} conflit(s) d’attribut à résoudre" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Nodes(resolved)" msgstr "Nœuds (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4621,17 +4532,17 @@ "la liste de nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Nodes(with conflicts)" msgstr "Nœuds (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "Conflits à résoudre dans la liste des nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Members(resolved)" msgstr "Membres (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4641,21 +4552,21 @@ "dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Members(with conflicts)" msgstr "Membres (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "Conflits à résoudre dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "No pending property conflicts" msgstr "Pas de conflit de propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Properties(with conflicts)" msgstr "Propriétés (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "Des conflits de propriété sont en attente de résolution" @@ -4687,22 +4598,22 @@ msgstr "élément {0} non trouvé dans la liste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217 msgid "lock scrolling" msgstr "figer le défilement" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225 msgid "Compare " msgstr "Comparer " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Ma version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Liste des éléments de mon jeu de données, i.e. les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4710,5 +4621,5 @@ msgstr "Version fusionnée" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4718,31 +4629,31 @@ "décisions de fusion seront appliquées." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Leur version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 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" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405 msgid "> top" msgstr "> haut" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407 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" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432 msgid "> bottom" msgstr "> bas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" "Copier mes éléments sélectionnés à la fin de la liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4752,5 +4663,5 @@ "liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4760,5 +4671,5 @@ "liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4767,5 +4678,5 @@ "fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4773,5 +4684,5 @@ "fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4781,5 +4692,5 @@ "la liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4789,23 +4700,23 @@ "la liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "Monter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626 msgid "Move up the selected elements by one position." msgstr "Remonter les éléments sélectionnés d'un cran" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "Descendre" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658 msgid "Move down the selected entries by one position." msgstr "Descendre les éléments sélectionnés d'un cran" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4816,27 +4727,27 @@ msgstr "Supprimer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690 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" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756 +msgid "Freeze" +msgstr "Figer" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 -msgid "Freeze" -msgstr "Figer" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Fige la liste courante des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752 msgid "Unfreeze" msgstr "Libérer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze the list of merged elements and start merging." msgstr "Libérer la liste courante des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778 #, java-format msgid "" @@ -4847,5 +4758,5 @@ "éléments avec les miens" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783 #, java-format msgid "" @@ -4856,5 +4767,5 @@ "avec les miens" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801 #, java-format msgid "My version ({0} entry)" @@ -4863,5 +4774,5 @@ msgstr[1] "Ma version ({0} éléments)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "Merged version ({0} entry)" @@ -4870,5 +4781,5 @@ msgstr[1] "Version fusionnée ({0} éléments)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Their version ({0} entry)" @@ -4877,5 +4788,5 @@ msgstr[1] "Leur version ({0} éléments)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4885,5 +4796,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -5134,10 +5045,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -5147,10 +5058,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5235,9 +5146,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply" msgstr "Appliquer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5245,6 +5156,6 @@ msgstr "rien" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 -#: build/trans_presets.java:2301 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: build/trans_presets.java:2290 msgid "all" msgstr "all" @@ -5333,7 +5244,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 #, java-format msgid "{0} way" @@ -5343,6 +5254,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 #, java-format msgid "{0} relation" @@ -5450,4 +5361,58 @@ msgstr "Monter seulement les attributs avec des conflits" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130 +#, fuzzy +msgid "For selected objects only" +msgstr "Supprimer les objets sélectionnés." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131 +msgid "" +"Select to show changesets for the currently selected objects only." +"
Unselect to show all changesets for objects in the current data layer." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +#, fuzzy +msgid "Changesets" +msgstr "Ensemble de changement" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221 +#, fuzzy +msgid "Open the list of changesets in the current layer." +msgstr "Charger la liste de vos ensembles de changements depuis le serveur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266 +#, fuzzy +msgid "Select all objects assigned to the currently selected changesets" +msgstr "Fermer l'ensemble de changements actuellement ouvert" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 +msgid "Download" +msgstr "Téléchargement" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326 +#, fuzzy +msgid "Download information about the selected changesets from the OSM server" +msgstr "Télécharger des données depuis le serveur OSM." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361 +#, fuzzy +msgid "Closes the selected open changesets" +msgstr "Fermer les ensembles de changements sélectionnés" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178 +msgid "Show info" +msgstr "Afficher les informations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393 +#, fuzzy +msgid "Open a web page for each selected changeset" +msgstr "Ouvrir un éditeur pour la relation sélectionnée" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -5461,12 +5426,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5484,13 +5449,13 @@ msgstr "Pile de commande : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "Resolve conflicts." msgstr "Résoudre les conflits." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336 msgid "Resolve" msgstr "Résoudre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5498,6 +5463,6 @@ "liste ci-dessus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" @@ -5507,25 +5472,25 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 msgid "Cancel conflict resolution and close the dialog" msgstr "Annule la résolution de conflits et ferme la boite de dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Apply resolved conflicts and close the dialog" msgstr "Applique la résolution de conflits et ferme la boite de dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply Resolution" msgstr "Appliquer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 msgid "Close anyway" msgstr "Fermer quand même" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Continue resolving" msgstr "Continuer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 #, java-format msgid "" @@ -5537,26 +5502,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Conflict not resolved completely" msgstr "Conflit partiellement résolu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 msgid "Resolve conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Résoudre les conflits pour ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5567,41 +5532,41 @@ msgstr "Ajouter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 msgid "Add filter." msgstr "Ajouter un filtre." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 msgid "Edit filter." msgstr "Éditer le filtre." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 msgid "Delete filter." msgstr "Supprimer le filtre." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Move filter up." msgstr "Déplacer le filtre vers le haut." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Move filter down." msgstr "Déplacer le filtre vers le bas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Enable filter" msgstr "Activer le filtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 msgid "Hide elements" msgstr "Cacher les éléments" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Apply also for children" msgstr "Appliquer aussi pour les enfants" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Inverse filter" msgstr "Inverser le filtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Filter mode" msgstr "Mode filtre" @@ -5640,5 +5605,5 @@ msgstr "Afficher l'historique de l'élément sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" @@ -5653,34 +5618,34 @@ msgstr "Ouvrir une liste de tous les calques chargés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270 msgid "Delete the selected layer." msgstr "Supprimer le calque sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340 msgid "Show/Hide" msgstr "Montrer/Cacher" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351 msgid "Toggle visible state of the selected layer." msgstr "Bascule l'état de visibilité du calque sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Activer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393 msgid "Activate the selected layer" msgstr "Active la couche sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 msgid "Merge this layer into another layer" msgstr "Fusionne cette couche dans une autre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567 msgid "Move the selected layer one row up." msgstr "Déplacer le calque sélectionné un niveau vers le haut." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586 msgid "Move the selected layer one row down." msgstr "Déplacer le calque sélectionné un niveau vers le bas." @@ -5690,5 +5655,180 @@ msgstr "Informations à propos du calque." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#. item "Land use/Quarry" text "Name" +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171 +#: build/trans_presets.java:3154 +msgid "Relations" +msgstr "Relations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +msgid "Open a list of all relations." +msgstr "Ouvrir une liste de toutes les relations." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169 +#, java-format +msgid "Relations: {0}" +msgstr "Relations : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263 +msgid "Open an editor for the selected relation" +msgstr "Ouvrir un éditeur pour la relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304 +msgid "Delete the selected relation" +msgstr "Supprimer la relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342 +msgid "Create a new relation" +msgstr "Créer une nouvelle relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" +"Créer une copie de cette relation et l'ouvrir dans une nouvelle fenêtre " +"d'édition" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417 +msgid "Set the current selection to the list of selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444 +msgid "Select the members of all selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446 +msgid "Select members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476 +msgid "Download all members of the selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477 +msgid "Download members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +msgid "Current Selection" +msgstr "Sélection actuelle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +msgid "Open a selection list window." +msgstr "Ouvrir une fenêtre de liste de sélection." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 +msgid "Zoom to selected element(s)" +msgstr "Zoomer sur le(s) élément(s) sélectionné(s)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150 +msgid "Zoom to selection" +msgstr "Zoomer sur la sélection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 +#, java-format +msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" +msgstr "Sél.: Rel.:{0}/Chemins:{1}/Nœuds:{2}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +msgid "Selection" +msgstr "Sélection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348 +#, java-format +msgid "Selection: {0}" +msgstr "Sélection : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345 +msgid "Undock the panel" +msgstr "Détacher le panneau" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 +msgid "" +"Close this panel. You can reopen it with the buttons in the left toolbar." +msgstr "" +"Fermer ce panneau. Vous pouvez le réouvrir avec les boutons de la barre " +"d'outils de gauche." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370 +msgid "Click to minimize/maximize the panel content" +msgstr "Cliquer pour minimiser/maximiser le contenu du panneau" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +msgid "Authors" +msgstr "Auteurs" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 +msgid "Open a list of people working on the selected objects." +msgstr "" +"Ouvrir une liste des personnes travaillant sur les objets sélectionnés." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139 +#, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "{0} Auteur" +msgstr[1] "{0} Auteurs" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148 +msgid "Select primitives submitted by this user" +msgstr "Sélectionner les primitives envoyées par cet utilisateur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179 +msgid "Launches a browser with information about the user" +msgstr "Ouvrir un navigateur avec les informations sur cet utilisateur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191 +#, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214 +#, java-format +msgid "" +"Failed to create an URL because the encoding ''{0}'' was
was " +"missing on this system." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216 +msgid "Missing encoding" +msgstr "Encodage manquant" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "Author" +msgstr "Auteur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 +msgid "# Objects" +msgstr "# Objets" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 +#, fuzzy, java-format +msgid "{0} [incomplete]" +msgstr "incomplet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +msgid "open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 +#, fuzzy +msgid "closed" +msgstr "voie sans issue" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31 +#, fuzzy +msgid "Download changesets" +msgstr "Téléchargement des ensembles de changement…" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 #, java-format msgid "This will change {0} object." @@ -5697,22 +5837,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354 msgid "Change values?" msgstr "Changer les valeurs ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284 #, java-format msgid "Change properties of up to {0} object" @@ -5721,5 +5861,5 @@ msgstr[1] "Modifier les propriétés de {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327 #, java-format msgid "This will change up to {0} object." @@ -5728,232 +5868,72 @@ msgstr[1] "Cela modifiera {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329 msgid "Please select a key" msgstr "Veuillez sélectionner une clé" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342 msgid "Please select a value" msgstr "Veuillez sélectionner une valeur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432 msgid "Please select the objects you want to change properties for." msgstr "" "Veuillez sélectionner les objets dont vous voulez changer les propriétés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439 msgid "Properties/Memberships" msgstr "Propriétés/Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438 msgid "Properties for selected objects." msgstr "Propriétés des objets sélectionnés." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472 msgid "Member Of" msgstr "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547 msgid "Add Properties" msgstr "Ajouter des Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriétés : {0} / Appartenances : {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776 msgid "Properties / Memberships" msgstr "Propriétés / Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 msgid "Change relation" msgstr "Changer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813 msgid "Delete from relation" msgstr "Supprimer de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Supprimer vraiment la sélection de la relation {0} ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833 msgid "Delete the selected key in all objects" msgstr "Supprimer la clé sélectionnée de tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835 msgid "Delete Properties" msgstr "Supprimer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 msgid "Add a new key/value pair to all objects" msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878 msgid "Edit the value of the selected key for all objects" msgstr "Éditer la valeur de la clé selectionnée pour tous les objets" - -#. item "Land use/Quarry" text "Name" -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 -#: build/trans_presets.java:3151 -msgid "Relations" -msgstr "Relations" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 -msgid "Open a list of all relations." -msgstr "Ouvrir une liste de toutes les relations." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 -#, java-format -msgid "Relations: {0}" -msgstr "Relations : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270 -msgid "Open an editor for the selected relation" -msgstr "Ouvrir un éditeur pour la relation sélectionnée" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311 -msgid "Delete the selected relation" -msgstr "Supprimer la relation sélectionnée" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 -msgid "Create a new relation" -msgstr "Créer une nouvelle relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 -msgid "Create a copy of this relation and open it in another editor window" -msgstr "" -"Créer une copie de cette relation et l'ouvrir dans une nouvelle fenêtre " -"d'édition" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 -msgid "Set the current selection to the list of selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 -msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453 -msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 -msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484 -msgid "Download members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -msgid "Current Selection" -msgstr "Sélection actuelle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 -msgid "Open a selection list window." -msgstr "Ouvrir une fenêtre de liste de sélection." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 -msgid "Zoom to selected element(s)" -msgstr "Zoomer sur le(s) élément(s) sélectionné(s)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152 -msgid "Zoom to selection" -msgstr "Zoomer sur la sélection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 -#, java-format -msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -msgstr "Sél.: Rel.:{0}/Chemins:{1}/Nœuds:{2}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -msgid "Selection" -msgstr "Sélection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 -#, java-format -msgid "Selection: {0}" -msgstr "Sélection : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 -msgid "Undock the panel" -msgstr "Détacher le panneau" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 -msgid "" -"Close this panel. You can reopen it with the buttons in the left toolbar." -msgstr "" -"Fermer ce panneau. Vous pouvez le réouvrir avec les boutons de la barre " -"d'outils de gauche." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 -msgid "Click to minimize/maximize the panel content" -msgstr "Cliquer pour minimiser/maximiser le contenu du panneau" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135 -msgid "Authors" -msgstr "Auteurs" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -msgid "Open a list of people working on the selected objects." -msgstr "" -"Ouvrir une liste des personnes travaillant sur les objets sélectionnés." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, java-format -msgid "{0} Author" -msgid_plural "{0} Authors" -msgstr[0] "{0} Auteur" -msgstr[1] "{0} Auteurs" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 -msgid "Select primitives submitted by this user" -msgstr "Sélectionner les primitives envoyées par cet utilisateur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 -msgid "Show info" -msgstr "Afficher les informations" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -msgid "Launches a browser with information about the user" -msgstr "Ouvrir un navigateur avec les informations sur cet utilisateur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 -#, java-format -msgid "" -"Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 -#, java-format -msgid "" -"Failed to create an URL because the encoding ''{0}'' was
was " -"missing on this system." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 -msgid "Missing encoding" -msgstr "Encodage manquant" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "Author" -msgstr "Auteur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 -msgid "# Objects" -msgstr "# Objets" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 @@ -6018,19 +5998,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 -#, fuzzy, java-format +#, java-format msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "Téléchargement de la relation ''{0}''" -msgstr[1] "Téléchargement de la relation ''{0}''" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 -#, fuzzy msgid "Download relations" -msgstr "télécharger les membres de la relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 -#, fuzzy, java-format +#, java-format msgid "({0}/{1}: Downloading relation ''{2}''..." -msgstr "Téléchargement de la relation ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 @@ -6048,14 +6027,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#, fuzzy msgid "Apply Role:" -msgstr "Appliquer le rôle" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 -#, fuzzy msgid "Enter a role and apply it to the selected relation members" -msgstr "Définir un rôle pour les membres sélectionnés" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567 msgid "" "There is at least one member in this relation referring
to the " @@ -6068,14 +6045,14 @@ "circulaires ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574 msgid "Ignore them, leave relation as is" msgstr "Les ignorer, laisser la relation telle quelle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597 #, java-format msgid "" @@ -6085,9 +6062,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625 #, java-format msgid "" @@ -6097,5 +6074,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -6104,5 +6081,5 @@ "premier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -6111,5 +6088,5 @@ "dernier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -6117,5 +6094,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -6123,20 +6100,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788 msgid "Relation Editor: Remove Selected" msgstr "Éditeur de relation : supprimer la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832 #, java-format msgid "" @@ -6145,70 +6122,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876 msgid "Sort the relation members" msgstr "trier les membres de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 msgid "Sort" -msgstr "Sport" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879 msgid "Relation Editor: Sort" msgstr "éditeur de relation : trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899 msgid "Move the currently selected members up" msgstr "Déplacer les membres sélectionnés vers le haut" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Relation Editor: Move Up" msgstr "Éditeur de relation : déplacer vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "Move the currently selected members down" msgstr "Déplacer les membres sélectionnés vers le bas" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921 msgid "Relation Editor: Move Down" msgstr "Éditeur de relation : déplacer vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937 msgid "Remove the currently selected members from this relation" msgstr "Supprimer le membre actuellement sélectionné de cette relation." #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Relation Editor: Remove" msgstr "éditeur de relation : supprimer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956 msgid "Delete the currently edited relation" msgstr "Supprimer la relation actuellement éditée." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 msgid "Yes, create a conflict and close" msgstr "Oui, créer un conflit et fermer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052 msgid "No, continue editing" msgstr "Non, continuer à éditer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6217,9 +6193,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 msgid "Conflict in data" msgstr "Conflit dans les données." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 #, java-format msgid "" @@ -6228,49 +6204,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 msgid "Apply the current updates" msgstr "Appliquer les mises-à-jour suivantes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Apply the updates and close the dialog" msgstr "Appliquer les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 msgid "Cancel the updates and close the dialog" msgstr "Annuler les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176 msgid "Add an empty tag" msgstr "Ajouter un attribut vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Download all incomplete members" -msgstr "télécharger les membres de la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227 msgid "Relation Editor: Download Members" msgstr "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Download selected incomplete members" -msgstr "télécharger les membres de la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Sets a role for the selected members" msgstr "Définir un rôle pour les membres sélectionnés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265 msgid "Apply Role" msgstr "Appliquer le rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 #, java-format msgid "" @@ -6280,34 +6254,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 msgid "Yes, apply it" msgstr "Oui, l'appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "No, don't apply" msgstr "Non, ne pas l'appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Edit the relation the currently selected relation member refers to" msgstr "éditer la relation en référence du membre de relation sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 msgid "Zoom to" msgstr "Zoomer à" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -6424,5 +6398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "" @@ -6430,5 +6404,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "Nom du lieu" @@ -6438,5 +6412,5 @@ msgstr "Supprimer le marque-pages actuellement sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "Renommer le marque-pages actuellement sélectionné." @@ -6523,9 +6497,4 @@ msgstr "Télécharger zone" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 -msgid "Download" -msgstr "Téléchargement" - #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215 msgid "No area selected yet" @@ -6583,5 +6552,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." -msgstr "Chercher…" +msgstr "Rechercher…" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 @@ -6828,6 +6797,4 @@ #. item "Car/Wash" label "Edit Car Wash" #. -#. item "Car/Shop" label "Edit Car Shop" -#. #. item "Car/Repair" label "Edit Car Repair" #. @@ -6840,6 +6807,4 @@ #. item "Bicycle/Rental" label "Edit Bicycle Rental" #. -#. item "Bicycle/Shop" label "Edit Bicycle Shop" -#. #. item "Public Transport/Station" label "Edit Station" #. @@ -7110,4 +7075,8 @@ #. item "Amenities/Drinking Water" label "Edit Drinking Water" #. +#. item "Shops/Car Dealer" label "Edit Car Shop" +#. +#. item "Shops/Bike Dealer" label "Edit Bicycle Shop" +#. #. item "Shops/Supermarket" label "Edit Supermarket" #. @@ -7330,5 +7299,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 @@ -7371,116 +7340,116 @@ #: build/trans_presets.java:1384 build/trans_presets.java:1395 #: build/trans_presets.java:1404 build/trans_presets.java:1419 -#: build/trans_presets.java:1426 build/trans_presets.java:1432 -#: build/trans_presets.java:1440 build/trans_presets.java:1447 -#: build/trans_presets.java:1456 build/trans_presets.java:1464 -#: build/trans_presets.java:1471 build/trans_presets.java:1482 -#: build/trans_presets.java:1492 build/trans_presets.java:1502 -#: build/trans_presets.java:1522 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1562 -#: build/trans_presets.java:1569 build/trans_presets.java:1585 -#: build/trans_presets.java:1592 build/trans_presets.java:1597 +#: build/trans_presets.java:1425 build/trans_presets.java:1433 +#: build/trans_presets.java:1440 build/trans_presets.java:1449 +#: build/trans_presets.java:1457 build/trans_presets.java:1468 +#: build/trans_presets.java:1478 build/trans_presets.java:1488 +#: build/trans_presets.java:1508 build/trans_presets.java:1520 +#: build/trans_presets.java:1531 build/trans_presets.java:1551 +#: build/trans_presets.java:1558 build/trans_presets.java:1574 +#: build/trans_presets.java:1581 build/trans_presets.java:1586 +#: build/trans_presets.java:1592 build/trans_presets.java:1598 #: build/trans_presets.java:1603 build/trans_presets.java:1609 -#: build/trans_presets.java:1614 build/trans_presets.java:1620 -#: build/trans_presets.java:1626 build/trans_presets.java:1634 -#: build/trans_presets.java:1642 build/trans_presets.java:1650 -#: build/trans_presets.java:1657 build/trans_presets.java:1663 -#: build/trans_presets.java:1670 build/trans_presets.java:1677 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1700 build/trans_presets.java:1707 -#: build/trans_presets.java:1713 build/trans_presets.java:1720 -#: build/trans_presets.java:1727 build/trans_presets.java:1734 -#: build/trans_presets.java:1751 build/trans_presets.java:1759 -#: build/trans_presets.java:1774 build/trans_presets.java:1784 -#: build/trans_presets.java:1796 build/trans_presets.java:1803 -#: build/trans_presets.java:1809 build/trans_presets.java:1819 -#: build/trans_presets.java:1824 build/trans_presets.java:1832 -#: build/trans_presets.java:1839 build/trans_presets.java:1845 -#: build/trans_presets.java:1851 build/trans_presets.java:1857 -#: build/trans_presets.java:1862 build/trans_presets.java:1867 -#: build/trans_presets.java:1872 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1890 -#: build/trans_presets.java:1899 build/trans_presets.java:1908 -#: build/trans_presets.java:1917 build/trans_presets.java:1926 -#: build/trans_presets.java:1935 build/trans_presets.java:1941 -#: build/trans_presets.java:1949 build/trans_presets.java:1955 -#: build/trans_presets.java:1961 build/trans_presets.java:1967 -#: build/trans_presets.java:1973 build/trans_presets.java:1979 -#: build/trans_presets.java:1985 build/trans_presets.java:1991 -#: build/trans_presets.java:1997 build/trans_presets.java:2003 -#: build/trans_presets.java:2009 build/trans_presets.java:2015 -#: build/trans_presets.java:2021 build/trans_presets.java:2027 -#: build/trans_presets.java:2033 build/trans_presets.java:2040 -#: build/trans_presets.java:2049 build/trans_presets.java:2057 -#: build/trans_presets.java:2063 build/trans_presets.java:2069 -#: build/trans_presets.java:2075 build/trans_presets.java:2081 -#: build/trans_presets.java:2087 build/trans_presets.java:2093 -#: build/trans_presets.java:2099 build/trans_presets.java:2105 -#: build/trans_presets.java:2111 build/trans_presets.java:2117 -#: build/trans_presets.java:2123 build/trans_presets.java:2129 -#: build/trans_presets.java:2135 build/trans_presets.java:2141 -#: build/trans_presets.java:2147 build/trans_presets.java:2153 -#: build/trans_presets.java:2167 build/trans_presets.java:2173 -#: build/trans_presets.java:2179 build/trans_presets.java:2186 -#: build/trans_presets.java:2193 build/trans_presets.java:2201 -#: build/trans_presets.java:2208 build/trans_presets.java:2214 -#: build/trans_presets.java:2221 build/trans_presets.java:2227 -#: build/trans_presets.java:2233 build/trans_presets.java:2239 -#: build/trans_presets.java:2247 build/trans_presets.java:2254 -#: build/trans_presets.java:2261 build/trans_presets.java:2268 -#: build/trans_presets.java:2276 build/trans_presets.java:2308 -#: build/trans_presets.java:2313 build/trans_presets.java:2323 -#: build/trans_presets.java:2328 build/trans_presets.java:2334 -#: build/trans_presets.java:2340 build/trans_presets.java:2357 -#: build/trans_presets.java:2363 build/trans_presets.java:2369 -#: build/trans_presets.java:2375 build/trans_presets.java:2381 -#: build/trans_presets.java:2391 build/trans_presets.java:2398 -#: build/trans_presets.java:2492 build/trans_presets.java:2499 -#: build/trans_presets.java:2513 build/trans_presets.java:2519 -#: build/trans_presets.java:2526 build/trans_presets.java:2533 -#: build/trans_presets.java:2539 build/trans_presets.java:2545 -#: build/trans_presets.java:2567 build/trans_presets.java:2574 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2594 build/trans_presets.java:2600 -#: build/trans_presets.java:2606 build/trans_presets.java:2612 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2631 build/trans_presets.java:2638 -#: build/trans_presets.java:2645 build/trans_presets.java:2651 -#: build/trans_presets.java:2657 build/trans_presets.java:2663 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2682 build/trans_presets.java:2689 -#: build/trans_presets.java:2696 build/trans_presets.java:2702 -#: build/trans_presets.java:2708 build/trans_presets.java:2718 -#: build/trans_presets.java:2727 build/trans_presets.java:2742 -#: build/trans_presets.java:2748 build/trans_presets.java:2756 -#: build/trans_presets.java:2763 build/trans_presets.java:2783 -#: build/trans_presets.java:2794 build/trans_presets.java:2800 -#: build/trans_presets.java:2806 build/trans_presets.java:2812 -#: build/trans_presets.java:2818 build/trans_presets.java:2825 -#: build/trans_presets.java:2832 build/trans_presets.java:2839 -#: build/trans_presets.java:2845 build/trans_presets.java:2851 -#: build/trans_presets.java:2859 build/trans_presets.java:2866 -#: build/trans_presets.java:2873 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2893 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2915 build/trans_presets.java:2921 -#: build/trans_presets.java:2927 build/trans_presets.java:2933 -#: build/trans_presets.java:2942 build/trans_presets.java:2952 -#: build/trans_presets.java:2961 build/trans_presets.java:2967 -#: build/trans_presets.java:2973 build/trans_presets.java:2978 -#: build/trans_presets.java:2984 build/trans_presets.java:2990 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3042 -#: build/trans_presets.java:3048 build/trans_presets.java:3053 -#: build/trans_presets.java:3060 build/trans_presets.java:3067 -#: build/trans_presets.java:3073 build/trans_presets.java:3082 -#: build/trans_presets.java:3090 build/trans_presets.java:3096 -#: build/trans_presets.java:3102 build/trans_presets.java:3109 -#: build/trans_presets.java:3115 build/trans_presets.java:3122 -#: build/trans_presets.java:3128 build/trans_presets.java:3134 -#: build/trans_presets.java:3140 build/trans_presets.java:3146 -#: build/trans_presets.java:3159 build/trans_presets.java:3173 -#: build/trans_presets.java:3187 +#: build/trans_presets.java:1615 build/trans_presets.java:1623 +#: build/trans_presets.java:1631 build/trans_presets.java:1639 +#: build/trans_presets.java:1646 build/trans_presets.java:1652 +#: build/trans_presets.java:1659 build/trans_presets.java:1666 +#: build/trans_presets.java:1674 build/trans_presets.java:1681 +#: build/trans_presets.java:1689 build/trans_presets.java:1696 +#: build/trans_presets.java:1702 build/trans_presets.java:1709 +#: build/trans_presets.java:1716 build/trans_presets.java:1723 +#: build/trans_presets.java:1740 build/trans_presets.java:1748 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:1785 build/trans_presets.java:1792 +#: build/trans_presets.java:1798 build/trans_presets.java:1808 +#: build/trans_presets.java:1813 build/trans_presets.java:1821 +#: build/trans_presets.java:1828 build/trans_presets.java:1834 +#: build/trans_presets.java:1840 build/trans_presets.java:1846 +#: build/trans_presets.java:1851 build/trans_presets.java:1856 +#: build/trans_presets.java:1861 build/trans_presets.java:1868 +#: build/trans_presets.java:1874 build/trans_presets.java:1879 +#: build/trans_presets.java:1888 build/trans_presets.java:1897 +#: build/trans_presets.java:1906 build/trans_presets.java:1915 +#: build/trans_presets.java:1924 build/trans_presets.java:1930 +#: build/trans_presets.java:1938 build/trans_presets.java:1944 +#: build/trans_presets.java:1950 build/trans_presets.java:1956 +#: build/trans_presets.java:1962 build/trans_presets.java:1968 +#: build/trans_presets.java:1974 build/trans_presets.java:1980 +#: build/trans_presets.java:1986 build/trans_presets.java:1992 +#: build/trans_presets.java:1998 build/trans_presets.java:2004 +#: build/trans_presets.java:2010 build/trans_presets.java:2016 +#: build/trans_presets.java:2022 build/trans_presets.java:2029 +#: build/trans_presets.java:2038 build/trans_presets.java:2046 +#: build/trans_presets.java:2052 build/trans_presets.java:2058 +#: build/trans_presets.java:2064 build/trans_presets.java:2070 +#: build/trans_presets.java:2076 build/trans_presets.java:2082 +#: build/trans_presets.java:2088 build/trans_presets.java:2094 +#: build/trans_presets.java:2100 build/trans_presets.java:2106 +#: build/trans_presets.java:2112 build/trans_presets.java:2118 +#: build/trans_presets.java:2124 build/trans_presets.java:2130 +#: build/trans_presets.java:2136 build/trans_presets.java:2142 +#: build/trans_presets.java:2156 build/trans_presets.java:2162 +#: build/trans_presets.java:2168 build/trans_presets.java:2175 +#: build/trans_presets.java:2182 build/trans_presets.java:2190 +#: build/trans_presets.java:2197 build/trans_presets.java:2203 +#: build/trans_presets.java:2210 build/trans_presets.java:2216 +#: build/trans_presets.java:2222 build/trans_presets.java:2228 +#: build/trans_presets.java:2236 build/trans_presets.java:2243 +#: build/trans_presets.java:2250 build/trans_presets.java:2257 +#: build/trans_presets.java:2265 build/trans_presets.java:2297 +#: build/trans_presets.java:2302 build/trans_presets.java:2312 +#: build/trans_presets.java:2317 build/trans_presets.java:2323 +#: build/trans_presets.java:2329 build/trans_presets.java:2346 +#: build/trans_presets.java:2352 build/trans_presets.java:2358 +#: build/trans_presets.java:2364 build/trans_presets.java:2370 +#: build/trans_presets.java:2380 build/trans_presets.java:2387 +#: build/trans_presets.java:2481 build/trans_presets.java:2488 +#: build/trans_presets.java:2503 build/trans_presets.java:2511 +#: build/trans_presets.java:2516 build/trans_presets.java:2522 +#: build/trans_presets.java:2529 build/trans_presets.java:2536 +#: build/trans_presets.java:2542 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2577 +#: build/trans_presets.java:2584 build/trans_presets.java:2590 +#: build/trans_presets.java:2597 build/trans_presets.java:2603 +#: build/trans_presets.java:2609 build/trans_presets.java:2615 +#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2634 build/trans_presets.java:2641 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2672 build/trans_presets.java:2678 +#: build/trans_presets.java:2685 build/trans_presets.java:2692 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2721 +#: build/trans_presets.java:2730 build/trans_presets.java:2745 +#: build/trans_presets.java:2751 build/trans_presets.java:2759 +#: build/trans_presets.java:2766 build/trans_presets.java:2786 +#: build/trans_presets.java:2797 build/trans_presets.java:2803 +#: build/trans_presets.java:2809 build/trans_presets.java:2815 +#: build/trans_presets.java:2821 build/trans_presets.java:2828 +#: build/trans_presets.java:2835 build/trans_presets.java:2842 +#: build/trans_presets.java:2848 build/trans_presets.java:2854 +#: build/trans_presets.java:2862 build/trans_presets.java:2869 +#: build/trans_presets.java:2876 build/trans_presets.java:2883 +#: build/trans_presets.java:2889 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2912 +#: build/trans_presets.java:2918 build/trans_presets.java:2924 +#: build/trans_presets.java:2930 build/trans_presets.java:2936 +#: build/trans_presets.java:2945 build/trans_presets.java:2955 +#: build/trans_presets.java:2964 build/trans_presets.java:2970 +#: build/trans_presets.java:2976 build/trans_presets.java:2981 +#: build/trans_presets.java:2987 build/trans_presets.java:2993 +#: build/trans_presets.java:3002 build/trans_presets.java:3008 +#: build/trans_presets.java:3014 build/trans_presets.java:3020 +#: build/trans_presets.java:3026 build/trans_presets.java:3032 +#: build/trans_presets.java:3038 build/trans_presets.java:3045 +#: build/trans_presets.java:3051 build/trans_presets.java:3056 +#: build/trans_presets.java:3063 build/trans_presets.java:3070 +#: build/trans_presets.java:3076 build/trans_presets.java:3085 +#: build/trans_presets.java:3093 build/trans_presets.java:3099 +#: build/trans_presets.java:3105 build/trans_presets.java:3112 +#: build/trans_presets.java:3118 build/trans_presets.java:3125 +#: build/trans_presets.java:3131 build/trans_presets.java:3137 +#: build/trans_presets.java:3143 build/trans_presets.java:3149 +#: build/trans_presets.java:3162 build/trans_presets.java:3176 +#: build/trans_presets.java:3190 msgid "Name" msgstr "Nom" @@ -7504,15 +7473,15 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 -#: build/trans_presets.java:1406 build/trans_presets.java:2348 -#: build/trans_presets.java:2390 build/trans_presets.java:2416 -#: build/trans_presets.java:2943 build/trans_presets.java:2953 -#: build/trans_presets.java:2962 +#: build/trans_presets.java:1406 build/trans_presets.java:2337 +#: build/trans_presets.java:2379 build/trans_presets.java:2405 +#: build/trans_presets.java:2946 build/trans_presets.java:2956 +#: build/trans_presets.java:2965 msgid "Type" msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408 msgid "Near" msgstr "Près" @@ -7687,5 +7656,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" @@ -7693,6 +7662,6 @@ "primitive." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311 #, java-format msgid "" @@ -7700,5 +7669,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 #, java-format msgid "" @@ -7708,5 +7677,5 @@ "pas disponible dans l’historique" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 msgid "History not initialized yet. Failed to set current primitive." msgstr "" @@ -7714,5 +7683,5 @@ "courante." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314 #, java-format msgid "" @@ -7829,6 +7798,6 @@ #: build/trans_presets.java:800 build/trans_presets.java:1344 #: build/trans_presets.java:1411 build/trans_presets.java:1412 -#: build/trans_presets.java:1413 build/trans_presets.java:2483 -#: build/trans_presets.java:2484 build/trans_presets.java:2485 +#: build/trans_presets.java:1413 build/trans_presets.java:2472 +#: build/trans_presets.java:2473 build/trans_presets.java:2474 msgid "unknown" msgstr "inconnu" @@ -7850,14 +7819,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 msgid "Changeset info" msgstr "Informations sur l'ensemble de changements" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Launch browser with information about the changeset" msgstr "" "Lancer un navigateur avec les informations sur l'ensemble de changements" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139 #, java-format msgid "Show changeset {0}" @@ -7892,4 +7861,134 @@ msgstr "Version" +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer is null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 +#, java-format +msgid "" +"Failed to update primitive with id {0} because current edit layer doesn't " +"include such a primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 +#, java-format +msgid "Synchronize node {0} only" +msgstr "Synchroniser seulement les noeuds {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 +#, java-format +msgid "Synchronize way {0} only" +msgstr "Synchroniser seulement les chemins {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96 +#, java-format +msgid "Synchronize relation {0} only" +msgstr "Synchroniser seulement les relations {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 +msgid "Synchronize entire dataset" +msgstr "Synchroniser tout le jeu de données" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 +#, 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}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" +"L’envoi a échoué car le serveur a une version plus " +"récente de l’un de vos nœuds, chemins ou relations.
Le conflit est vient " +"de {0} d’id {1},
le serveur a la " +"version {2}, votre version est la {3}.

Cliquez {4} " +"pour synchroniser uniquement la primitive en conflit.
Cliquez {5}" +" pour synchroniser le jeu de données local entièrement avec le " +"serveur.
Cliquez {6} pour annuler et continuer l’édition." +"
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +msgid "Conflicts detected" +msgstr "Conflits détectés" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" +"L’envoi a échoué car le serveur aune version plus " +"récente de l’un de vos nœuds, chemins ou relations.

Cliquez " +"{0} pour synchroniser l’ensemble de votre jeu de données local." +"
Cliquez {1} pour annuler et continuer l’édition.
" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194 +#, java-format +msgid "" +"Uploading failed because you''ve been " +"using
changeset {0} which was already closed at {1}.
Please upload " +"again with a new or an existing open changeset." +msgstr "" +"Le téléchargement a échouéparce que vous utilisé " +"le
changeset n° {0} qui a été fermé à {1}.
veuillé télécharger de " +"nouveau avec un nouveau changeset ou avec un changeset existant." + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202 +msgid "Changeset closed" +msgstr "Ensemble de changement fermé" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214 +msgid "Prepare conflict resolution" +msgstr "Prépare la résolution de conflits" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "Cliquer pour télécharger tous les ways parents du nœud {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222 +msgid "Click to cancel and to resume editing the map" +msgstr "Cliquer pour annuler et reprendre l'édition de la carte" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226 +#, java-format +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237 +msgid "Node still in use" +msgstr "Le nœud est encore utilisé" + +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275 +#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" +"Avertissement : l'entête d'erreur \"{0}\" ne correspond à aucun motif " +"attendu." + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" + +#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48 +msgid "Enter an upload comment (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" @@ -7908,5 +8007,42 @@ msgstr "Aucun ensemble de changements ouvert" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87 +#, fuzzy +msgid "Upload to a new changeset" +msgstr "Ouvrir un nouvel ensemble de changements" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88 +msgid "Open a new changeset and use it in the next upload" +msgstr "" +"Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97 +#, fuzzy +msgid "Upload to an existing changeset" +msgstr "Mise à jour de l'ensemble de changements" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 +#, fuzzy +msgid "Upload data to an already existing and open changeset" +msgstr "Envoyer les données vers un ensemble de changements déjà ouvert" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142 +msgid "Close changeset after upload" +msgstr "Fermer l'ensemble de changements après l'envoi" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143 +msgid "Select to close the changeset after the next upload" +msgstr "Fermer l'ensemble de changements après le prochain envoi" + +#. putValue(NAME, tr("Reload")); +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294 +msgid "Load the list of your open changesets from the server" +msgstr "Charger la liste de vos ensembles de changements depuis le serveur" + +#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312 +msgid "Close the currently selected open changeset" +msgstr "Fermer l'ensemble de changements actuellement ouvert" + +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55 msgid "Please select the changesets you want to close" msgstr "" @@ -7914,35 +8050,112 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" msgstr "Ouvrir les ensembles de changements" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" msgstr "Fermer les ensembles de changements" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" msgstr "Fermer les ensembles de changements sélectionnés" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 msgid "Cancel closing of changesets" msgstr "Annuler la fermeture des ensembles de changements" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" msgstr "Fermeture de l'ensemble de changements" -#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" msgstr "Fermeture de l’ensemble de changements {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 +#, fuzzy +msgid "" +"Warning: failed to put Credential Dialog always on top. Caught security " +"exception." +msgstr "" +"Attention : la boîte de dialogue des options n'a pu être affichée au premier " +"plan. L'exception était : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 +msgid "Enter credentials for OSM API" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 +msgid "Enter credentials for HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 +msgid "Save user and password (unencrypted)" +msgstr "Sauvegarder l’utilisateur et le mot de passe (non crypté)" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 +#, fuzzy +msgid "Please enter the user name of your OSM account" +msgstr "Merci d'entrer votre nom d'utilisateur" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 +#, fuzzy +msgid "Please enter the password name of your OSM account" +msgstr "Veuillez entrer des mot-clés liés à votre trace." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 +#, java-format +msgid "" +"Authenticating at the OSM API ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 +msgid "Warning: The password is transferred unencrypted." +msgstr "Attention : Le mot de passe est transféré non-crypté." + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254 +msgid "Please enter the user name for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 +msgid "Please enter the password for authenticating at your proxy server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 +#, java-format +msgid "" +"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid " +"username and a valid password." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 +msgid "" +"Warning: depending on the authentication method the proxy server uses " +"the password may be transferred unencrypted." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279 +#, fuzzy +msgid "Authenticate" +msgstr "Athlétisme" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 +msgid "Authenticate with the supplied username and password" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 +#, fuzzy +msgid "Cancel authentication" +msgstr "Intersection atteinte" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" msgstr "" @@ -8009,21 +8222,21 @@ #, java-format msgid "Saving layer to ''{0}'' ..." -msgstr "Sauvegarde du calque vers ''{0}'' ..." - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113 +msgstr "Sauvegarde du calque vers ''{0}''…" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" "Il y a des changements non enregistrés. - Sauver/Envoyer avant de quitter ?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" "Il y a des changements non enregistrés. - Sauver/Envoyer avant de supprimer ?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 msgid "Uploading and saving modified layers ..." msgstr "Envoi et sauvegarde des calques modifiés…" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 #, java-format msgid "" @@ -8041,9 +8254,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 msgid "Unsaved data and conflicts" msgstr "Il y a des données et des conflits non sauvegardés." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 #, java-format msgid "" @@ -8057,9 +8270,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 msgid "Unsaved data and missing associated file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 #, java-format msgid "" @@ -8074,43 +8287,43 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 msgid "Unsaved data non-writable files" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Annuler et quitter" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." msgstr "" "Quitter JOSM sans sauvegarder. Les changements non-enregistrés seront perdus." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" msgstr "Abandonner et supprimer" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save/Upload and Exit" msgstr "Sauver/Envoyer et Quitter" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" "Quitter JOSM en sauvegardant. Les changements sont envoyés et/ou sauvé." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload and Delete" msgstr "Sauver/Envoyer et Supprimer" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" @@ -8118,10 +8331,10 @@ "enregistrés ne seront pas perdus." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 #, java-format msgid "Preparing layer ''{0}'' for upload ..." msgstr "Préparation du calque \"{0}\" pour l'envoi…" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -8129,5 +8342,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 msgid "Incomplete upload and/or save" msgstr "Envoi et/ou sauvegarde incomplet." @@ -8200,40 +8413,395 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467 msgid "Upload" msgstr "Envoyer" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55 +msgid "Update objects" +msgstr "Mettre à jour les objets" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106 +msgid "Initializing nodes to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122 +msgid "Initializing ways to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131 +msgid "Initializing relations to update ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117 msgid "Settings" msgstr "Paramètres" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118 msgid "Decide how to upload the data and which changeset to use" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 +"Décider comment envoyer les données et quel ensemble de changements utiliser" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453 msgid "Tags of new changeset" -msgstr "Tags du nouvel ensemble de changements" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 +msgstr "Attributs du nouvel ensemble de changements" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122 msgid "Apply tags to the changeset data is uploaded to" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +"Appliquer les attributs à l'ensemble de changements vers lequel les données " +"seront envoyées." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126 +#, fuzzy +msgid "Manage open changesets and select a changeset to upload to" +msgstr "" +"Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +#, fuzzy +msgid "Advanced" +msgstr "avancé" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130 +#, fuzzy +msgid "Configure advanced settings" +msgstr "Configurer les greffons disponibles." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469 +#, fuzzy, java-format +msgid "Upload to ''{0}''" +msgstr "Envoi des données pour le calque ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 +msgid "Upload Changes" +msgstr "Envoyer les changements" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362 +msgid "Upload the changed primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" +"Veuillez entrer un commentaire sur cet ensemble de changements (minimum 3 " +"caractères)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +msgid "Please enter a valid chunk size first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 +msgid "Cancel the upload and resume editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455 +#, java-format +msgid "Tags of changeset {0}" +msgstr "Attributs de la session de modification {0}" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" +"Attention: le primitif \"{0}\" est déjà effacé sur le serveur. Il sera " +"ignoré pour compléter l'envoi." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109 +msgid "Preparing primitives to upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 +msgid "Objects are uploaded to a new changeset." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48 +#, java-format +msgid "" +"Objects are uploaded to the open changeset {0} with upload " +"comment ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54 +msgid "The changeset is going to be closed after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56 +msgid "The changeset is left open after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 +msgid " (configure changeset)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 +#, fuzzy, java-format +msgid "Uploading {0} object to 1 changeset" +msgid_plural "" +"Uploading {0} objects to 1 changeset" +msgstr[0] "" +"Veuillez confirmer la suppression de{0} object " +"depuis{1} relation." +msgstr[1] "" +"Veuillez confirmer la suppression de{0} object " +"depuis{1} relation." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86 +#, java-format +msgid "" +"Uploading {0} object to 1 changeset using " +"1 request" +msgid_plural "" +"Uploading {0} objects to 1 changeset using " +"1 request" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91 +#, java-format +msgid "" +"Uploading {0} objects to 1 changeset using " +"{1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97 +#, java-format +msgid "" +"{0} objects exceed the max. allowed {1} objects in a changeset on the server " +"''{2}''. Please configure how to " +"proceed with multiple changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100 +#, java-format +msgid "" +"Uploading {0} objects to multiple changesets using {1} requests" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "Envoi des données pour le calque ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +msgid "Continue uploading" +msgstr "Continuer à envoyer." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82 +msgid "Click to continue uploading to additional new changesets" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86 +msgid "Go back to Upload Dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88 +#, fuzzy +msgid "Click to return to the Upload Dialog" +msgstr "Cliquer pour fermer la boîte de dialogue." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92 +#, fuzzy +msgid "Abort" +msgstr "À propos" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94 +#, fuzzy +msgid "Click to abort uploading" +msgstr "Clicker pour fusionner les noeuds" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99 +#, java-format +msgid "" +"The server reported that the current changset was closed.
This is most " +"likely because the changesets size exceeded the max. size
of {0} objects " +"on the server ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106 +#, fuzzy, java-format +msgid "There is {0} object to upload left." +msgid_plural "There are {0} objects to upload left." +msgstr[0] "{0} objet à supprimer :" +msgstr[1] "{0} objets à supprimer :" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112 +#, java-format +msgid "" +"Click ''{0}'' to continue uploading to additional new " +"changsets.
Click ''{1}'' to return to the upload dialog." +"
Click ''{2}'' to abort uploading and return to map " +"editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123 +#, fuzzy +msgid "Changeset is full" +msgstr "Informations sur l'ensemble de changements" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Attention : le objet ''{0}'' est déjà supprimé sur le serveur. Ignorez cet " +"objet et retentez l'envoi." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "Object ''{0}'' is already deleted. Skipping object in upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 +#, java-format +msgid "Uploading {0} objects ..." +msgstr "Envoi de {0} objets…" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +msgid "" +"Mark modified objects from the current selection to " +"be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +msgid "" +"Mark locally deleted objects to be deleted on the " +"server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +msgid "Select objects to upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +msgid "Cancel uploading" +msgstr "Annuler l'envoi." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94 +#, fuzzy +msgid "Please select the upload strategy:" +msgstr "Veuillez sélectionnez la rangée à supprimer." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334 +#, java-format +msgid "" +"There are multiple changesets necessary in order to " +"upload {0} objects. What policy shall be used?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 +#, fuzzy +msgid "Fill up one changeset and return to the Upload Dialog" +msgstr "" +"Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 +msgid "Open and use as many new changesets as necessary" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323 +msgid "Upload in one request not possible (too many objects to upload)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 +#, java-format +msgid "" +"Can''t upload {0} objects in one request because the
max. changeset " +"size {1} on server ''{2}'' is exceeded." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419 +#, java-format +msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 +msgid "Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 msgid "Objects to add:" msgstr "Objets à ajouter :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58 msgid "Objects to modify:" msgstr "Objets à modifier :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64 msgid "Objects to delete:" msgstr "Objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95 #, java-format msgid "{0} object to add:" @@ -8242,5 +8810,5 @@ msgstr[1] "{0} objets à ajouter :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104 #, java-format msgid "{0} object to modify:" @@ -8249,5 +8817,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113 #, java-format msgid "{0} object to delete:" @@ -8256,217 +8824,37 @@ msgstr[1] "{0} objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 -msgid "Upload Changes" -msgstr "Envoyer les changements" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 -msgid "Upload the changed primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" -"Veuillez entrer un commentaire sur cet ensemble de changements (minimum 3 " -"caractères)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 -msgid "Illegal upload comment" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 -#, fuzzy -msgid "Please enter a valid chunk size first" -msgstr "Veuillez d’abord saisir les coordonnées désirées." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 -msgid "Illegal chunk size" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 -msgid "Cancel the upload and resume editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 -msgid "Enter an upload comment (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 -msgid "Open a new changeset" -msgstr "Ouvrir un nouvel ensemble de changements" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 -msgid "Open a new changeset and use it in the next upload" -msgstr "" -"Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 -msgid "Use an open changeset" -msgstr "Utiliser ensemble de changements ouvert" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 -msgid "Upload data to an already opened changeset" -msgstr "Envoyer les données vers un ensemble de changements déjà ouvert" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 -msgid "Close changeset after upload" -msgstr "Fermer l'ensemble de changements après l'envoi" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 -msgid "Select to close the changeset after the next upload" -msgstr "Fermer l'ensemble de changements après le prochain envoi" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 -#, java-format -msgid "Tags of changeset {0}" -msgstr "Attributs de la session de modification {0}" - -#. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 -msgid "Load the list of your open changesets from the server" -msgstr "Charger la liste de vos ensembles de changements depuis le serveur" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 -msgid "Close the currently selected open changeset" -msgstr "Fermer l'ensemble de changements actuellement ouvert" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 -#, java-format -msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Attention: le primitif \"{0}\" est déjà effacé sur le serveur. Il sera " -"ignoré pour compléter l'envoi." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 -msgid "Preparing primitives to upload ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 -msgid "" -"Mark modified objects from the current selection to " -"be uploaded to the server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 -msgid "" -"Mark locally deleted objects to be deleted on the " -"server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 -msgid "Select objects to upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 -msgid "Cancel uploading" -msgstr "Annuler l'envoi." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 -msgid "Continue uploading" -msgstr "Continuer à envoyer." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 -#, fuzzy, java-format -msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" -msgstr "Attention : impossible de forcer les préférences pour ''{0}''" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 -#, fuzzy -msgid "Upload data in one request" -msgstr "Envoyer les données vers un ensemble de changements déjà ouvert" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 -msgid "Upload data in chunks of objects. Chunk size: " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 -msgid "Upload each object individually" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 -#, fuzzy -msgid "(1 request)" -msgstr "Requête incorrecte" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 -msgid "(# requests unknown)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 -#, fuzzy, java-format -msgid "({0} request)" -msgid_plural "({0} requests)" -msgstr[0] "{0} mètres" -msgstr[1] "{0} mètres" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 -msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 -#, fuzzy -msgid "Please enter an integer > 1" -msgstr "Veuillez entrer une chaine de caractère comme filtre." - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 -#, fuzzy, java-format -msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" -"Le fichier ''{0}'' n'est pas inscriptible. Veuillez spécifier un autre nom " -"de fichier." - #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 msgid "gps point" msgstr "point GPS" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Customize line drawing" msgstr "Personnaliser le dessin des lignes" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Use global settings." msgstr "Utiliser les réglages généraux." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 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:132 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205 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:146 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221 msgid "Select line drawing options" msgstr "Sélectionner les options de dessin des lignes" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 msgid "Customize Color" @@ -8474,5 +8862,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -8481,5 +8869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../plugins/grid/src/grid/GridLayer.java:163 @@ -8561,5 +8949,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3190 +#: build/trans_presets.java:3193 msgid "Description" msgstr "Description" @@ -8591,10 +8979,10 @@ msgstr[1] "{0} chemins" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "Convert to data layer" msgstr "Convertir en calque de données" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8605,12 +8993,12 @@ "regardez ici :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 @@ -8619,29 +9007,29 @@ msgstr "Converti depuis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 +#: ../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:854 +#: ../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:857 +#: ../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:861 +#: ../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:864 +#: ../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:963 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 #, java-format msgid "" @@ -8652,5 +9040,5 @@ "Voulez-vous
continuer ?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -8658,5 +9046,5 @@ "audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8666,5 +9054,5 @@ "chemin ont été omis ou déplacés au début." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8674,19 +9062,19 @@ "estimer leur horodatage ont été omis." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Couche de données {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -8694,5 +9082,5 @@ "0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8701,5 +9089,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8713,5 +9101,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8724,11 +9112,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} deleted" @@ -8737,36 +9125,36 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 msgid "unset" msgstr "non défini" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convertir en calque GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728 msgid "No problems found" msgstr "Pas de problème trouvé." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731 msgid "Following problems found:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8774,5 +9162,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 msgctxt "gps" msgid "track" @@ -8781,5 +9169,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 msgid "point" msgid_plural "points" @@ -8787,5 +9175,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 #, java-format msgid "a track with {0} point" @@ -8794,5 +9182,5 @@ msgstr[1] "une trace avec {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} consists of {1} track" @@ -8801,5 +9189,5 @@ msgstr[1] "{0} est constitué de {1} traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195 #, java-format msgid "{0} point" @@ -8808,24 +9196,24 @@ msgstr[1] "{0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Fichiers GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Erreur pendant le traitement {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Impossible de lire \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8837,34 +9225,34 @@ "hpoto et sélectionnez un fuseau horaire.
" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "Heure de la photo (information EXIF) :" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "Heure du GPS (lu sur la photo) : " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [jj/mm/aaa hh:mm:ss]" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I'm in the timezone of: " msgstr "Je suis dans le fuseau horaire de : " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "Aucune date" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open an other photo" msgstr "Ouvrez une autre photo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchroniser l’heure avec une photo du GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -8874,156 +9262,117 @@ "Merci d’utiliser le format demandé" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "Date non valide" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "Trace GPX : " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "Ouvrir une autre trace GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509 +msgid "" +"Use photo of an accurate clock,
e.g. GPS receiver display" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514 +msgid "Auto-Guess" +msgstr "Estimation automatique" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517 +msgid "Manual adjust" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520 +#, fuzzy +msgid "Override position for: " +msgstr "Mettre à jour la position pour : " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526 +#, java-format +msgid "Images with geo location in exif data ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529 +#, java-format +msgid "Images that are already tagged ({0}/{1})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535 +msgid "Show Thumbnail images on the map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562 msgid "Timezone: " msgstr "Fuseau horaire : " -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573 msgid "Offset:" msgstr "Décallage :" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" -"Je peux prendre un autre phot de mon GPS.
Cela peut-il aider ?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Mettre à jour la position pour : " - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Toutes les images" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Images sans position EXIF" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Images non encore étiquetées" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652 +#, fuzzy +msgid "No gpx selected" +msgstr "Rien n'est sélectionné !" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656 +#, fuzzy, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718 msgid "Correlate images with GPX track" msgstr "Correler les images avec la trace GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675 msgid "Correlate" msgstr "Corréler" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Estimation automatique" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Vous devez sélectionner une trace GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Aucune trace GPX sélectionnée" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Erreur de lecture du fuseau horaire.\n" -"Format attendu : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703 msgid "Invalid timezone" msgstr "Fuseau horaire invalide" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Erreur d'analyse syntaxique de l'offset.\n" -"Format attendu : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711 msgid "Invalid offset" msgstr "Décallage invalide" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Trace GPX chargée" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" -"Les photos sélectionnées ne contiennent pas d'information d'horodatage." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Les photos ne contienne tpas d'information d'horodatage" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" -"La trace GPX sélectionnée n'est pas horodatée. Veuillez en sélectionner une " -"autre." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "La trace GPX n'a pas d'horodatage." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719 +#, fuzzy +msgid "Try Again" +msgstr "Suivi" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720 +msgid "No images could be matched!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870 #, java-format msgid "Timezone: {0}" msgstr "Fuseau horaire : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871 #, java-format msgid "Minutes: {0}" msgstr "Minutes : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872 #, java-format msgid "Seconds: {0}" msgstr "Secondes : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892 +#, fuzzy, java-format +msgid "
(Time difference of {0} days)" msgstr "(Différence de temps de {0} jours)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Différence entre la trace et les photos : {0}min. {1}sec." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9034,68 +9383,110 @@ "manuellement." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921 msgid "Matching photos to track failed" msgstr "La correspondance des photos avec la trace a échoué" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937 msgid "Adjust timezone and offset" msgstr "Ajuster le fuseau horaire et le décalage" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valeurs par défaut" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957 +msgid "The selected photos don't contain time information." +msgstr "" +"Les photos sélectionnées ne contiennent pas d'information d'horodatage." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958 +msgid "Photos don't contain time information" +msgstr "Les photos ne contienne tpas d'information d'horodatage" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" +"La trace GPX sélectionnée n'est pas horodatée. Veuillez en sélectionner une " +"autre." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987 +msgid "GPX Track has no time information" +msgstr "La trace GPX n'a pas d'horodatage." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079 +msgid "You should select a GPX track" +msgstr "Vous devez sélectionner une trace GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080 +msgid "No selected GPX track" +msgstr "Aucune trace GPX sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Erreur de lecture du fuseau horaire.\n" +"Format attendu : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Erreur d'analyse syntaxique de l'offset.\n" +"Format attendu : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 msgid "Extracting GPS locations from EXIF" msgstr "Extractions des positions GPS depuis les informations EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 msgid "Starting directory scan" msgstr "Début du parcours du dossier" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119 msgid "One of the selected files was null" msgstr "Un des fichiers sélectionnés était vide." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 msgid "Read photos..." -msgstr "Lexture des images..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +msgstr "Lexture des images…" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 #, java-format msgid "Reading {0}..." -msgstr "Lecture de {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +msgstr "Lecture de {0}…" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 #, java-format msgid "Scanning directory {0}" msgstr "Parcours du dossier {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 #, java-format msgid "Found null file in directory {0}\n" msgstr "Fichier vide trouvé dans le dossier {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Geotagged Images" msgstr "Images géolocalisées" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294 msgid "Correlate to GPX" msgstr "Corréler en GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313 msgid "image" msgid_plural "images" @@ -9103,52 +9494,100 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314 #, java-format msgid "{0} were found to be gps tagged." msgstr "{0} ont été trouvées pour être géoétiquettées." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Delete image file from disk" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581 +#, java-format +msgid "" +"

Delete the file {0} from disk?

The image file will be " +"permanently lost!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584 +#, fuzzy +msgid "Always delete and don't show this dialog again" +msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#, fuzzy +msgid "Image file could not be deleted." +msgstr "Impossible de trouver le fichier." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 msgid "No image" msgstr "Aucune image" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 #, java-format msgid "Loading {0}" msgstr "Chargement {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 #, java-format msgid "Error on file {0}" msgstr "Erreur sur le fichier {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 msgid "Display geotagged images" -msgstr "Afficher les images géo-étiquetées" - -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Précédent" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#, fuzzy +msgid "Show previous Image" +msgstr "Image précédente" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy, java-format +msgid "Geoimage: {0}" +msgstr "page web : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 msgid "Remove photo from layer" msgstr "Supprimer la photo du calque" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#, fuzzy +msgid "Delete File from disk" +msgstr "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Suivant" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#, fuzzy +msgid "Show next Image" +msgstr "Image suivante" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Center view" msgstr "Centrer la vue" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Zoom best fit and 1:1" msgstr "Meilleur zoom et 1:1" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +msgid "Move dialog to the side pane" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245 #, java-format msgid "" @@ -9159,5 +9598,5 @@ "Altitude : {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248 #, java-format msgid "" @@ -9264,4 +9703,12 @@ msgid "Error displaying URL" msgstr "Erreur à l'affichage de l'URL" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117 +msgid "Illegal dash pattern, values must be positive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123 +msgid "Illegal dash pattern, at least one value must be > 0" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -9499,7 +9946,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:412 -#: ../plugins/terracer/src/terracer/TerracerAction.java:430 -#: ../plugins/terracer/src/terracer/TerracerAction.java:494 +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257 +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260 msgid "All" msgstr "Tous" @@ -9570,6 +10016,6 @@ #: build/trans_presets.java:1010 build/trans_presets.java:1022 #: build/trans_presets.java:1032 build/trans_presets.java:1041 -#: build/trans_presets.java:1050 build/trans_presets.java:1451 -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1050 build/trans_presets.java:1444 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Vélos" @@ -9886,5 +10332,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 msgid "Configure Sites..." -msgstr "Configurer les sites..." +msgstr "Configurer les sites…" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 @@ -9979,31 +10425,95 @@ msgstr "La projection {0} ne peut être activée. Utilisation de Mercator." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 -msgid "Enable proxy server" -msgstr "Activer le serveur mandataire (proxy)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 -msgid "Anonymous" -msgstr "Anonyme" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146 +#, fuzzy +msgid "Host:" +msgstr "Hôtel" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153 +#, fuzzy +msgctxt "server" +msgid "Port:" +msgstr "Port :" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114 +msgid "" +"Please enter a username and a password if your proxy requires authentication." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129 +#, fuzzy +msgid "Password:" +msgstr "Mot de passe" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189 +msgid "No proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202 +msgid "Use standard system settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204 +msgid "" +"Use standard system settings (disabled. Start JOSM with -Djava.net." +"useSystemProxies=true to enable)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216 +msgid "Manually configure a HTTP proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233 +msgid "Use a SOCKS proxy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273 +msgid "" +"Warning: JOSM is configured to use proxies from the system setting, but the " +"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298 msgid "Proxy Settings" msgstr "Paramètres du serveur mandataire (proxy)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 -msgid "Proxy server host" -msgstr "Hôte du serveur mandataire" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 -msgid "Proxy server port" -msgstr "Port du serveur mandataire" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 -msgid "Proxy server username" -msgstr "Nom d’utilisateur du serveur mandataire" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 -msgid "Proxy server password" -msgstr "Mot de passe du serveur mandataire" +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59 +msgid "The base URL for the OSM server (REST API)" +msgstr "URL de base du serveur OSM (REST API)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60 +msgid "Login name (e-mail) to the OSM account." +msgstr "Nom d'utilisateur (e-mail) du compte OSM." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61 +msgid "" +"Login password to the OSM account. Leave blank to not store any password." +msgstr "" +"Mot de passe d’identification au compte OSM. Laisser blanc pour ne stocker " +"aucun mot de passe." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63 +msgid "Base Server URL" +msgstr "URL du serveur de base" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65 +msgid "OSM username (e-mail)" +msgstr "Nom d'utilisateur OSM (e-mail))" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 +msgid "OSM password" +msgstr "Mot de passe OSM" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69 +msgid "" +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." +msgstr "" +"ATTENTION : Le mot de passe est stocké en texte clair dans le fichier " +"de préférences.
Le mot de passe est transféré en texte clair au serveur, " +"encodé dans l'URL.
N'utilisez pas un mot de passe de valeur." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -10307,5 +10817,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -10315,13 +10825,13 @@ msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 msgid "Add a new tag" msgstr "AJouter un nouvel attribut" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 msgid "Delete the selection in the tag table" msgstr "Supprimer la sélection dans la table des attributs" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -10329,18 +10839,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477 msgid "Optional Attributes:" msgstr "Attributs optionnels:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 msgid "closedway" msgstr "voie sans issue" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 #, java-format msgid "Unknown type: {0}" msgstr "Type inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -10351,16 +10861,16 @@ msgstr "Impossible de lire la source des balises prédéfinies : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660 #, java-format msgid "Error parsing {0}: " msgstr "Erreur de traitement {0} : " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 #, java-format msgid "Elements of type {0} are supported." msgstr "Les éléments de type {0} sont avalisés." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 -#: ../plugins/terracer/src/terracer/TerracerAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../plugins/terracer/src/terracer/TerracerAction.java:76 #, java-format msgid "Change {0} object" @@ -10369,18 +10879,18 @@ msgstr[1] "Changer {0} objets." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 -#: ../plugins/terracer/src/terracer/TerracerAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734 +#: ../plugins/terracer/src/terracer/TerracerAction.java:79 msgid "Nothing selected!" msgstr "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819 msgid "Change Properties" msgstr "Changer les propriétés" @@ -10402,10 +10912,20 @@ #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." -msgstr "Contact du serveur OSM..." +msgstr "Contact du serveur OSM…" #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." -msgstr "Téléchargement des points {0} à {1}..." +msgstr "Téléchargement des points {0} à {1}…" + +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88 +#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93 +#, fuzzy +msgid "" +"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}" +msgstr "" +"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type " +"OsmPrimitiveType, reçu \"{1}\"" #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 @@ -10422,13 +10942,69 @@ msgstr "" -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -msgid "NullPointerException, possibly some missing tags." -msgstr "" -"Échec (NullPointerException). Sans doute parce qu'il manque des attributs." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 -msgid "Preparing data..." -msgstr "Préparation des données..." +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84 +#, fuzzy, java-format +msgid "" +"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. " +"Proxy won't be used." +msgstr "" +"format inattendu de nouvelle version d’une primitive modifiée \"{0}\", reçu " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88 +#, java-format +msgid "" +"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101 +#, java-format +msgid "Warning: no preference ''{0}'' found. Will use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106 +#, java-format +msgid "" +"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will " +"use no proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117 +#, java-format +msgid "" +"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128 +#, java-format +msgid "" +"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port " +"''{1}''. Proxy won't be used" +msgstr "" + +#. Just log something. The network stack will also throw an exception which will be caught +#. somewhere else +#. +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138 +#, java-format +msgid "" +"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147 +msgid "" +"Warning: the JVM is not configured to lookup proxies from the system " +"settings. The property ''java.net.useSystemProxies'' was missing at startup " +"time. Won't use a proxy." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 +msgid "Parsing response from server..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169 +#, fuzzy, java-format +msgid "Unexpected XML element with name ''{0}''" +msgstr "numéro de colonne {0} inattendu" #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24 @@ -10533,10 +11109,10 @@ "un document gpx" -#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 +#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245 #, java-format msgid "Unknown mode {0}." msgstr "Mode {0} inconnu." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10545,6 +11121,6 @@ "déduire le type de primitive" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 @@ -10552,22 +11128,22 @@ #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 msgid "Downloading OSM data..." -msgstr "Téléchargement des données OSM..." +msgstr "Téléchargement des données OSM…" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format -msgid "Fetching node with id {0} from ''{1}''" +msgid "Fetching way with id {0} from ''{1}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format -msgid "Fetching way with id {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 -#, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -10575,20 +11151,20 @@ "Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant." +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format -msgid "Fetching a package of nodes from ''{0}''" +msgid "Fetching a package of ways from ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format -msgid "Fetching a package of ways from ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 -#, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10598,10 +11174,10 @@ "requêtes individuelles pour chaque primitive" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 +#, java-format msgid "Downloading {0} object from ''{1}''" msgid_plural "Downloading {0} objects from ''{1}''" -msgstr[0] "Téléchargement de la relation ''{0}''" -msgstr[1] "Téléchargement de la relation ''{0}''" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10638,23 +11214,21 @@ msgstr "Erreur lors de l'import des trames NMEA !" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 -#, java-format -msgid "Preference ''{0}'' missing. Can't initialize OsmApi." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#, fuzzy, java-format +msgid "Preference ''{0}'' missing. Can''t initialize OsmApi." msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161 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:164 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162 +#, java-format msgid "" "It supports protocol version 0.6, while the server says it supports {0} to " "{1}." msgstr "" -"Elle supporte les protocoles de version 0.5 ou 0.6, alors que le serveur ne " -"supporte que les versions {0} à {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166 #, java-format msgid "Communications with {0} established using protocol version {1}." @@ -10662,11 +11236,11 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274 #, java-format msgid "" @@ -10676,66 +11250,78 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 msgid "Creating changeset..." msgstr "Création d'un ensemble de changements…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319 #, java-format msgid "Successfully opened changeset {0}" msgstr "ensemble de changements {0} ouvert avec succès" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657 +#, java-format +msgid "Changeset ID > 0 expected. Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346 msgid "Updating changeset..." msgstr "Mise à jour de l'ensemble de changements" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348 #, java-format msgid "Updating changeset {0}..." -msgstr "Mise à jour de l’ensemble de changements {0}..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +msgstr "Mise à jour de l’ensemble de changements {0}…" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." -msgstr "Fermeture de la révision..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 +msgstr "Fermeture de l'ensemble de changements…" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 -msgid "Preparing..." -msgstr "Préparation en cours..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 -msgid "Uploading..." -msgstr "Envoi en cours..." - +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#, fuzzy +msgid "Preparing upload request..." +msgstr "Préparation des données…" + +#. Upload to the server +#. #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 +#, fuzzy, java-format +msgid "Uploading {0} objects..." +msgstr "Envoi de {0} objets…" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444 msgid "Waiting 10 seconds ... " msgstr "Attends 10 secondes… " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 msgid "Current changeset is null. Can't upload data." msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 +"L'ensemble de changements actuel est vide. Impossible d'envoyer les données." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10762,4 +11348,14 @@ msgid "Invalid bz2 file." msgstr "Fichier bz2 invalide." + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75 +msgid "Prolog of OsmChange document already written. Please write only once." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111 +#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122 +msgid "Prolog of OsmChange document not written yet. Please write frst." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72 @@ -10770,5 +11366,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10795,5 +11391,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10801,5 +11397,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #, java-format msgid "Unsupported version: {0}" @@ -10812,5 +11408,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10819,64 +11415,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 msgid "Parsing list of changesets..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169 -msgid "Incorrect password or username." -msgstr "Mot de passe ou nom d’utilisateur incorrect." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177 -msgid "Warning: The password is transferred unencrypted." -msgstr "Attention : Le mot de passe est transféré non-crypté." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181 -msgid "Save user and password (unencrypted)" -msgstr "Sauvegarder l’utilisateur et le mot de passe (non crypté)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187 -msgid "Enter Password" -msgstr "Entrer le mot de passe" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -msgid "Login" -msgstr "Identifiant" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 -msgid "The base URL for the OSM server (REST API)" -msgstr "URL de base du serveur OSM (REST API)" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252 -msgid "Login name (e-mail) to the OSM account." -msgstr "Nom d'utilisateur (e-mail) du compte OSM." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Mot de passe d’identification au compte OSM. Laisser blanc pour ne stocker " -"aucun mot de passe." - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 -msgid "Base Server URL" -msgstr "URL du serveur de base" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256 -msgid "OSM username (e-mail)" -msgstr "Nom d'utilisateur OSM (e-mail))" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258 -msgid "OSM password" -msgstr "Mot de passe OSM" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" -"ATTENTION : Le mot de passe est stocké en texte clair dans le fichier " -"de préférences.
Le mot de passe est transféré en texte clair au serveur, " -"encodé dans l'URL.
N'utilisez pas un mot de passe de valeur." +msgstr "Analyse de la liste des ensembles de changements…" #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68 #, java-format msgid "(at line {0}, column {1})" @@ -10965,5 +11505,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238 msgid "Parsing OSM history data ..." -msgstr "Scrutation des données de l'historique d'OSM..." +msgstr "Scrutation des données de l'historique d'OSM…" #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -10976,5 +11516,12 @@ msgstr "Le fichier \"{0}\" n'existe pas" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110 +#, java-format +msgid "" +"Warning: ignoring changeset id {0} for new object with external id {1} and " +"internal id {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 #, java-format msgid "" @@ -10983,38 +11530,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 #, java-format msgid "" @@ -11022,19 +11569,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 msgid "Incomplete specification with ref=0" msgstr "Champ incomplet avec ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 msgid "Illegal object with ID=0." msgstr "L’objet avec l’id=0 est illégal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367 #, java-format msgid "" @@ -11044,8 +11591,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391 #, java-format msgid "" @@ -11055,25 +11602,45 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#. for a new primitive we just log a warning +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#, fuzzy, java-format +msgid "" +"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. " +"Resetting to 0." +msgstr "" +"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu " +"\"{1}\"" + +#. for an existing primitive this is a problem +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432 +#, fuzzy, java-format +msgid "Illegal value for attribute ''changeset''. Got {0}." +msgstr "" +"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468 #, java-format msgid "" @@ -11081,5 +11648,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486 #, java-format msgid "" @@ -11088,5 +11655,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532 #, java-format msgid "" @@ -11094,5 +11661,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544 #, java-format msgid "" @@ -11101,13 +11668,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 msgid "Prepare OSM data..." -msgstr "Préparation des données de OSM..." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 +msgstr "Préparation des données de OSM…" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 msgid "Parsing OSM data..." msgstr "Préparation des données d'OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598 msgid "Preparing data set..." msgstr "" @@ -11124,5 +11691,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 msgid "Downloading referring ways ..." -msgstr "Téléchargement des chemins référents ..." +msgstr "Téléchargement des chemins référents…" #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182 @@ -11130,21 +11697,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 msgid "Reading changesets..." msgstr "Lecture des ensembles de changement…" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63 msgid "Downloading changesets ..." -msgstr "téléchargement des ensembles de changement…" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85 +msgstr "Téléchargement des ensembles de changement…" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Reading changeset {0} ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97 #, java-format msgid "Downloading changeset {0} ..." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127 +#, fuzzy, java-format +msgid "Downloading {0} changeset ..." +msgid_plural "Downloading {0} changesets ..." +msgstr[0] "Téléchargement des ensembles de changement…" +msgstr[1] "Téléchargement des ensembles de changement…" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142 +#, fuzzy, java-format +msgid "({0}/{1}) Downloading changeset {0} ..." +msgstr "Téléchargement des ensembles de changement…" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -11159,11 +11738,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." -msgstr "Contact du serveur..." +msgstr "Contact du serveur…" #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 -#, fuzzy, java-format +#, java-format msgid "Expected value > 0 for parameter ''{0}'', got {1}" -msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -11172,9 +11751,5 @@ msgstr "Echec de l’ouverture de connexion à l’API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 -msgid "Error: failed to add authentication credentials to the connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the OSM server. Please check your internet connection." @@ -11227,7 +11802,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 -#, fuzzy, java-format +#, java-format msgid "Value >0 expected for parameter ''{0}'', got {1}" -msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 @@ -11235,12 +11810,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159 +#, java-format msgid "({0}/{1}) Uploading {2} objects..." -msgstr "Envoi de {0} objets…" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Envoi des données…" + +#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192 +#, fuzzy +msgid "Unexpected id 0 for osm primitive found" +msgstr "Primitives supprimées ou déplacées" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11282,12 +11862,12 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin {0}" -msgstr "Supprimer {1} {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 -#, fuzzy, java-format +#, java-format msgid "Delete old plugin file {0}" -msgstr "Impossible de supprimer le fichier du greffon : {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 @@ -11431,9 +12011,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Aucune description disponible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Plus de détails" @@ -11566,4 +12146,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23 +#, java-format +msgid "Expected unique id > 0 for primitive id, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28 +#, fuzzy, java-format +msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}" +msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}" + +#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48 +#, fuzzy, java-format +msgid "Parameter ''{0}'' of type node expected, got ''{1}''" +msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"." + #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format @@ -11623,4 +12218,6 @@ "already been closed on {1}." msgstr "" +"L'envoi vers l'ensemble de changements {0}a échouée " +"
car il a déjà été fermé sur {1}. " #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 @@ -11872,6 +12469,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 msgid "Upload Traces" msgstr "Charger les traces" @@ -11915,5 +12512,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:216 msgid "Connecting..." -msgstr "Connexion..." +msgstr "Connexion en cours…" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239 @@ -11959,5 +12556,5 @@ msgstr "Envoyer la trace GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 msgid "Uploads traces to openstreetmap.org" msgstr "CHarger les traces vers openstreetmap.org" @@ -11968,5 +12565,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2296 +#: build/trans_presets.java:2285 msgid "Address Interpolation" msgstr "Interpolation d’adresse" @@ -11981,11 +12578,8 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Impair" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#: ../plugins/terracer/src/terracer/TerracerAction.java:413 -#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Pair" @@ -11996,24 +12590,20 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 -#, fuzzy msgid "Numeric" -msgstr "Numéro" +msgstr "" #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Actual" -msgstr "nature" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Estimate" -msgstr "Site" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 -#, fuzzy msgid "Potential" -msgstr "Location" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 @@ -12031,7 +12621,6 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 -#, fuzzy msgid "Increment:" -msgstr "segment intérieur" +msgstr "" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 @@ -12147,5 +12736,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389 msgid "Select Feuille" msgstr "Sélectionner la feuille cadastrale." @@ -12209,21 +12798,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368 msgid "Select commune" msgstr "Sélectionner la commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357 msgid "Choose from..." -msgstr "Choisir parmi..." - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143 +msgstr "Choisir parmi…" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12237,13 +12826,13 @@ "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211 msgid "Restore grab shortcut F11" msgstr "Restaurer la fontion de téléchargement à la touche F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM est arreté pour que la modification prenne effet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278 #, java-format msgid "" @@ -12270,17 +12859,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Enable automatic caching." msgstr "Activer le tampon automatique." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62 msgid "Max. cache size (in MB)" msgstr "Taille max. du tampon (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -12297,9 +12886,9 @@ "
avant tout chargement de données créé à partir de ce greffon." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "French cadastre WMS" msgstr "WMS du cadastre français" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -12307,10 +12896,10 @@ "celle-ci est activé" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -12320,5 +12909,5 @@ "préférences de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -12328,9 +12917,9 @@ "intermédiaires). Utile pour lire les textes sur fond noir." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103 msgid "Allows multiple layers stacking" msgstr "Permet l'empilement de plusieurs calques" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -12338,5 +12927,5 @@ "gauche." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" @@ -12344,10 +12933,10 @@ #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" @@ -12355,22 +12944,22 @@ "mémoire)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Fixed size square (default is 100m)" msgstr "Carré de taille fixe (par défaut : 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Taille fixe (de 25 à 1000 mètres)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -12378,11 +12967,8 @@ "taille est dépassée" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 -msgid "Auto-tag source added:" -msgstr "Ajouter le commentaire de source suivant :" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88 msgid "Add \"source=...\" to elements?" -msgstr "Ajouter \"source=...\" aux éléments ?" +msgstr "Ajouter \"source=…\" aux éléments ?" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:46 @@ -12398,5 +12984,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:30 msgid "Contacting WMS Server..." -msgstr "Contact du serveur WMS..." +msgstr "Contact du serveur WMS…" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160 @@ -12423,5 +13009,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68 msgid "Extract best fitting boundary..." -msgstr "Extraction des meilleures limites..." +msgstr "Extraction des meilleures limites…" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129 @@ -12592,5 +13178,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "Location" msgstr "Localisation" @@ -12794,5 +13380,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117 msgid "No data loaded." msgstr "Aucune donnée chargée" @@ -12814,9 +13400,9 @@ msgstr "Convertir en couche GPX en rendant anonyme l'horodatage" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47 msgid "edit gpx tracks" msgstr "Modifier les traces GPX" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86 msgid "EditGpx" msgstr "EditGPX" @@ -12936,5 +13522,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." -msgstr "Import des données du DG100..." +msgstr "Import des données du DG100…" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 @@ -13079,10 +13665,10 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." -msgstr "Recherche de ligne côtière..." +msgstr "Recherche de ligne côtière…" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." -msgstr "{0} nœuds jusqu'à présent..." +msgstr "{0} nœuds jusqu'à présent…" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 @@ -13106,5 +13692,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:148 msgid "checking cache..." -msgstr "Vérification du cache..." +msgstr "Vérification du cache…" #. * @@ -13121,5 +13707,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 msgid "Removing duplicate nodes..." -msgstr "Suppression des nœuds en doublon..." +msgstr "Suppression des nœuds en doublon…" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 @@ -13208,7 +13794,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_presets.java:2348 build/trans_style.java:990 -#: build/trans_style.java:1007 build/trans_style.java:1023 -#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_presets.java:2337 build/trans_style.java:961 +#: build/trans_style.java:978 build/trans_style.java:994 +#: build/trans_style.java:3415 build/trans_style.java:3423 msgid "water" msgstr "eau" @@ -13366,5 +13952,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." -msgstr "Téléchargement de la tuile..." +msgstr "Téléchargement de la tuile…" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 @@ -13372,19 +13958,19 @@ msgstr "Impossible d'acquérir l'image" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146 msgid "Connecting" msgstr "Connexion en cours" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211 msgid "Connected" msgstr "Connecté" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252 msgid "Not connected" msgstr "Pas connecté" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240 msgid "Connection Failed" msgstr "Échec de la connexion" @@ -13423,11 +14009,11 @@ msgstr "Calque instrument LiveGPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" msgstr "Capturer la trace GPS" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 msgid "Connect to gpsd server and show current position in LiveGPS layer." msgstr "" @@ -13435,22 +14021,22 @@ "LiveGPS." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" msgstr "Centrer une fois" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 msgid "Center the LiveGPS layer to current position." msgstr "Centrer le calque LiveGPS sur la position actuelle." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" msgstr "Centrage automatique" -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 msgid "Continuously center the LiveGPS layer to current position." msgstr "Centrer continuellement le calque LiveGPS sur la position actuelle." -#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 +#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119 msgid "LiveGPS" msgstr "LiveGPS" @@ -13503,9 +14089,9 @@ msgstr "Impossible de dessiner en dehors du monde" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21 msgid "measurement mode" msgstr "mode de mesure" -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37 msgid "Measurements" msgstr "Mesures" @@ -13543,5 +14129,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 msgid "Create multipolygon" @@ -13552,13 +14138,13 @@ msgstr "Créer multipolygones." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85 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 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103 msgid "Multipolygon must consist only of closed ways." msgstr "Les Multipolygones doivent contenir seulement des chemin fermés." -#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123 +#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122 msgid "You must select at least two ways." msgstr "Vous devez sélectionner au moins deux chemins." @@ -13713,5 +14299,5 @@ msgstr "Exécutable Firefox" -#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 +#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63 msgid "PicLayer" msgstr "" @@ -13809,5 +14395,5 @@ #. TODO Use constructor with shortcut -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87 @@ -13883,41 +14469,41 @@ msgstr "Entrez les valeurs du poids" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" msgstr "Carte glissante" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 msgid "Auto Zoom" msgstr "Zoom automatique" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159 msgid "Load Tile" msgstr "Charger la tuile" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169 msgid "Show Tile Info" msgstr "Monter les informations sur la tuile." -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191 msgid "Load All Tiles" msgstr "Charger toutes les dalles" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200 msgid "Increase zoom" msgstr "Augmenter le zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208 msgid "Decrease zoom" msgstr "Diminuer le zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218 msgid "Snap to tile size" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234 msgid "Flush Tile Cache" msgstr "Réinitialiser la mémoire tampon des tuiles" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673 msgid "image " msgstr "image " @@ -14091,4 +14677,43 @@ "préférences" +#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 +#, fuzzy +msgid "Even/Odd" +msgstr "Pair" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78 +msgid "Lowest number" +msgstr "Plus petit nombre" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81 +msgid "Highest number" +msgstr "Plus grand nombre" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84 +#, fuzzy +msgid "Segments" +msgstr "Rues" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114 +msgid "Lowest housenumber cannot be higher than highest housenumber" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142 +msgid "Housenumbers do not match odd/even setting" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167 +msgid "Segment must be a number greater 1" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191 +msgid " must be greater than 0" +msgstr "" + +#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196 +#, fuzzy +msgid " is not a number" +msgstr "Plus grand nombre" + #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" @@ -14107,42 +14732,20 @@ msgstr "Inverser les maisons mitoyennes" -#: ../plugins/terracer/src/terracer/TerracerAction.java:68 -#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/terracer/src/terracer/TerracerAction.java:53 +#: ../plugins/terracer/src/terracer/TerracerAction.java:56 msgid "Terrace a building" msgstr "Diviser un bâtiment" -#: ../plugins/terracer/src/terracer/TerracerAction.java:70 +#: ../plugins/terracer/src/terracer/TerracerAction.java:54 msgid "Creates individual buildings from a long building." msgstr "Crée des bâtiments mitoyens à partir d'un long bâtiment." -#: ../plugins/terracer/src/terracer/TerracerAction.java:130 +#: ../plugins/terracer/src/terracer/TerracerAction.java:96 msgid "Select a single, closed way of at least four nodes." msgstr "Sélectionnez un seul chemin fermé d'au moins quatre points." -#: ../plugins/terracer/src/terracer/TerracerAction.java:199 +#: ../plugins/terracer/src/terracer/TerracerAction.java:185 msgid "Terrace" msgstr "Bâtiments mitoyens" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:472 -msgid "Highest number" -msgstr "Plus grand nombre" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:473 -msgid "Lowest number" -msgstr "Plus petit nombre" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:474 -msgid "Interpolation" -msgstr "Interpolation" - -#. item "Man-Made/Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2290 -msgid "Street name" -msgstr "Nom de la rue" - -#: ../plugins/terracer/src/terracer/TerracerAction.java:475 -msgid "Optional" -msgstr "Optionnel" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14157,5 +14760,5 @@ msgstr "Aucune erreur de validation" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169 msgid "Grid" msgstr "Grille" @@ -14832,38 +15435,8 @@ #. #. -#. +#. #. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. -#. color building -#. 1 -#. 50000 -#. -#. -#. -#. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4167 build/trans_style.java:4174 -#: build/trans_style.java:4181 build/trans_style.java:4188 -#: build/trans_style.java:4195 +#: build/trans_style.java:4174 msgid "building" msgstr "bâtiment" @@ -14877,5 +15450,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4202 +#: build/trans_style.java:4181 msgid "area" msgstr "zone" @@ -14974,5 +15547,5 @@ #, java-format msgid "{0}, ..." -msgstr "{0}, ..." +msgstr "{0}, …" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 @@ -14999,10 +15572,10 @@ "Impossible de lire l'information depuis walking-papers.org pour l'id \"{0}\"" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61 #, java-format msgid "Walking Papers: {0}" msgstr "Walking Papers: {0}" -#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360 +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364 #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" @@ -15075,5 +15648,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." -msgstr "Rectifier l'image..." +msgstr "Rectifier l'image…" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 @@ -15655,6 +16228,5 @@ "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, …)." #. #. -#: build/trans_presets.java:1399 build/trans_presets.java:1452 +#: build/trans_presets.java:1399 build/trans_presets.java:1445 #: build/trans_surveyor.java:24 msgid "Parking" @@ -18839,7 +19417,7 @@ #. item "Amenities/Toilets" text "Operator" #. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:1405 build/trans_presets.java:1777 -#: build/trans_presets.java:1787 build/trans_presets.java:2437 -#: build/trans_presets.java:2554 +#: build/trans_presets.java:1405 build/trans_presets.java:1766 +#: build/trans_presets.java:1776 build/trans_presets.java:2426 +#: build/trans_presets.java:2557 msgid "Reference number" msgstr "Numéro de référence" @@ -18855,5 +19433,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1406 build/trans_presets.java:2349 +#: build/trans_presets.java:1406 build/trans_presets.java:2338 msgid "underground" msgstr "souterrain" @@ -18866,6 +19444,6 @@ #. item "Tourism/Audioguide" text "Reference number" #. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1408 build/trans_presets.java:1778 -#: build/trans_presets.java:1788 build/trans_presets.java:2438 +#: build/trans_presets.java:1408 build/trans_presets.java:1767 +#: build/trans_presets.java:1777 build/trans_presets.java:2427 msgid "Fee" msgstr "Péage/Forfait" @@ -18904,22 +19482,10 @@ #. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1422 build/trans_presets.java:1466 -msgid "Shop" -msgstr "Concession/Réparation" - -#. item "Car/Shop" -#. -#: build/trans_presets.java:1424 -msgid "Edit Car Shop" -msgstr "Éditer une concession/réparation" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1429 +#: build/trans_presets.java:1422 msgid "Repair" msgstr "Réparer" #. item "Car/Repair" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1423 msgid "Edit Car Repair" msgstr "Editez un garagiste" @@ -18927,5 +19493,5 @@ #. item "Car/Repair" text "Operator" #. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1435 build/trans_presets.java:1459 +#: build/trans_presets.java:1428 build/trans_presets.java:1452 msgid "Rental" msgstr "Location" @@ -18934,10 +19500,10 @@ #. -#: build/trans_presets.java:1438 +#: build/trans_presets.java:1431 msgid "Edit Car Rental" msgstr "Éditer une location de voiture" #. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1436 msgid "Sharing" msgstr "Partage" @@ -18945,5 +19511,5 @@ #. item "Car/Sharing" #. -#: build/trans_presets.java:1445 +#: build/trans_presets.java:1438 msgid "Edit Car Sharing" msgstr "Éditer un covoiturage" @@ -18951,10 +19517,10 @@ #. item "Bicycle/Parking" #. -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1447 msgid "Edit Bicycle Parking" msgstr "Éditer un parking à vélo" #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1450 msgid "Capacity" msgstr "Capacité" @@ -18963,22 +19529,15 @@ #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Rental" msgstr "Éditer une location de vélos" -#. item "Bicycle/Shop" -#. -#: build/trans_presets.java:1469 -msgid "Edit Bicycle Shop" -msgstr "Éditer un magasin de vélo" - -#. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1474 +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transport public" #. group "Public Transport" -#: build/trans_presets.java:1475 +#: build/trans_presets.java:1461 msgctxt "railway" msgid "Station" @@ -18988,5 +19547,5 @@ #. -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1464 msgctxt "railway" msgid "Edit Station" @@ -18994,5 +19553,5 @@ #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1483 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Référence UIC" @@ -19000,5 +19559,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Halte ferroviaire" @@ -19006,5 +19565,5 @@ #. item "Public Transport/Railway Halt" #. -#: build/trans_presets.java:1488 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Editez un arrêt" @@ -19012,5 +19571,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1495 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Arrêt de tram" @@ -19019,5 +19578,5 @@ #. -#: build/trans_presets.java:1498 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Éditer un arrêt de tram" @@ -19025,5 +19584,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Quai" @@ -19032,5 +19591,5 @@ #. -#: build/trans_presets.java:1508 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Éditer un quai" @@ -19042,5 +19601,5 @@ #. #. -#: build/trans_presets.java:1511 build/trans_presets.java:1553 +#: build/trans_presets.java:1497 build/trans_presets.java:1542 msgid "Reference (track number)" msgstr "Référence (numéro de voie)" @@ -19048,10 +19607,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1513 build/trans_presets.java:1555 +#: build/trans_presets.java:1499 build/trans_presets.java:1544 msgid "Area" msgstr "Surface" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1515 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Bouche de métro" @@ -19060,10 +19619,10 @@ #. -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1504 msgid "Edit Subway Entrance" msgstr "Éditer une bouche de métro" #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Chaise roulante" @@ -19072,5 +19631,5 @@ #. #. -#: build/trans_presets.java:1528 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Gare routière" @@ -19079,5 +19638,5 @@ #. -#: build/trans_presets.java:1531 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Éditer une gare routière" @@ -19085,5 +19644,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1537 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Arrêt de bus" @@ -19093,5 +19652,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" /> -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Éditer un arrêt de bus" @@ -19100,17 +19659,25 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#: build/trans_presets.java:1546 build/trans_presets.java:1800 -#: build/trans_presets.java:2483 +#: build/trans_presets.java:1532 build/trans_presets.java:1789 +#: build/trans_presets.java:2472 msgid "Shelter" msgstr "Abri" -#. item "Public Transport/Bus Stop" check "Shelter" +#. item "Amenities/Recycling" check "Scrap Metal" +#: build/trans_presets.java:1533 build/trans_presets.java:2460 +msgid "Bench" +msgstr "Banc" + +#: build/trans_presets.java:1534 +msgid "Tactile Paving" +msgstr "" + #. -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1538 msgid "Bus Platform" msgstr "Plateforme de bus" #. item "Public Transport/Bus Platform" -#: build/trans_presets.java:1550 +#: build/trans_presets.java:1539 msgid "Edit Bus Platform" msgstr "Éditer une plateforme de bus" @@ -19118,5 +19685,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1558 +#: build/trans_presets.java:1547 msgid "Taxi" msgstr "Taxi" @@ -19124,5 +19691,5 @@ #. item "Public Transport/Taxi" #. -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1549 msgid "Edit Taxi station" msgstr "Editez une station de taxi" @@ -19130,5 +19697,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1565 +#: build/trans_presets.java:1554 msgid "Airport" msgstr "Aéroport" @@ -19136,15 +19703,15 @@ #. item "Public Transport/Airport" #. -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1556 msgid "Edit Airport" msgstr "Modifier aéroport" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1561 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1573 +#: build/trans_presets.java:1562 msgid "ICAO" msgstr "ICAO" @@ -19152,10 +19719,10 @@ #. item "Public Transport/Airport" text "ICAO" #. -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1567 msgid "Travel" msgstr "Voyage" #. group "Travel" -#: build/trans_presets.java:1579 +#: build/trans_presets.java:1568 msgid "Accomodation" msgstr "Hôtel" @@ -19167,5 +19734,5 @@ #. #. -#: build/trans_presets.java:1580 build/trans_surveyor.java:43 +#: build/trans_presets.java:1569 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hôtel" @@ -19174,15 +19741,15 @@ #. -#: build/trans_presets.java:1583 +#: build/trans_presets.java:1572 msgid "Edit Hotel" msgstr "Éditer un hôtel" #. item "Travel/Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1586 +#: build/trans_presets.java:1575 msgid "Stars" msgstr "Étoiles" #. item "Travel/Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1588 +#: build/trans_presets.java:1577 msgid "Motel" msgstr "Môtel" @@ -19190,20 +19757,20 @@ #. item "Travel/Accomodation/Motel" #. -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1579 msgid "Edit Motel" msgstr "Éditer un motel" #. item "Travel/Accomodation/Motel" text "Name" -#: build/trans_presets.java:1594 +#: build/trans_presets.java:1583 msgid "Guest House" msgstr "Chambre d’hôte" #. item "Travel/Accomodation/Guest House" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1584 msgid "Edit Guest House" msgstr "Éditer une chambre d’hôte" #. item "Travel/Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1599 +#: build/trans_presets.java:1588 msgid "Chalet" msgstr "Châlet" @@ -19211,10 +19778,10 @@ #. item "Travel/Accomodation/Chalet" #. -#: build/trans_presets.java:1601 +#: build/trans_presets.java:1590 msgid "Edit Chalet" msgstr "Editez un châlet" #. item "Travel/Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1594 msgid "Hostel" msgstr "Hôtel" @@ -19222,30 +19789,30 @@ #. item "Travel/Accomodation/Hostel" #. -#: build/trans_presets.java:1607 +#: build/trans_presets.java:1596 msgid "Edit Hostel" msgstr "Éditer une auberge de jeunesse" #. item "Travel/Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1611 +#: build/trans_presets.java:1600 msgid "Alpine Hut" msgstr "Chalet" #. item "Travel/Accomodation/Alpine Hut" -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1601 msgid "Edit Alpine Hut" msgstr "Modifier chalet" #. item "Travel/Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1606 msgid "Caravan Site" msgstr "Site pour caravane" #. item "Travel/Accomodation/Caravan Site" -#: build/trans_presets.java:1618 +#: build/trans_presets.java:1607 msgid "Edit Caravan Site" msgstr "Éditer un site pour caravane" #. item "Travel/Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1622 +#: build/trans_presets.java:1611 msgid "Camping Site" msgstr "Camping" @@ -19253,10 +19820,10 @@ #. item "Travel/Accomodation/Camping Site" #. -#: build/trans_presets.java:1624 +#: build/trans_presets.java:1613 msgid "Edit Camping Site" msgstr "Éditer un camping" #. item "Travel/Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1618 msgid "Food+Drinks" msgstr "Nourriture & boissons" @@ -19267,5 +19834,5 @@ #. #. -#: build/trans_presets.java:1630 build/trans_surveyor.java:47 +#: build/trans_presets.java:1619 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -19273,5 +19840,5 @@ #. item "Food+Drinks/Restaurant" #. -#: build/trans_presets.java:1632 +#: build/trans_presets.java:1621 msgid "Edit Restaurant" msgstr "Éditer un restaurant" @@ -19279,5 +19846,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "Cuisine" msgstr "Cuisine" @@ -19285,61 +19852,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "italian" msgstr "italien" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "chinese" msgstr "chinois" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "greek" msgstr "greque" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "german" msgstr "allemand" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "indian" msgstr "indien" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "regional" msgstr "régional" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "turkish" msgstr "turque" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "asian" msgstr "asiatique" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "thai" msgstr "thaïlandais" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "mexican" msgstr "mexicain" -#: build/trans_presets.java:1635 build/trans_presets.java:1643 +#: build/trans_presets.java:1624 build/trans_presets.java:1632 msgid "japanese" msgstr "japonais" -#: build/trans_presets.java:1638 +#: build/trans_presets.java:1627 msgid "Fast Food" msgstr "Fast Food" @@ -19347,9 +19914,9 @@ #. item "Food+Drinks/Fast Food" #. -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1629 msgid "Edit Fast Food Restaurant" msgstr "Éditer un fast food" -#: build/trans_presets.java:1646 +#: build/trans_presets.java:1635 msgid "Cafe" msgstr "Café" @@ -19357,9 +19924,9 @@ #. item "Food+Drinks/Cafe" #. -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1637 msgid "Edit Cafe" msgstr "Editez un café" -#: build/trans_presets.java:1653 +#: build/trans_presets.java:1642 msgid "Pub" msgstr "Bar" @@ -19367,18 +19934,18 @@ #. item "Food+Drinks/Pub" #. -#: build/trans_presets.java:1655 +#: build/trans_presets.java:1644 msgid "Edit Pub" msgstr "Pub" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1649 msgid "Biergarten" msgstr "Biergarten" #. item "Food+Drinks/Biergarten" -#: build/trans_presets.java:1661 +#: build/trans_presets.java:1650 msgid "Edit Biergarten" msgstr "Éditer un biergarten" -#: build/trans_presets.java:1666 +#: build/trans_presets.java:1655 msgid "Bar" msgstr "Bar" @@ -19386,9 +19953,9 @@ #. item "Food+Drinks/Bar" #. -#: build/trans_presets.java:1668 +#: build/trans_presets.java:1657 msgid "Edit Bar" msgstr "Modifier Bar" -#: build/trans_presets.java:1673 +#: build/trans_presets.java:1662 msgid "Nightclub" msgstr "Boîte de nuit" @@ -19396,24 +19963,24 @@ #. item "Food+Drinks/Nightclub" #. -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1664 msgid "Edit Nightclub" msgstr "Éditer une boîte de nuit" -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1670 msgid "Tourism" msgstr "Tourisme" #. group "Tourism" -#: build/trans_presets.java:1682 +#: build/trans_presets.java:1671 msgid "Attraction" msgstr "Attraction" #. item "Tourism/Attraction" -#: build/trans_presets.java:1683 +#: build/trans_presets.java:1672 msgid "Edit Attraction" msgstr "Editez une attraction" #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1688 +#: build/trans_presets.java:1677 msgid "Museum" msgstr "Musée" @@ -19421,9 +19988,9 @@ #. item "Tourism/Museum" #. -#: build/trans_presets.java:1690 +#: build/trans_presets.java:1679 msgid "Edit Museum" msgstr "Éditer un musée" -#: build/trans_presets.java:1695 +#: build/trans_presets.java:1684 msgid "Zoo" msgstr "Zoo" @@ -19432,9 +19999,9 @@ #. -#: build/trans_presets.java:1698 +#: build/trans_presets.java:1687 msgid "Edit Zoo" msgstr "Editez un Zoo" -#: build/trans_presets.java:1703 +#: build/trans_presets.java:1692 msgid "Viewpoint" msgstr "Point de vue" @@ -19442,24 +20009,24 @@ #. item "Tourism/Viewpoint" #. -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1694 msgid "Edit Viewpoint" msgstr "Éditer un point de vue" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1708 +#: build/trans_presets.java:1697 msgid "Look-Out Tower" msgstr "Tour de surveillance" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1710 +#: build/trans_presets.java:1699 msgid "Theme Park" msgstr "Parc d’attraction" #. item "Tourism/Theme Park" -#: build/trans_presets.java:1711 +#: build/trans_presets.java:1700 msgid "Edit Theme Park" msgstr "Éditer un parc d’attraction" -#: build/trans_presets.java:1716 +#: build/trans_presets.java:1705 msgid "Artwork" msgstr "Oeuvre d’art" @@ -19467,5 +20034,5 @@ #. item "Tourism/Artwork" #. -#: build/trans_presets.java:1718 +#: build/trans_presets.java:1707 msgid "Edit Artwork" msgstr "Éditer une oeuvre d’art" @@ -19473,19 +20040,19 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1712 msgid "Information Office" msgstr "Office du Tourisme" -#: build/trans_presets.java:1730 +#: build/trans_presets.java:1719 msgid "Map" msgstr "Carte" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "Detail Grade" msgstr "" #. item "Tourism/Map" combo "Detail Grade" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "topo" msgstr "" @@ -19523,5 +20090,5 @@ #. #. -#: build/trans_presets.java:1735 build/trans_style.java:619 +#: build/trans_presets.java:1724 build/trans_style.java:619 #: build/trans_style.java:635 build/trans_style.java:651 #: build/trans_style.java:659 @@ -19529,28 +20096,28 @@ msgstr "rue" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1724 msgid "scheme" msgstr "Schéma" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "Shown Area" msgstr "Zone affichée" #. item "Tourism/Map" combo "Shown Area" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "site" msgstr "Site" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "city" msgstr "Ville" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1725 msgid "region" msgstr "Région" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1737 build/trans_presets.java:1753 -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1726 build/trans_presets.java:1742 +#: build/trans_presets.java:1786 msgid "Closer Description" msgstr "Description détaillée" @@ -19560,5 +20127,5 @@ #. item "Tourism/Guidepost" text "Elevation" #. -#: build/trans_presets.java:1739 build/trans_presets.java:1762 +#: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" msgstr "Routes affichées pour :" @@ -19566,6 +20133,6 @@ #. item "Tourism/Map" check "Hiking" #. item "Tourism/Guidepost" check "Hiking" -#: build/trans_presets.java:1741 build/trans_presets.java:1764 -#: build/trans_presets.java:1982 +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +#: build/trans_presets.java:1971 msgid "Cycling" msgstr "Cyclisme" @@ -19573,5 +20140,5 @@ #. item "Tourism/Map" check "Cycling" #. item "Tourism/Guidepost" check "Cycling" -#: build/trans_presets.java:1742 build/trans_presets.java:1765 +#: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" msgstr "VTT" @@ -19579,6 +20146,6 @@ #. item "Tourism/Map" check "Mountainbiking" #. item "Tourism/Guidepost" check "Mountainbiking" -#: build/trans_presets.java:1743 build/trans_presets.java:1766 -#: build/trans_presets.java:2036 +#: build/trans_presets.java:1732 build/trans_presets.java:1755 +#: build/trans_presets.java:2025 msgid "Skiing" msgstr "Ski" @@ -19586,5 +20153,5 @@ #. item "Tourism/Map" check "Skiing" #. item "Tourism/Guidepost" check "Skiing" -#: build/trans_presets.java:1744 build/trans_presets.java:1767 +#: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" msgstr "Equitation" @@ -19592,46 +20159,46 @@ #. item "Tourism/Map" check "Riding" #. item "Tourism/Guidepost" check "Riding" -#: build/trans_presets.java:1745 build/trans_presets.java:1768 +#: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" -msgstr "... autres modes de transport possibles" +msgstr "…autres modes de transport possibles" #. item "Tourism/Map" label "... other transportation modes possible" -#: build/trans_presets.java:1747 +#: build/trans_presets.java:1736 msgid "Information Board" msgstr "Bureau d'informations" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "Board Content" msgstr "Contenu du panneau" #. item "Tourism/Information Board" combo "Board Content" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "notice" msgstr "Remarque" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "history" msgstr "histoire" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "nature" msgstr "nature" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "wildlife" msgstr "faune" -#: build/trans_presets.java:1752 +#: build/trans_presets.java:1741 msgid "plants" msgstr "Usines" #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1744 msgid "Guidepost" msgstr "Poteau indicateur" #. item "Tourism/Guidepost" label "... other transportation modes possible" -#: build/trans_presets.java:1770 +#: build/trans_presets.java:1759 msgid "Information Terminal" msgstr "Poste d'informations" @@ -19639,29 +20206,29 @@ #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" -#: build/trans_presets.java:1775 build/trans_presets.java:1785 +#: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" msgstr "Description précise" -#: build/trans_presets.java:1780 +#: build/trans_presets.java:1769 msgid "Audioguide" msgstr "Guide audio" #. -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" msgstr "Guide audio via téléphone mobile ?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" -#: build/trans_presets.java:1791 +#: build/trans_presets.java:1780 msgid "Phone number" msgstr "Numéro de téléphone" #. item "Tourism/Audioguide" text "Phone number" -#: build/trans_presets.java:1793 +#: build/trans_presets.java:1782 msgid "Other Information Points" msgstr "Autre points d'information" #. item "Tourism/Shelter" -#: build/trans_presets.java:1801 +#: build/trans_presets.java:1790 msgid "Edit Shelter" msgstr "Éditer un abri" @@ -19669,25 +20236,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1804 build/trans_presets.java:1810 +#: build/trans_presets.java:1793 build/trans_presets.java:1799 msgid "Fireplace" msgstr "Âtre" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1806 +#: build/trans_presets.java:1795 msgid "Picnic Site" msgstr "Site de pique-nique" #. item "Tourism/Picnic Site" -#: build/trans_presets.java:1807 +#: build/trans_presets.java:1796 msgid "Edit Picnic Site" msgstr "Éditer un site de pique-nique" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1802 msgid "Historic Places" msgstr "Patrimoine" #. group "Historic Places" -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1803 msgid "Castle" msgstr "Château" @@ -19696,19 +20263,19 @@ #. -#: build/trans_presets.java:1817 +#: build/trans_presets.java:1806 msgid "Edit Castle" msgstr "Éditer un château" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1821 +#: build/trans_presets.java:1810 msgid "Ruins" msgstr "Ruines" #. item "Historic Places/Ruins" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1811 msgid "Edit Ruins" msgstr "Éditer des ruines" -#: build/trans_presets.java:1827 +#: build/trans_presets.java:1816 msgid "Archaeological Site" msgstr "Site archéologique" @@ -19717,9 +20284,9 @@ #. -#: build/trans_presets.java:1830 +#: build/trans_presets.java:1819 msgid "Edit Archaeological Site" msgstr "Éditer un site archéologique" -#: build/trans_presets.java:1835 +#: build/trans_presets.java:1824 msgid "Battlefield" msgstr "Lieu de bataille" @@ -19727,10 +20294,10 @@ #. item "Historic Places/Battlefield" #. -#: build/trans_presets.java:1837 +#: build/trans_presets.java:1826 msgid "Edit Battlefield" msgstr "Éditer un lieu de bataille" #. item "Historic Places/Battlefield" text "Name" -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1830 msgid "Palaeontological Site" msgstr "Site paléontologique" @@ -19738,5 +20305,5 @@ #. item "Historic Places/Palaeontological Site" #. -#: build/trans_presets.java:1843 +#: build/trans_presets.java:1832 msgid "Edit Palaeontological Site" msgstr "Éditer un site paléontologique" @@ -19744,15 +20311,15 @@ #. item "Historic Places/Palaeontological Site" text "Name" #. -#: build/trans_presets.java:1848 +#: build/trans_presets.java:1837 msgid "Monument" msgstr "Monument commémoratif" #. item "Historic Places/Monument" -#: build/trans_presets.java:1849 +#: build/trans_presets.java:1838 msgid "Edit Monument" msgstr "Editez un monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1842 msgid "Memorial" msgstr "Mémorial" @@ -19760,55 +20327,55 @@ #. item "Historic Places/Memorial" #. -#: build/trans_presets.java:1855 +#: build/trans_presets.java:1844 msgid "Edit Memorial" msgstr "Éditer un mémorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1848 msgid "Wayside Cross" msgstr "Croix" #. item "Historic Places/Wayside Cross" -#: build/trans_presets.java:1860 +#: build/trans_presets.java:1849 msgid "Edit Wayside Cross" msgstr "Éditer une croix" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1853 msgid "Wayside Shrine" msgstr "Chapelle" #. item "Historic Places/Wayside Shrine" -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1854 msgid "Edit Wayside Shrine" msgstr "Éditer une Chapelle" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1869 +#: build/trans_presets.java:1858 msgid "Boundary Stone" msgstr "Pierre frontalière" #. item "Historic Places/Boundary Stone" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1859 msgid "Edit Boundary Stone" msgstr "Éditer Pierre frontalière" #. item "Historic Places/Boundary Stone" text "Name" -#: build/trans_presets.java:1875 +#: build/trans_presets.java:1864 msgid "Leisure" msgstr "Loisir" #. group "Leisure" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1865 msgid "Water Park" msgstr "Parc aquatique" #. item "Leisure/Water Park" -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1866 msgid "Edit Water Park" msgstr "Éditer un parc aquatique" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1881 +#: build/trans_presets.java:1870 msgid "Playground" msgstr "Aire de jeux" @@ -19816,35 +20383,35 @@ #. item "Leisure/Playground" #. -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1872 msgid "Edit Playground" msgstr "Éditer une zone de jeu" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1887 +#: build/trans_presets.java:1876 msgid "Fishing" msgstr "Pêche" #. item "Leisure/Fishing" -#: build/trans_presets.java:1888 +#: build/trans_presets.java:1877 msgid "Edit Fishing" msgstr "Éditer un lieu de pêche" #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1894 build/trans_presets.java:2699 +#: build/trans_presets.java:1883 build/trans_presets.java:2702 msgid "Sports" msgstr "Sports" #. group "Sports" -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1884 msgid "Sport Facilities" msgstr "Sport" #. group "Sports/Sport Facilities" -#: build/trans_presets.java:1896 +#: build/trans_presets.java:1885 msgid "Stadium" msgstr "Stade" #. item "Sports/Sport Facilities/Stadium" -#: build/trans_presets.java:1897 +#: build/trans_presets.java:1886 msgid "Edit Stadium" msgstr "Éditer un stade" @@ -19858,6 +20425,6 @@ #. item "Sports/Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1901 build/trans_presets.java:1910 -#: build/trans_presets.java:1919 build/trans_presets.java:1928 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1917 msgid "select sport:" msgstr "Selectionner un sport:" @@ -20249,30 +20816,30 @@ #. #. -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_style.java:3580 build/trans_style.java:3588 -#: build/trans_style.java:3596 build/trans_style.java:3604 -#: build/trans_style.java:3612 build/trans_style.java:3620 -#: build/trans_style.java:3628 build/trans_style.java:3636 -#: build/trans_style.java:3644 build/trans_style.java:3652 -#: build/trans_style.java:3660 build/trans_style.java:3668 -#: build/trans_style.java:3676 build/trans_style.java:3684 -#: build/trans_style.java:3692 build/trans_style.java:3700 -#: build/trans_style.java:3708 build/trans_style.java:3716 -#: build/trans_style.java:3724 build/trans_style.java:3732 -#: build/trans_style.java:3740 build/trans_style.java:3748 -#: build/trans_style.java:3756 build/trans_style.java:3764 -#: build/trans_style.java:3772 build/trans_style.java:3780 -#: build/trans_style.java:3788 build/trans_style.java:3796 -#: build/trans_style.java:3804 build/trans_style.java:3812 -#: build/trans_style.java:3820 build/trans_style.java:3828 -#: build/trans_style.java:3836 build/trans_style.java:3844 -#: build/trans_style.java:3852 build/trans_style.java:3860 -#: build/trans_style.java:3868 build/trans_style.java:3876 -#: build/trans_style.java:3884 build/trans_style.java:3892 -#: build/trans_style.java:3900 build/trans_style.java:3908 -#: build/trans_style.java:3916 build/trans_style.java:3924 -#: build/trans_style.java:3932 build/trans_style.java:3940 -#: build/trans_style.java:3948 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 +#: build/trans_style.java:3587 build/trans_style.java:3595 +#: build/trans_style.java:3603 build/trans_style.java:3611 +#: build/trans_style.java:3619 build/trans_style.java:3627 +#: build/trans_style.java:3635 build/trans_style.java:3643 +#: build/trans_style.java:3651 build/trans_style.java:3659 +#: build/trans_style.java:3667 build/trans_style.java:3675 +#: build/trans_style.java:3683 build/trans_style.java:3691 +#: build/trans_style.java:3699 build/trans_style.java:3707 +#: build/trans_style.java:3715 build/trans_style.java:3723 +#: build/trans_style.java:3731 build/trans_style.java:3739 +#: build/trans_style.java:3747 build/trans_style.java:3755 +#: build/trans_style.java:3763 build/trans_style.java:3771 +#: build/trans_style.java:3779 build/trans_style.java:3787 +#: build/trans_style.java:3795 build/trans_style.java:3803 +#: build/trans_style.java:3811 build/trans_style.java:3819 +#: build/trans_style.java:3827 build/trans_style.java:3835 +#: build/trans_style.java:3843 build/trans_style.java:3851 +#: build/trans_style.java:3859 build/trans_style.java:3867 +#: build/trans_style.java:3875 build/trans_style.java:3883 +#: build/trans_style.java:3891 build/trans_style.java:3899 +#: build/trans_style.java:3907 build/trans_style.java:3915 +#: build/trans_style.java:3923 build/trans_style.java:3931 +#: build/trans_style.java:3939 build/trans_style.java:3947 +#: build/trans_style.java:3955 msgid "sport" msgstr "sport" @@ -20282,225 +20849,225 @@ #. item "Sports/Sport Facilities/Pitch" combo "sport" #. item "Sports/Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "multi" msgstr "multi" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "archery" msgstr "tir à l'arc" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "athletics" msgstr "athletics" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "australian_football" msgstr "australian_football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "bowls" msgstr "boules" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "canoe" msgstr "canoë" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "climbing" msgstr "climbing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cricket_nets" msgstr "cricket_nets" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "croquet" msgstr "croquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "cycling" msgstr "cycling" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "dog_racing" msgstr "dog_racing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "equestrian" msgstr "équitation" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "football" msgstr "football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "gymnastics" msgstr "gymnastics" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "hockey" msgstr "hockey" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "horse_racing" msgstr "horse_racing" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "motor" msgstr "moteur" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "pelota" msgstr "pelote" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "racquet" msgstr "racquet" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "shooting" msgstr "chasse" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skating" msgstr "skate" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "skiing" msgstr "ski" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "soccer" msgstr "football" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "swimming" msgstr "swimming" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "table_tennis" msgstr "table_tennis" -#: build/trans_presets.java:1903 build/trans_presets.java:1912 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 +#: build/trans_presets.java:1910 build/trans_presets.java:1919 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1905 +#: build/trans_presets.java:1894 msgid "Sports Centre" msgstr "Centre sportif" #. item "Sports/Sport Facilities/Sports Centre" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1895 msgid "Edit Sports Centre" msgstr "Éditer un centre sportif" -#: build/trans_presets.java:1914 +#: build/trans_presets.java:1903 msgid "Pitch" msgstr "Terrain de sport" #. item "Sports/Sport Facilities/Pitch" -#: build/trans_presets.java:1915 +#: build/trans_presets.java:1904 msgid "Edit Pitch" msgstr "Éditer un terrain de sport" -#: build/trans_presets.java:1923 +#: build/trans_presets.java:1912 msgid "Racetrack" msgstr "Circuit" #. item "Sports/Sport Facilities/Racetrack" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1913 msgid "Edit Racetrack" msgstr "Éditer un circuit" -#: build/trans_presets.java:1932 +#: build/trans_presets.java:1921 msgid "Golf Course" msgstr "Parcours de Golf" #. item "Sports/Sport Facilities/Golf Course" -#: build/trans_presets.java:1933 +#: build/trans_presets.java:1922 msgid "Edit Golf Course" msgstr "Éditer un terrain de golf" -#: build/trans_presets.java:1938 +#: build/trans_presets.java:1927 msgid "Miniature Golf" msgstr "Minigolf" #. item "Sports/Sport Facilities/Miniature Golf" -#: build/trans_presets.java:1939 +#: build/trans_presets.java:1928 msgid "Edit Miniature Golf" msgstr "Éditer un minigolf" -#: build/trans_presets.java:1945 +#: build/trans_presets.java:1934 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1946 +#: build/trans_presets.java:1935 msgid "Multi" msgstr "Multi" #. item "Sport/Multi" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:1936 msgid "Edit Multi" msgstr "Editer Multi" @@ -20539,21 +21106,21 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "type" msgstr "type" @@ -20592,203 +21159,203 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "pitch" msgstr "Terrain" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "sports_centre" msgstr "sports_centre" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "stadium" msgstr "stadium" -#: build/trans_presets.java:1950 build/trans_presets.java:1956 -#: build/trans_presets.java:1962 build/trans_presets.java:1968 -#: build/trans_presets.java:1974 build/trans_presets.java:1980 -#: build/trans_presets.java:1986 build/trans_presets.java:1992 -#: build/trans_presets.java:1998 build/trans_presets.java:2004 -#: build/trans_presets.java:2010 build/trans_presets.java:2016 -#: build/trans_presets.java:2022 build/trans_presets.java:2028 -#: build/trans_presets.java:2034 build/trans_presets.java:2043 -#: build/trans_presets.java:2050 build/trans_presets.java:2058 -#: build/trans_presets.java:2064 build/trans_presets.java:2070 -#: build/trans_presets.java:2076 build/trans_presets.java:2082 -#: build/trans_presets.java:2088 build/trans_presets.java:2094 -#: build/trans_presets.java:2100 build/trans_presets.java:2106 -#: build/trans_presets.java:2112 build/trans_presets.java:2118 -#: build/trans_presets.java:2124 build/trans_presets.java:2130 -#: build/trans_presets.java:2136 build/trans_presets.java:2142 -#: build/trans_presets.java:2148 build/trans_presets.java:2154 +#: build/trans_presets.java:1939 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2032 +#: build/trans_presets.java:2039 build/trans_presets.java:2047 +#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:2065 build/trans_presets.java:2071 +#: build/trans_presets.java:2077 build/trans_presets.java:2083 +#: build/trans_presets.java:2089 build/trans_presets.java:2095 +#: build/trans_presets.java:2101 build/trans_presets.java:2107 +#: build/trans_presets.java:2113 build/trans_presets.java:2119 +#: build/trans_presets.java:2125 build/trans_presets.java:2131 +#: build/trans_presets.java:2137 build/trans_presets.java:2143 msgid "track" msgstr "№piste" -#: build/trans_presets.java:1952 +#: build/trans_presets.java:1941 msgid "10pin" msgstr "Bowling" #. item "Sport/10pin" -#: build/trans_presets.java:1953 +#: build/trans_presets.java:1942 msgid "Edit 10pin" msgstr "Éditer un Bowling" -#: build/trans_presets.java:1958 +#: build/trans_presets.java:1947 msgid "Athletics" msgstr "Athlétisme" #. item "Sport/Athletics" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:1948 msgid "Edit Athletics" msgstr "Éditer athlétisme" -#: build/trans_presets.java:1964 +#: build/trans_presets.java:1953 msgid "Archery" msgstr "Tir à l’arc" #. item "Sport/Archery" -#: build/trans_presets.java:1965 +#: build/trans_presets.java:1954 msgid "Edit Archery" msgstr "Éditer tir à l’arc" -#: build/trans_presets.java:1970 +#: build/trans_presets.java:1959 msgid "Climbing" msgstr "Escalade" #. item "Sport/Climbing" -#: build/trans_presets.java:1971 +#: build/trans_presets.java:1960 msgid "Edit Climbing" msgstr "Éditer escalade" -#: build/trans_presets.java:1976 +#: build/trans_presets.java:1965 msgid "Canoeing" msgstr "Canoë" #. item "Sport/Canoeing" -#: build/trans_presets.java:1977 +#: build/trans_presets.java:1966 msgid "Edit Canoeing" msgstr "Éditer canoë" #. item "Sport/Cycling" -#: build/trans_presets.java:1983 +#: build/trans_presets.java:1972 msgid "Edit Cycling" msgstr "Éditer cyclisme" -#: build/trans_presets.java:1988 +#: build/trans_presets.java:1977 msgid "Dog Racing" msgstr "Course de chiens" #. item "Sport/Dog Racing" -#: build/trans_presets.java:1989 +#: build/trans_presets.java:1978 msgid "Edit Dog Racing" msgstr "Éditer course de chiens" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:1983 msgid "Equestrian" msgstr "Equitation" #. item "Sport/Equestrian" -#: build/trans_presets.java:1995 +#: build/trans_presets.java:1984 msgid "Edit Equestrian" msgstr "Éditer sports équestres" -#: build/trans_presets.java:2000 +#: build/trans_presets.java:1989 msgid "Horse Racing" msgstr "Course de chevaux" #. item "Sport/Horse Racing" -#: build/trans_presets.java:2001 +#: build/trans_presets.java:1990 msgid "Edit Horse Racing" msgstr "Éditer course de chevaux" -#: build/trans_presets.java:2006 +#: build/trans_presets.java:1995 msgid "Gymnastics" msgstr "Gymnastique" #. item "Sport/Gymnastics" -#: build/trans_presets.java:2007 +#: build/trans_presets.java:1996 msgid "Edit Gymnastics" msgstr "Éditer gymnastique" -#: build/trans_presets.java:2012 +#: build/trans_presets.java:2001 msgid "Motor Sports" msgstr "Sports mécaniques" #. item "Sport/Motor Sports" -#: build/trans_presets.java:2013 +#: build/trans_presets.java:2002 msgid "Edit Motor Sports" msgstr "Éditer sports mécaniques" -#: build/trans_presets.java:2018 +#: build/trans_presets.java:2007 msgid "Skating" msgstr "Skate" #. item "Sport/Skating" -#: build/trans_presets.java:2019 +#: build/trans_presets.java:2008 msgid "Edit Skating" msgstr "Éditer patin à roulettes" -#: build/trans_presets.java:2024 +#: build/trans_presets.java:2013 msgid "Skateboard" msgstr "Skateboard" #. item "Sport/Skateboard" -#: build/trans_presets.java:2025 +#: build/trans_presets.java:2014 msgid "Edit Skateboard" msgstr "Éditer skateboard" -#: build/trans_presets.java:2030 +#: build/trans_presets.java:2019 msgid "Swimming" msgstr "Natation" #. item "Sport/Swimming" -#: build/trans_presets.java:2031 +#: build/trans_presets.java:2020 msgid "Edit Swimming" msgstr "Éditer natation" @@ -20796,56 +21363,56 @@ #. item "Sport/Skiing" #. -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2027 msgid "Edit Skiing" msgstr "ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "Piste type" msgstr "Type de piste" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "downhill" msgstr "de descente" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "nordic" msgstr "nordique" -#: build/trans_presets.java:2041 +#: build/trans_presets.java:2030 msgid "snow_park" msgstr "snow park" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "Difficulty" msgstr "Difficulté" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "novice" msgstr "verte" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "easy" msgstr "bleue" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "intermediate" msgstr "intermédiaire" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "advanced" msgstr "avancé" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "expert" msgstr "expert" -#: build/trans_presets.java:2042 +#: build/trans_presets.java:2031 msgid "freeride" msgstr "jaune" -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2034 msgid "Shooting" msgstr "Tirer" @@ -20853,182 +21420,182 @@ #. item "Sport/Shooting" #. -#: build/trans_presets.java:2047 +#: build/trans_presets.java:2036 msgid "Edit Shooting" msgstr "Éditer tir sportif" -#: build/trans_presets.java:2053 +#: build/trans_presets.java:2042 msgid "Sport (Ball)" msgstr "Sport de balle" #. group "Sport (Ball)" -#: build/trans_presets.java:2054 +#: build/trans_presets.java:2043 msgid "Soccer" msgstr "Football" #. item "Sport (Ball)/Soccer" -#: build/trans_presets.java:2055 +#: build/trans_presets.java:2044 msgid "Edit Soccer" msgstr "Éditer football" -#: build/trans_presets.java:2060 +#: build/trans_presets.java:2049 msgid "Football" msgstr "Football" #. item "Sport (Ball)/Football" -#: build/trans_presets.java:2061 +#: build/trans_presets.java:2050 msgid "Edit Football" msgstr "Éditer football" -#: build/trans_presets.java:2066 +#: build/trans_presets.java:2055 msgid "Australian Football" msgstr "Football australien" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2067 +#: build/trans_presets.java:2056 msgid "Edit Australian Football" msgstr "Éditer football australien" -#: build/trans_presets.java:2072 +#: build/trans_presets.java:2061 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2073 +#: build/trans_presets.java:2062 msgid "Edit Baseball" msgstr "Éditer baseball" -#: build/trans_presets.java:2078 +#: build/trans_presets.java:2067 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2079 +#: build/trans_presets.java:2068 msgid "Edit Basketball" msgstr "Éditer basketball" -#: build/trans_presets.java:2084 +#: build/trans_presets.java:2073 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2085 +#: build/trans_presets.java:2074 msgid "Edit Golf" msgstr "Editer un Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2077 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:2090 +#: build/trans_presets.java:2079 msgid "Boule" msgstr "Boules" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2091 +#: build/trans_presets.java:2080 msgid "Edit Boule" msgstr "Éditer boules" -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2085 msgid "Bowls" msgstr "Boules" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2097 +#: build/trans_presets.java:2086 msgid "Edit Bowls" msgstr "Éditer bowls" -#: build/trans_presets.java:2102 +#: build/trans_presets.java:2091 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2103 +#: build/trans_presets.java:2092 msgid "Edit Cricket" msgstr "Éditer cricket" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2097 msgid "Cricket Nets" msgstr "Filets de cricket" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2109 +#: build/trans_presets.java:2098 msgid "Edit Cricket Nets" msgstr "Éditer filets de cricket" -#: build/trans_presets.java:2114 +#: build/trans_presets.java:2103 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2104 msgid "Edit Croquet" msgstr "Éditer croquet" -#: build/trans_presets.java:2120 +#: build/trans_presets.java:2109 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2121 +#: build/trans_presets.java:2110 msgid "Edit Hockey" msgstr "Éditer hockey" -#: build/trans_presets.java:2126 +#: build/trans_presets.java:2115 msgid "Pelota" msgstr "Pelote" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2116 msgid "Edit Pelota" msgstr "Éditer pelote basque" -#: build/trans_presets.java:2132 +#: build/trans_presets.java:2121 msgid "Racquet" msgstr "Sports de raquette" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2122 msgid "Edit Racquet" msgstr "Éditer sports de raquette" -#: build/trans_presets.java:2138 +#: build/trans_presets.java:2127 msgid "Rugby" msgstr "Rugby" #. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2128 msgid "Edit Rugby" msgstr "Éditer rugby" -#: build/trans_presets.java:2144 +#: build/trans_presets.java:2133 msgid "Table Tennis" msgstr "Tennis de table" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2145 +#: build/trans_presets.java:2134 msgid "Edit Table Tennis" msgstr "Éditer tennis de table" -#: build/trans_presets.java:2150 +#: build/trans_presets.java:2139 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2151 +#: build/trans_presets.java:2140 msgid "Edit Tennis" msgstr "Éditer tennis" -#: build/trans_presets.java:2158 +#: build/trans_presets.java:2147 msgid "Man-Made" msgstr "Artificiel" #. group "Man-Made" -#: build/trans_presets.java:2159 +#: build/trans_presets.java:2148 msgid "Buildings" msgstr "Bâtiments" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2149 msgid "Building" msgstr "Bâtiment" @@ -21036,5 +21603,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2163 +#: build/trans_presets.java:2152 msgid "Public Building" msgstr "Bâtiment officiel" @@ -21042,10 +21609,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2165 +#: build/trans_presets.java:2154 msgid "Edit Public Building" msgstr "Éditer un bâtiment officiel" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2158 msgid "Town hall" msgstr "Mairie" @@ -21053,10 +21620,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2171 +#: build/trans_presets.java:2160 msgid "Edit Town hall" msgstr "Éditer une mairie" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2164 msgid "Embassy" msgstr "Ambassade" @@ -21064,10 +21631,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2177 +#: build/trans_presets.java:2166 msgid "Edit Embassy" msgstr "Editer une ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2170 msgid "Courthouse" msgstr "Palais de justice" @@ -21076,10 +21643,10 @@ #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2173 msgid "Edit Courthouse" msgstr "Éditer un palais de justice" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2188 +#: build/trans_presets.java:2177 msgid "Prison" msgstr "Prison" @@ -21088,10 +21655,10 @@ #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2180 msgid "Edit Prison" msgstr "Éditer une prison" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2184 msgid "Police" msgstr "Poste de police" @@ -21101,10 +21668,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2199 +#: build/trans_presets.java:2188 msgid "Edit Police" msgstr "Éditer un poste de police" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2192 msgid "Fire Station" msgstr "Caserne de pompiers" @@ -21113,10 +21680,10 @@ #. -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2195 msgid "Edit Fire Station" msgstr "Éditer une caserne de pompiers" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2210 +#: build/trans_presets.java:2199 msgid "Post Office" msgstr "Bureau de poste" @@ -21124,5 +21691,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2201 msgid "Edit Post Office" msgstr "Éditer un bureau de poste" @@ -21130,15 +21697,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2207 msgid "Kindergarten" msgstr "Jardin d’enfants" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2219 +#: build/trans_presets.java:2208 msgid "Edit Kindergarten" msgstr "Éditer un jardin d’enfants" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2212 msgid "School" msgstr "École" @@ -21146,10 +21713,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2225 +#: build/trans_presets.java:2214 msgid "Edit School" msgstr "Éditer une école" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2218 msgid "University" msgstr "Université" @@ -21157,10 +21724,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2231 +#: build/trans_presets.java:2220 msgid "Edit University" msgstr "Éditer une université" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2224 msgid "College" msgstr "Établissement d’enseignement supérieur" @@ -21168,5 +21735,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2237 +#: build/trans_presets.java:2226 msgid "Edit College" msgstr "Éditer un établissement d’enseignement supérieur" @@ -21174,5 +21741,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2242 +#: build/trans_presets.java:2231 msgid "Cinema" msgstr "Cinema" @@ -21181,10 +21748,10 @@ #. -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2234 msgid "Edit Cinema" msgstr "Éditer un cinéma" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2249 +#: build/trans_presets.java:2238 msgid "Library" msgstr "Bibliothèque" @@ -21193,9 +21760,9 @@ #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2241 msgid "Edit Library" msgstr "Éditer une bibliothèque" -#: build/trans_presets.java:2257 +#: build/trans_presets.java:2246 msgid "Arts Centre" msgstr "Centre artistique" @@ -21203,10 +21770,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2248 msgid "Edit Arts Centre" msgstr "Éditer un centre artistique" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2263 +#: build/trans_presets.java:2252 msgid "Theatre" msgstr "Théâtre" @@ -21215,10 +21782,10 @@ #. -#: build/trans_presets.java:2266 +#: build/trans_presets.java:2255 msgid "Edit Theatre" msgstr "Éditer un théatre" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2270 +#: build/trans_presets.java:2259 msgid "Place of Worship" msgstr "Lieu de culte" @@ -21228,5 +21795,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2274 +#: build/trans_presets.java:2263 msgid "Edit Place of Worship" msgstr "Éditer un lieu de culte" @@ -21235,6 +21802,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "Religion" msgstr "Religion" @@ -21243,66 +21810,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "unitarian" msgstr "unitarisme" -#: build/trans_presets.java:2277 build/trans_presets.java:3074 -#: build/trans_presets.java:3083 +#: build/trans_presets.java:2266 build/trans_presets.java:3077 +#: build/trans_presets.java:3086 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "Denomination" msgstr "Dénomination" @@ -21311,81 +21878,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "catholic" msgstr "catholique" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2278 build/trans_presets.java:3075 -#: build/trans_presets.java:3084 +#: build/trans_presets.java:2267 build/trans_presets.java:3078 +#: build/trans_presets.java:3087 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2282 +#: build/trans_presets.java:2271 msgid "Addresses" msgstr "Adresses" @@ -21394,5 +21961,5 @@ #. -#: build/trans_presets.java:2285 +#: build/trans_presets.java:2274 msgid "Edit Address Information" msgstr "Editez l'adresse" @@ -21400,5 +21967,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2276 msgid "House number" msgstr "Numéro du bâtiment" @@ -21406,20 +21973,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2289 +#: build/trans_presets.java:2278 msgid "House name" msgstr "Nom de la maison" +#. item "Man-Made/Buildings/Addresses" text "House name" +#: build/trans_presets.java:2279 +msgid "Street name" +msgstr "Nom de la rue" + #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2291 +#: build/trans_presets.java:2280 msgid "City name" msgstr "Nom de la ville" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2281 msgid "Post code" msgstr "Code postal" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2293 +#: build/trans_presets.java:2282 msgid "Country code" msgstr "Indicatif du pays" @@ -21428,5 +22000,5 @@ #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2288 msgid "Edit Address Interpolation" msgstr "Éditer l’interpolation d’adresse" @@ -21434,61 +22006,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "Numbering scheme" msgstr "Schéma de numérotation" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "odd" msgstr "pair" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "even" msgstr "impair" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2290 msgid "alphabetic" msgstr "alphabétique" -#: build/trans_presets.java:2304 +#: build/trans_presets.java:2293 msgid "Man Made" msgstr "Édifices" #. group "Man Made" -#: build/trans_presets.java:2305 +#: build/trans_presets.java:2294 msgid "Works" msgstr "Usine" #. item "Man Made/Works" -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2295 msgid "Edit Works" msgstr "Éditer une usine" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2299 msgid "Tower" msgstr "Structure de hauteur" #. item "Man Made/Tower" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2300 msgid "Edit Tower" msgstr "Éditer une structure de hauteur" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "Tower type" msgstr "Type de pylône" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "communication" msgstr "communication" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2303 msgid "observation" msgstr "observation" #. -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2305 msgid "Height (meters)" msgstr "Hauteur (mètres)" @@ -21496,25 +22068,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2309 msgid "Water Tower" msgstr "Château d’eau" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2310 msgid "Edit Water Tower" msgstr "Éditer un château d’eau" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2314 msgid "Gasometer" msgstr "Gazomètre" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2315 msgid "Edit Gasometer" msgstr "Éditer un gazomètre" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2319 msgid "Lighthouse" msgstr "Phare" @@ -21522,10 +22094,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2332 +#: build/trans_presets.java:2321 msgid "Edit Lighthouse" msgstr "Éditer un phare" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2325 msgid "Windmill" msgstr "Moulin à vent" @@ -21533,10 +22105,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2338 +#: build/trans_presets.java:2327 msgid "Edit Windmill" msgstr "Éditer un moulin à vent" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2331 msgid "Pipeline" msgstr "Canalisation" @@ -21545,37 +22117,37 @@ #. -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2334 msgid "Edit Pipeline" msgstr "Éditer une canalisation" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "oil" msgstr "pétrole" -#: build/trans_presets.java:2348 build/trans_presets.java:2390 +#: build/trans_presets.java:2337 build/trans_presets.java:2379 msgid "gas" msgstr "gaz" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "sewage" msgstr "égouts" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "heat" msgstr "chaleur" -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2337 msgid "any substance" msgstr "toute substance" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "underwater" msgstr "sous l'eau" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2338 msgid "overground" msgstr "aérien" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2340 msgid "Wastewater Plant" msgstr "Station d’épuration" @@ -21585,10 +22157,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2344 msgid "Edit Wastewater Plant" msgstr "Éditer une station d’épuration" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2348 msgid "Crane" msgstr "Grue" @@ -21596,10 +22168,10 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2350 msgid "Edit Crane" msgstr "Éditer une grue permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2354 msgid "Beacon" msgstr "Balise signalétique" @@ -21607,10 +22179,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2356 msgid "Edit Beacon" msgstr "Editer balise signalétique" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2360 msgid "Survey Point" msgstr "Équipement de topographie" @@ -21618,10 +22190,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2362 msgid "Edit Survey Point" msgstr "Éditer un équipement de topographie" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2366 msgid "Surveillance" msgstr "Surveillance" @@ -21629,5 +22201,5 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2379 +#: build/trans_presets.java:2368 msgid "Edit Surveillance Camera" msgstr "Éditer une caméra de surveillance" @@ -21635,5 +22207,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2384 +#: build/trans_presets.java:2373 msgid "Power Generator" msgstr "Centrale électrique" @@ -21643,35 +22215,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2388 +#: build/trans_presets.java:2377 msgid "Edit Power Generator" msgstr "Éditer une centrale électrique" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "coal" msgstr "charbon" -#: build/trans_presets.java:2390 +#: build/trans_presets.java:2379 msgid "photovoltaic" msgstr "photovoltaïque" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2382 msgid "Power Station" msgstr "Station électrique" @@ -21680,10 +22252,10 @@ #. -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2385 msgid "Edit Power Station" msgstr "Editez une station électrique" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2391 msgid "Power Sub Station" msgstr "Transformateur électrique" @@ -21692,5 +22264,5 @@ #. -#: build/trans_presets.java:2405 +#: build/trans_presets.java:2394 msgid "Edit Power Sub Station" msgstr "Modifier transformateur électrique" @@ -21698,10 +22270,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2408 build/trans_presets.java:2425 +#: build/trans_presets.java:2397 build/trans_presets.java:2414 msgid "Line reference" msgstr "Champ de vision" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2410 +#: build/trans_presets.java:2399 msgid "Power Tower" msgstr "Pylône électrique" @@ -21712,23 +22284,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2404 msgid "Edit Power Tower" msgstr "Éditer un pylône électrique" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "tower" msgstr "pylônes" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2405 msgid "pole" msgstr "" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2406 msgid "Tower reference" msgstr "Référence du pylône" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2408 msgid "Power Line" msgstr "Ligne haute tension" @@ -21737,75 +22309,75 @@ #. -#: build/trans_presets.java:2422 +#: build/trans_presets.java:2411 msgid "Edit Power Line" msgstr "Editer une ligne haute tension" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "Line type" msgstr "Type de ligne" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "line" msgstr "ligne" -#: build/trans_presets.java:2423 +#: build/trans_presets.java:2412 msgid "minor_line" msgstr "ligne mineure" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2415 msgid "Voltage" msgstr "Tension" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2416 msgid "Amount of Cables" msgstr "Nombre de câbles" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "Number of wires (better: conductors) per power cable" msgstr "Nombre de conducteurs par câbles" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "single" msgstr "simple" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "double" msgstr "double" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2417 msgid "quad" msgstr "quadruple" -#: build/trans_presets.java:2431 +#: build/trans_presets.java:2420 msgid "Amenities" msgstr "Équipements" #. group "Amenities" -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2421 msgid "Toilets" msgstr "Toilettes" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2439 build/trans_presets.java:2555 +#: build/trans_presets.java:2428 build/trans_presets.java:2558 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2430 msgid "Post Box" msgstr "Boîte aux lettres" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2435 msgid "Telephone" msgstr "Téléphone" @@ -21814,5 +22386,5 @@ #. -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2438 msgid "Edit Telephone" msgstr "Éditer un téléphone" @@ -21820,5 +22392,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2452 build/trans_presets.java:2556 +#: build/trans_presets.java:2441 build/trans_presets.java:2559 msgid "Coins" msgstr "Pièces" @@ -21826,5 +22398,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2453 build/trans_presets.java:2557 +#: build/trans_presets.java:2442 build/trans_presets.java:2560 msgid "Notes" msgstr "Billets" @@ -21832,5 +22404,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2454 build/trans_presets.java:2558 +#: build/trans_presets.java:2443 build/trans_presets.java:2561 msgid "Electronic purses and Charge cards" msgstr "Cartes de crédit temporaire" @@ -21838,5 +22410,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2455 build/trans_presets.java:2559 +#: build/trans_presets.java:2444 build/trans_presets.java:2562 msgid "Debit cards" msgstr "Cartes de débit" @@ -21844,15 +22416,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2456 build/trans_presets.java:2560 +#: build/trans_presets.java:2445 build/trans_presets.java:2563 msgid "Credit cards" msgstr "Cartes de crédits" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2446 msgid "Telephone cards" msgstr "Cartes téléphoniques" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2448 msgid "Recycling" msgstr "Recyclage" @@ -21861,5 +22433,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2451 msgid "Edit Recycling station" msgstr "Éditer un point de recylcage" @@ -21867,68 +22439,63 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2453 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2454 msgid "Cans" msgstr "Canettes" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2455 msgid "Clothes" msgstr "Vêtements" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2456 msgid "Glass" msgstr "Verre" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2457 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2469 +#: build/trans_presets.java:2458 msgid "Scrap Metal" msgstr "Ferrailleur" - -#. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2471 -msgid "Bench" -msgstr "Banc" #. item "Amenities/Bench" #. #. -#: build/trans_presets.java:2474 +#: build/trans_presets.java:2463 msgid "Backrest" msgstr "Accoudoir" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "Material" msgstr "Matériau" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "stone" msgstr "pierre" -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2464 msgid "plastic" msgstr "plastique" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "Colour" msgstr "Couleur" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "black" msgstr "noir" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "brown" msgstr "marron" @@ -21999,39 +22566,39 @@ #. #. -#: build/trans_presets.java:2476 build/trans_style.java:3071 -#: build/trans_style.java:3079 build/trans_style.java:3087 -#: build/trans_style.java:3095 build/trans_style.java:3143 -#: build/trans_style.java:3151 build/trans_style.java:3249 -#: build/trans_style.java:3257 +#: build/trans_presets.java:2465 build/trans_style.java:3087 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3111 build/trans_style.java:3159 +#: build/trans_style.java:3167 build/trans_style.java:3265 +#: build/trans_style.java:3273 msgid "green" msgstr "espace vert" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "red" msgstr "rouge" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "blue" msgstr "bleu" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "gray" msgstr "gris" -#: build/trans_presets.java:2476 +#: build/trans_presets.java:2465 msgid "white" msgstr "blanc" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2466 msgid "Amount of Seats" msgstr "Nombre de places" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2468 msgid "Hunting Stand" msgstr "Hutte de chasse" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2469 msgid "Edit Hunting Stand" msgstr "Hutte de chasse" @@ -22040,30 +22607,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2482 build/trans_presets.java:2944 +#: build/trans_presets.java:2471 build/trans_presets.java:2947 msgid "Height" msgstr "Hauteur" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "low" msgstr "faible" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "half" msgstr "à moitié" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2471 msgid "full" msgstr "complet" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2473 msgid "Hide" msgstr "Masquer" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2474 msgid "Lock" msgstr "Verrouiller" -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2476 msgid "Fountain" msgstr "Fontaine" @@ -22072,10 +22639,10 @@ #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2479 msgid "Edit Fountain" msgstr "Éditer une fontaine" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2483 msgid "Drinking Water" msgstr "Eau potable" @@ -22084,10 +22651,10 @@ #. -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2486 msgid "Edit Drinking Water" msgstr "Éditer un point d’eau potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2490 msgid "Baby Hatch" msgstr "Tour d’abandon (nouveau né)" @@ -22095,33 +22662,57 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2492 msgid "Edit Baby Hatch" msgstr "Éditer un tour d’abandon" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2509 +#: build/trans_presets.java:2498 msgid "Shops" msgstr "Magasins" #. group "Shops" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2499 +msgid "Car Dealer" +msgstr "" + +#. item "Shops/Car Dealer" +#. +#: build/trans_presets.java:2501 +msgid "Edit Car Shop" +msgstr "Éditer une concession/réparation" + +#. item "Shops/Car Dealer" text "Operator" +#: build/trans_presets.java:2506 +#, fuzzy +msgid "Bike Dealer" +msgstr "Lake Walker" + +#. item "Shops/Bike Dealer" +#. +#: build/trans_presets.java:2509 +msgid "Edit Bicycle Shop" +msgstr "Éditer un magasin de vélo" + +#. item "Shops/Bike Dealer" text "Name" +#: build/trans_presets.java:2513 msgid "Supermarket" msgstr "Supermarché" #. item "Shops/Supermarket" -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2514 msgid "Edit Supermarket" msgstr "Éditer un supermarché" -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2519 msgid "Chemist" msgstr "Droguerie" #. item "Shops/Chemist" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Edit Chemist" msgstr "Éditer la droguerie" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2525 msgid "Convenience Store" msgstr "Commerce de proximité" @@ -22129,9 +22720,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2524 +#: build/trans_presets.java:2527 msgid "Edit Convenience Store" msgstr "Éditer une épicerie" -#: build/trans_presets.java:2529 +#: build/trans_presets.java:2532 msgid "Kiosk" msgstr "Kiosque à journaux" @@ -22139,27 +22730,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2534 msgid "Edit Kiosk" msgstr "Éditer un kiosque à journaux" -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2539 msgid "Book Store" msgstr "Librairie" #. item "Shops/Book Store" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2540 msgid "Edit Book Store" msgstr "Éditer librairie" -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2545 msgid "Travel Agency" msgstr "Agence de voyage" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2546 msgid "Edit Travel Agency" msgstr "Éditer agence de voyage" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Vending machine" msgstr "Distributeur automatique" @@ -22167,5 +22758,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2550 +#: build/trans_presets.java:2553 msgid "Edit Vending machine" msgstr "Éditer un distributeur automatique" @@ -22173,88 +22764,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "Vending products" msgstr "Produits vendus" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "food" msgstr "food" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "sweets" msgstr "bonbons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "toys" msgstr "jouets" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2552 +#: build/trans_presets.java:2555 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2561 +#: build/trans_presets.java:2564 msgid "Account or loyalty cards" msgstr "Cartes de fidélité" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2566 msgid "Butcher" msgstr "Boucherie" @@ -22262,9 +22853,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Edit Butcher" msgstr "Éditer une boucherie" -#: build/trans_presets.java:2570 +#: build/trans_presets.java:2573 msgid "Baker" msgstr "Boulanger" @@ -22272,9 +22863,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Baker" msgstr "Éditer une boulangerie" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Florist" msgstr "Fleuriste" @@ -22282,18 +22873,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2582 msgid "Edit Florist" msgstr "Modifier fleuriste" -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2587 msgid "Organic" msgstr "Boutique bio" #. item "Shops/Organic" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Organic Shop" msgstr "Modifier boutique bio" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Alcohol" msgstr "Alcool" @@ -22301,54 +22892,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Alcohol Shop" msgstr "Modifier commerce d'acool" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Beverages" msgstr "Boissons" #. item "Shops/Beverages" -#: build/trans_presets.java:2598 +#: build/trans_presets.java:2601 msgid "Edit Beverages Shop" msgstr "Modifier débit de boissons" -#: build/trans_presets.java:2603 +#: build/trans_presets.java:2606 msgid "Computer" msgstr "Informatique" #. item "Shops/Computer" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Edit Computer Shop" msgstr "Modifier magasin informatique" -#: build/trans_presets.java:2609 +#: build/trans_presets.java:2612 msgid "Electronics" msgstr "Électronique" #. item "Shops/Electronics" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Edit Electronics Shop" msgstr "Modifier magasin d’électronique" -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2618 msgid "Hifi" msgstr "Hi-Fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Edit Hifi Shop" msgstr "Modifier boutique Hi-Fi" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2624 msgid "Furniture" msgstr "Ameublement" #. item "Shops/Furniture" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Edit Furniture Shop" msgstr "Modifier magasin d’ameublement" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2630 msgid "Garden Centre" msgstr "Jardinerie" @@ -22356,9 +22947,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Garden Centre" msgstr "Modifier jardinerie" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Hardware" msgstr "Quincaillerie" @@ -22366,9 +22957,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Hardware Store" msgstr "Modifier quincaillerie" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Do-it-yourself-store" msgstr "Magasin de bricolage" @@ -22376,54 +22967,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Do-it-yourself-store" msgstr "Éditer un magasin de bricolage" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Stationery" msgstr "Papeterie" #. item "Shops/Stationery" -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2652 msgid "Edit Stationery Shop" msgstr "Modifier papeterie" -#: build/trans_presets.java:2654 +#: build/trans_presets.java:2657 msgid "Hairdresser" msgstr "Coiffeur" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Edit Hairdresser" msgstr "Editez un Coiffeur" -#: build/trans_presets.java:2660 +#: build/trans_presets.java:2663 msgid "Shoes" msgstr "Magasin de chaussures" #. item "Shops/Shoes" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Edit Shoe Shop" msgstr "Modifier magasin de chaussures" -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2669 msgid "Toys" msgstr "Jouets" #. item "Shops/Toys" -#: build/trans_presets.java:2667 +#: build/trans_presets.java:2670 msgid "Edit Toy Shop" msgstr "Modifier magasin de jouets" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Video" msgstr "Vidéoclub" #. item "Shops/Video" -#: build/trans_presets.java:2673 +#: build/trans_presets.java:2676 msgid "Edit Video Shop" msgstr "Modifier vidéoclub" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2681 msgid "Dry Cleaning" msgstr "Pressing" @@ -22431,9 +23022,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2680 +#: build/trans_presets.java:2683 msgid "Edit Dry Cleaning" msgstr "Éditer un pressing" -#: build/trans_presets.java:2685 +#: build/trans_presets.java:2688 msgid "Laundry" msgstr "Laverie libre-service" @@ -22441,9 +23032,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2687 +#: build/trans_presets.java:2690 msgid "Edit Laundry" msgstr "Éditer une laverie" -#: build/trans_presets.java:2692 +#: build/trans_presets.java:2695 msgid "Outdoor" msgstr "Magasin de sports d’extérieur" @@ -22451,28 +23042,28 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Edit Outdoor Shop" msgstr "Éditer un magasin de sports d’extérieur" #. item "Shops/Sports" -#: build/trans_presets.java:2700 +#: build/trans_presets.java:2703 msgid "Edit Sports Shop" msgstr "Modifier magasin de sport" -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2708 msgid "Optician" msgstr "Opticien" #. item "Shops/Optician" -#: build/trans_presets.java:2706 +#: build/trans_presets.java:2709 msgid "Edit Optician" msgstr "Modifier opticien" -#: build/trans_presets.java:2713 +#: build/trans_presets.java:2716 msgid "Cash" msgstr "Argent" #. group "Cash" -#: build/trans_presets.java:2714 +#: build/trans_presets.java:2717 msgid "Bank" msgstr "Banque" @@ -22480,14 +23071,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2719 msgid "Edit Bank" msgstr "Editez une banque" -#: build/trans_presets.java:2721 build/trans_presets.java:2730 +#: build/trans_presets.java:2724 build/trans_presets.java:2733 msgid "Automated Teller Machine" msgstr "Distributeur automatique" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2726 msgid "Money Exchange" msgstr "Bureau de change" @@ -22495,5 +23086,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2728 msgid "Edit Money Exchange" msgstr "Éditer un bureau de change" @@ -22501,15 +23092,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2735 msgid "Edit Automated Teller Machine" msgstr "Éditer un distributeur automatique" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Health" msgstr "Santé" #. group "Health" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2741 msgid "Doctors" msgstr "Médecin" @@ -22517,18 +23108,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2740 +#: build/trans_presets.java:2743 msgid "Edit Doctors" msgstr "Modifier Médecin" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Dentist" msgstr "Dentiste" #. item "Health/Dentist" -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Dentist" msgstr "Editez le Dentiste" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Pharmacy" msgstr "Pharmacie" @@ -22536,5 +23127,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2753 +#: build/trans_presets.java:2756 msgid "Edit Pharmacy" msgstr "Éditer pharmacie" @@ -22542,9 +23133,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2755 +#: build/trans_presets.java:2758 msgid "Dispensing" msgstr "Dispensaire" -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2762 msgid "Hospital" msgstr "Hôpital" @@ -22552,10 +23143,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2764 msgid "Edit Hospital" msgstr "Éditer hôpital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2765 +#: build/trans_presets.java:2768 msgid "Emergency Access Point" msgstr "Point d’accès d’urgence" @@ -22564,5 +23155,5 @@ #. -#: build/trans_presets.java:2768 +#: build/trans_presets.java:2771 msgid "Edit Emergency Access Point" msgstr "Éditer point d’accès d’urgence" @@ -22571,20 +23162,20 @@ #. #. -#: build/trans_presets.java:2771 +#: build/trans_presets.java:2774 msgid "Point Number" msgstr "Numéro du point" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2775 msgid "Point Name" msgstr "Nom du point" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2777 msgid "Phone Number" msgstr "Numéro de téléphone" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2778 msgid "(Use international code, like +12-345-67890)" msgstr "(Utiliser le code international, comme +12-345-67890" @@ -22592,5 +23183,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2781 msgid "Veterinary" msgstr "Vétérinaire" @@ -22599,64 +23190,64 @@ #. -#: build/trans_presets.java:2781 +#: build/trans_presets.java:2784 msgid "Edit Veterinary" msgstr "Editez un Vétérinaire" -#: build/trans_presets.java:2788 +#: build/trans_presets.java:2791 msgid "Geography" msgstr "Géographie" #. group "Geography" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Places" msgstr "Lieux/endroits" #. group "Geography/Places" -#: build/trans_presets.java:2790 +#: build/trans_presets.java:2793 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Continent" msgstr "Éditer un continent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Country" msgstr "Pays" #. item "Geography/Places/Country" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Country" msgstr "Éditer un pays" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "State" msgstr "Département" #. item "Geography/Places/State" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit State" msgstr "Éditer un état" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2808 +#: build/trans_presets.java:2811 msgid "Region" msgstr "Région" #. item "Geography/Places/Region" -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Edit Region" msgstr "Éditer une région" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2814 +#: build/trans_presets.java:2817 msgid "County" msgstr "Comté/Canton" #. item "Geography/Places/County" -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2818 msgid "Edit County" msgstr "Éditer un comté/canton" @@ -22664,15 +23255,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2821 +#: build/trans_presets.java:2824 msgid "City" msgstr "Ville de plus de 100 000 habitants" #. item "Geography/Places/City" -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2825 msgid "Edit City" msgstr "Editez la ville" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2830 msgid "Town" msgstr "Ville 10 000 à 100 000 habitants" @@ -22680,10 +23271,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2832 msgid "Edit Town" msgstr "Editez la ville" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2837 msgid "Suburb" msgstr "Banlieue" @@ -22691,25 +23282,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2836 +#: build/trans_presets.java:2839 msgid "Edit Suburb" msgstr "Éditer une banlieue" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2844 msgid "Village" msgstr "Village" #. item "Geography/Places/Village" -#: build/trans_presets.java:2842 +#: build/trans_presets.java:2845 msgid "Edit Village" msgstr "Éditer un village" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2850 msgid "Hamlet" msgstr "Hameau" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2851 msgid "Edit Hamlet" msgstr "Éditer un hameau" @@ -22717,5 +23308,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2857 msgid "Locality" msgstr "Lieu-dit" @@ -22723,10 +23314,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2856 +#: build/trans_presets.java:2859 msgid "Edit Locality" msgstr "Éditer un lieu-dit" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Island" msgstr "île" @@ -22734,10 +23325,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2863 +#: build/trans_presets.java:2866 msgid "Edit Island" msgstr "Éditer une île" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2871 msgid "Islet" msgstr "îlot" @@ -22745,5 +23336,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2870 +#: build/trans_presets.java:2873 msgid "Edit Islet" msgstr "Éditer l'îlot" @@ -22751,5 +23342,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2879 msgid "Cave Entrance" msgstr "Entrée de grotte" @@ -22757,10 +23348,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Edit Cave Entrance" msgstr "Éditer une entrée de grotte" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2885 msgid "Peak" msgstr "Sommet" @@ -22768,10 +23359,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "Edit Peak" msgstr "Modifier un pic" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2889 +#: build/trans_presets.java:2892 msgid "Glacier" msgstr "Glacier" @@ -22779,10 +23370,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Edit Glacier" msgstr "Éditer un glacier" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:2899 msgid "Volcano" msgstr "Volcan" @@ -22790,70 +23381,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:2901 msgid "Edit Volcano" msgstr "Éditer un volcan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:2907 msgid "Boundaries" msgstr "Frontières" #. group "Boundaries" -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "National" msgstr "Nationale" #. item "Boundaries/National" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2909 msgid "Edit National Boundary" msgstr "Éditer une frontière nationale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2914 msgid "Administrative" msgstr "Administrative" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2912 +#: build/trans_presets.java:2915 msgid "Edit Administrative Boundary" msgstr "Éditer une frontière administrative" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2920 msgid "Civil" msgstr "Civile" #. item "Boundaries/Civil" -#: build/trans_presets.java:2918 +#: build/trans_presets.java:2921 msgid "Edit Civil Boundary" msgstr "Éditer une frontière civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2923 +#: build/trans_presets.java:2926 msgid "Political" msgstr "Politique" #. item "Boundaries/Political" -#: build/trans_presets.java:2924 +#: build/trans_presets.java:2927 msgid "Edit Political Boundary" msgstr "Éditer une zone électorale" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2932 msgid "National park" msgstr "Parc national" #. item "Boundaries/National park" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Edit National Park Boundary" msgstr "Éditer les frontières d’un parc national" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2939 msgid "Land use" msgstr "Utilisation du terrain" #. group "Land use" -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Tree" msgstr "Arbre" @@ -22862,15 +23453,15 @@ #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2943 msgid "Edit Tree" msgstr "Éditer un arbre isolé" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2948 msgid "Botanical Name" msgstr "Nom botanique" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2947 +#: build/trans_presets.java:2950 msgid "Wood" msgstr "Bois" @@ -22879,5 +23470,5 @@ #. -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2953 msgid "Edit Wood" msgstr "Éditer un bois" @@ -22885,17 +23476,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2953 build/trans_presets.java:2962 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2958 msgid "Forest" msgstr "Forêt" @@ -22904,14 +23495,14 @@ #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2961 msgid "Edit Forest Landuse" msgstr "Éditer une forêt" -#: build/trans_presets.java:2964 +#: build/trans_presets.java:2967 msgid "Nature Reserve" msgstr "Réserve naturelle" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:2965 +#: build/trans_presets.java:2968 msgid "Edit Nature Reserve" msgstr "Éditer une réserve naturelle" @@ -22919,25 +23510,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2970 +#: build/trans_presets.java:2973 msgid "Scree" msgstr "Zone d’éboulements" #. item "Land use/Scree" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2974 msgid "Edit Scree" msgstr "Éditer une zone d’éboulements" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Scrub" msgstr "Broussailles" #. item "Land use/Scrub" -#: build/trans_presets.java:2976 +#: build/trans_presets.java:2979 msgid "Edit Scrub" msgstr "Éditer des broussailles" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2980 +#: build/trans_presets.java:2983 msgid "Fell" msgstr "Talus" @@ -22945,10 +23536,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Fell" msgstr "Éditer un talus" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Heath" msgstr "Lande" @@ -22956,5 +23547,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:2991 msgid "Edit Heath" msgstr "Éditer une lande" @@ -22962,5 +23553,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:2996 msgid "Farmyard" msgstr "Bâtiments de ferme" @@ -22969,45 +23560,45 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:2999 msgid "Edit Farmyard Landuse" msgstr "Éditer des bâtiments de ferme" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Farmland" msgstr "Terrains de ferme" #. item "Land use/Farmland" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3005 msgid "Edit Farmland Landuse" msgstr "Éditer des terrains de ferme" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3010 msgid "Meadow" msgstr "Prairie" #. item "Land use/Meadow" -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3011 msgid "Edit Meadow Landuse" msgstr "Editer prairie" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3016 msgid "Vineyard" msgstr "Vigne" #. item "Land use/Vineyard" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3017 msgid "Edit Vineyard Landuse" msgstr "Éditer une vigne" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Allotments" msgstr "Jardins familiaux" #. item "Land use/Allotments" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3023 msgid "Edit Allotments Landuse" msgstr "Éditer des jardins familiaux" @@ -23015,25 +23606,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Garden" msgstr "Jardin" #. item "Land use/Garden" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3030 msgid "Edit Garden" msgstr "Éditer un jardin" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3034 msgid "Grass" msgstr "Herbe" #. item "Land use/Grass" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Edit Grass Landuse" msgstr "Éditer de l’herbe" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3037 +#: build/trans_presets.java:3040 msgid "Village Green" msgstr "Zone publique herborée" @@ -23041,10 +23632,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3042 msgid "Edit Village Green Landuse" msgstr "Éditer une zone publique herborée" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3044 +#: build/trans_presets.java:3047 msgid "Common" msgstr "Espace commun" @@ -23052,20 +23643,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3049 msgid "Edit Common" msgstr "Éditer un espace commun" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3050 +#: build/trans_presets.java:3053 msgid "Park" msgstr "Parc" #. item "Land use/Park" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3054 msgid "Edit Park" msgstr "Editez un Parc" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3055 +#: build/trans_presets.java:3058 msgid "Recreation Ground" msgstr "Aire de jeux" @@ -23073,5 +23664,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3060 msgid "Edit Recreation Ground Landuse" msgstr "Éditer une aire de jeux" @@ -23079,15 +23670,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3066 msgid "Residential area" msgstr "Zone résidentielle" #. item "Land use/Residential area" -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3067 msgid "Edit Residential Landuse" msgstr "Éditer une zone résidentielle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3072 msgid "Graveyard" msgstr "Petit cimetière" @@ -23095,9 +23686,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3071 +#: build/trans_presets.java:3074 msgid "Edit Graveyard" msgstr "Éditer un petit cimetière" -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3080 msgid "Cemetery" msgstr "Cimetière" @@ -23105,39 +23696,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Edit Cemetery Landuse" msgstr "Éditer un cimetière" -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Retail" msgstr "Zone commerciale" #. item "Land use/Retail" -#: build/trans_presets.java:3087 +#: build/trans_presets.java:3090 msgid "Edit Retail Landuse" msgstr "Éditer une zone commerciale" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Commercial" msgstr "Bureaux" #. item "Land use/Commercial" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3096 msgid "Edit Commercial Landuse" msgstr "Éditer des bureaux" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Industrial" msgstr "Zone industrielle" #. item "Land use/Industrial" -#: build/trans_presets.java:3099 +#: build/trans_presets.java:3102 msgid "Edit Industrial Landuse" msgstr "Éditer une zone industrielle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3104 +#: build/trans_presets.java:3107 msgid "Railway land" msgstr "Zone ferroviaire" @@ -23145,15 +23736,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Edit Railway Landuse" msgstr "Éditer une zone ferroviaire" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Military" msgstr "Militaire" #. item "Land use/Military" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3115 msgid "Edit Military Landuse" msgstr "Éditer un terrain militaire" @@ -23161,55 +23752,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "Construction area" msgstr "Zone de construction" #. item "Land use/Construction area" -#: build/trans_presets.java:3119 +#: build/trans_presets.java:3122 msgid "Edit Construction Landuse" msgstr "Éditer un chantier" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Brownfield" msgstr "Terrain en friche" #. item "Land use/Brownfield" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3128 msgid "Edit Brownfield Landuse" msgstr "Éditer un terrain en friche" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3133 msgid "Greenfield" msgstr "Espace vert" #. item "Land use/Greenfield" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "Edit Greenfield Landuse" msgstr "Éditer une nouvelle zone de construction" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Landfill" msgstr "Décharge" #. item "Land use/Landfill" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3140 msgid "Edit Landfill Landuse" msgstr "Éditer une décharge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3145 msgid "Quarry" msgstr "Carrière" #. item "Land use/Quarry" -#: build/trans_presets.java:3143 +#: build/trans_presets.java:3146 msgid "Edit Quarry Landuse" msgstr "Éditer une carrière" #. group "Relations" -#: build/trans_presets.java:3152 +#: build/trans_presets.java:3155 msgid "Multipolygon" msgstr "Multypoligone" @@ -23219,5 +23810,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "Edit Multipolygon" msgstr "Modifier un multipolygone" @@ -23226,10 +23817,10 @@ #. #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3165 msgid "outer segment" msgstr "segment extérieur" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3166 msgid "inner segment" msgstr "segment intérieur" @@ -23237,5 +23828,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3166 +#: build/trans_presets.java:3169 msgid "Turn restriction" msgstr "Interdiction de tourner" @@ -23244,5 +23835,5 @@ #. -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3172 msgid "Edit Turn Restriction" msgstr "Modifier une interdiction de tourner" @@ -23250,34 +23841,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_left_turn" msgstr "Interdiction de tourner à gauche" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_right_turn" msgstr "Interdiction de tourner à droite" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_straight_on" msgstr "Interdiction d'aller tout droit" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "no_u_turn" msgstr "Interdiction de faire demi-tour" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_right_turn" msgstr "Obligation de tourner à droite" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_left_turn" msgstr "Obligation de tourner à gauche" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3174 msgid "only_straight_on" msgstr "Obligation d'aller tout droit" @@ -23286,15 +23877,15 @@ #. #. -#: build/trans_presets.java:3176 +#: build/trans_presets.java:3179 msgid "from way" msgstr "chemin d'origine" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3177 +#: build/trans_presets.java:3180 msgid "via node or way" msgstr "nœud ou chemin de passage" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3178 +#: build/trans_presets.java:3181 msgid "to way" msgstr "chemin destination" @@ -23302,5 +23893,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3184 msgid "Route" msgstr "Route" @@ -23309,5 +23900,5 @@ #. -#: build/trans_presets.java:3184 +#: build/trans_presets.java:3187 msgid "Edit Route" msgstr "Modifier une route" @@ -23315,5 +23906,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "Route type" msgstr "Type de route" @@ -23385,24 +23976,24 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:233 -#: build/trans_style.java:683 build/trans_style.java:906 -#: build/trans_style.java:914 build/trans_style.java:922 -#: build/trans_style.java:930 build/trans_style.java:938 +#: build/trans_presets.java:3189 build/trans_style.java:233 +#: build/trans_style.java:683 build/trans_style.java:877 +#: build/trans_style.java:885 build/trans_style.java:893 +#: build/trans_style.java:901 build/trans_style.java:909 msgid "bicycle" msgstr "vélo/bicyclette" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "road" msgstr "route" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "ski" msgstr "ski" @@ -23455,5 +24046,5 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:247 +#: build/trans_presets.java:3189 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -23462,13 +24053,13 @@ msgstr "piéton" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "hiking" msgstr "randonnée" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3186 +#: build/trans_presets.java:3189 msgid "detour" msgstr "détour" @@ -23482,10 +24073,10 @@ #. #. -#: build/trans_presets.java:3186 build/trans_style.java:1206 +#: build/trans_presets.java:3189 build/trans_style.java:1161 msgid "subway" msgstr "métro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3192 msgid "Symbol description" msgstr "Description du symbole" @@ -23493,31 +24084,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3192 +#: build/trans_presets.java:3195 msgid "Network" msgstr "Réseau" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "Route state" msgstr "État de la route" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "proposed" msgstr "proposé" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "alternate" msgstr "alternatif" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "temporary" msgstr "temporaire" -#: build/trans_presets.java:3194 +#: build/trans_presets.java:3197 msgid "connection" msgstr "connexion" -#: build/trans_presets.java:3195 +#: build/trans_presets.java:3198 msgid "Color (hex)" msgstr "Couleur (hexa)" @@ -23526,30 +24117,30 @@ #. #. -#: build/trans_presets.java:3198 +#: build/trans_presets.java:3201 msgid "route segment" msgstr "segment de route" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3199 +#: build/trans_presets.java:3202 msgid "forward segment" msgstr "segment suivant" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3200 +#: build/trans_presets.java:3203 msgid "backward segment" msgstr "segment précédent" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3201 +#: build/trans_presets.java:3204 msgid "halt point" msgstr "point d'arrêt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3202 +#: build/trans_presets.java:3205 msgid "forward halt point" msgstr "point d'arrêt suivant" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3206 msgid "backward halt point" msgstr "point d'arrêt précédent" @@ -23760,130 +24351,4 @@ #. #. -#. color rail -#. -#. 1 -#. 10000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color railwaypoint -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color amenity_light -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color woodarea -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated #. color sport #. @@ -23900,98 +24365,7 @@ #. #. -#. color service -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. color deprecated -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:627 build/trans_style.java:824 -#: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3391 build/trans_style.java:3392 -#: build/trans_style.java:3962 build/trans_style.java:4270 -#: build/trans_style.java:4279 build/trans_style.java:4288 -#: build/trans_style.java:4297 build/trans_style.java:4306 -#: build/trans_style.java:4315 build/trans_style.java:4324 -#: build/trans_style.java:4325 build/trans_style.java:4334 -#: build/trans_style.java:4343 +#: build/trans_style.java:627 build/trans_style.java:3969 msgid "deprecated" msgstr "déprécié" @@ -24368,7 +24742,7 @@ #. #. -#: build/trans_style.java:643 build/trans_style.java:948 -#: build/trans_style.java:956 build/trans_style.java:964 -#: build/trans_style.java:972 build/trans_style.java:980 +#: build/trans_style.java:643 build/trans_style.java:919 +#: build/trans_style.java:927 build/trans_style.java:935 +#: build/trans_style.java:943 build/trans_style.java:951 msgid "highway_track" msgstr "piste" @@ -24432,13 +24806,92 @@ #. #. color rail -#: build/trans_style.java:724 build/trans_style.java:1180 -#: build/trans_style.java:1244 build/trans_style.java:1252 -#: build/trans_style.java:1261 build/trans_style.java:1269 -#: build/trans_style.java:1277 build/trans_style.java:1278 +#. color rail +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:724 build/trans_style.java:1135 +#: build/trans_style.java:1199 build/trans_style.java:1207 +#: build/trans_style.java:1216 build/trans_style.java:1224 +#: build/trans_style.java:1232 build/trans_style.java:1233 +#: build/trans_style.java:1240 msgid "rail" msgstr "voie ferrée" -#. color deprecated +#. color rail #. +#. 1 +#. 10000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -24454,5 +24907,5 @@ #. #. -#: build/trans_style.java:839 +#: build/trans_style.java:810 msgid "services" msgstr "services" @@ -24466,5 +24919,5 @@ #. #. -#: build/trans_style.java:847 +#: build/trans_style.java:818 msgid "ford" msgstr "gué" @@ -24485,5 +24938,5 @@ #. #. -#: build/trans_style.java:862 +#: build/trans_style.java:833 msgid "turningcircle" msgstr "zone de manœuvre" @@ -24498,5 +24951,5 @@ #. #. -#: build/trans_style.java:886 +#: build/trans_style.java:857 msgid "emergency_access_point" msgstr "accès d'urgence" @@ -24511,5 +24964,5 @@ #. #. color riverbank -#: build/trans_style.java:998 build/trans_style.java:999 +#: build/trans_style.java:969 build/trans_style.java:970 msgid "riverbank" msgstr "berge" @@ -24523,5 +24976,5 @@ #. #. -#: build/trans_style.java:1015 +#: build/trans_style.java:986 msgid "stream" msgstr "ruisseau" @@ -24535,5 +24988,5 @@ #. #. -#: build/trans_style.java:1031 +#: build/trans_style.java:1002 msgid "dock" msgstr "dock" @@ -24555,16 +25008,4 @@ #. #. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:1053 -msgid "aqueduct" -msgstr "aqueduc" - -#. color aqueduct -#. #. 1 #. 50000 @@ -24661,4 +25102,11 @@ #. #. +#. +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -24727,13 +25175,13 @@ #. #. -#: build/trans_style.java:1062 build/trans_style.java:1091 -#: build/trans_style.java:1099 build/trans_style.java:1100 -#: build/trans_style.java:1108 build/trans_style.java:1578 -#: build/trans_style.java:1585 build/trans_style.java:1594 -#: build/trans_style.java:1602 build/trans_style.java:1627 -#: build/trans_style.java:1635 build/trans_style.java:1643 -#: build/trans_style.java:1651 build/trans_style.java:1658 -#: build/trans_style.java:1667 build/trans_style.java:1675 -#: build/trans_style.java:1683 build/trans_style.java:1691 +#: build/trans_style.java:1025 build/trans_style.java:1054 +#: build/trans_style.java:1062 build/trans_style.java:1063 +#: build/trans_style.java:1071 build/trans_style.java:1548 +#: build/trans_style.java:1555 build/trans_style.java:1564 +#: build/trans_style.java:1572 build/trans_style.java:1604 +#: build/trans_style.java:1612 build/trans_style.java:1620 +#: build/trans_style.java:1628 build/trans_style.java:1635 +#: build/trans_style.java:1644 build/trans_style.java:1652 +#: build/trans_style.java:1660 build/trans_style.java:1668 msgid "manmade" msgstr "artificiel" @@ -24779,6 +25227,6 @@ #. #. -#. color deprecated -#. +#. color railwaypoint +#. #. 1 #. 50000 @@ -24795,7 +25243,7 @@ #. #. -#: build/trans_style.java:1118 build/trans_style.java:1133 -#: build/trans_style.java:1148 build/trans_style.java:1164 -#: build/trans_style.java:1172 +#: build/trans_style.java:1081 build/trans_style.java:1096 +#: build/trans_style.java:1111 build/trans_style.java:1119 +#: build/trans_style.java:1127 msgid "railwaypoint" msgstr "point ferroviaire" @@ -24818,10 +25266,10 @@ #. #. -#: build/trans_style.java:1189 build/trans_style.java:1198 +#: build/trans_style.java:1144 build/trans_style.java:1153 msgid "otherrail" msgstr "Autre voie ferrée" #. color otherrail -#: build/trans_style.java:1190 +#: build/trans_style.java:1145 msgid "railover" msgstr "passage au dessus d'une voie ferrée" @@ -24857,11 +25305,12 @@ #. #. color oldrail -#: build/trans_style.java:1214 build/trans_style.java:1224 -#: build/trans_style.java:1225 build/trans_style.java:1235 -#: build/trans_style.java:1236 +#: build/trans_style.java:1169 build/trans_style.java:1179 +#: build/trans_style.java:1180 build/trans_style.java:1190 +#: build/trans_style.java:1191 msgid "oldrail" msgstr "ligne ferroviaire touristique" #. color rail +#. #. 1 #. 50000 @@ -24902,6 +25351,6 @@ #. #. -#: build/trans_style.java:1308 build/trans_style.java:1309 -#: build/trans_style.java:1341 +#: build/trans_style.java:1271 build/trans_style.java:1272 +#: build/trans_style.java:1304 msgid "aeroway" msgstr "piste d'atterrissage" @@ -24915,5 +25364,5 @@ #. #. -#: build/trans_style.java:1317 +#: build/trans_style.java:1280 msgid "terminal" msgstr "terminal" @@ -24935,5 +25384,5 @@ #. #. -#: build/trans_style.java:1325 build/trans_style.java:1333 +#: build/trans_style.java:1288 build/trans_style.java:1296 msgid "aeroway_dark" msgstr "piste (sombre)" @@ -24947,5 +25396,5 @@ #. #. -#: build/trans_style.java:1349 +#: build/trans_style.java:1312 msgid "aeroway_light" msgstr "piste (claire)" @@ -24953,4 +25402,11 @@ #. color aeroway_light #. +#. 1 +#. 50000 +#. +#. +#. +#. +#. #. 1 #. 50000 @@ -25000,7 +25456,7 @@ #. #. -#: build/trans_style.java:1366 build/trans_style.java:1374 -#: build/trans_style.java:1382 build/trans_style.java:1390 -#: build/trans_style.java:1398 +#: build/trans_style.java:1336 build/trans_style.java:1344 +#: build/trans_style.java:1352 build/trans_style.java:1360 +#: build/trans_style.java:1368 msgid "aerialway" msgstr "couloir aérien" @@ -25017,5 +25473,5 @@ #. #. color piste_easy -#: build/trans_style.java:1408 build/trans_style.java:1409 +#: build/trans_style.java:1378 build/trans_style.java:1379 msgid "piste_easy" msgstr "piste bleue" @@ -25030,5 +25486,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1417 build/trans_style.java:1418 +#: build/trans_style.java:1387 build/trans_style.java:1388 msgid "piste_intermediate" msgstr "piste rouge" @@ -25043,5 +25499,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1426 build/trans_style.java:1427 +#: build/trans_style.java:1396 build/trans_style.java:1397 msgid "piste_advanced" msgstr "piste noire" @@ -25056,5 +25512,5 @@ #. #. color piste_expert -#: build/trans_style.java:1435 build/trans_style.java:1436 +#: build/trans_style.java:1405 build/trans_style.java:1406 msgid "piste_expert" msgstr "piste_orange" @@ -25069,5 +25525,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1444 build/trans_style.java:1445 +#: build/trans_style.java:1414 build/trans_style.java:1415 msgid "piste_freeride" msgstr "hors piste" @@ -25082,5 +25538,5 @@ #. #. color piste_novice -#: build/trans_style.java:1453 build/trans_style.java:1454 +#: build/trans_style.java:1423 build/trans_style.java:1424 msgid "piste_novice" msgstr "piste verte" @@ -25200,11 +25656,11 @@ #. #. -#: build/trans_style.java:1465 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1496 -#: build/trans_style.java:1504 build/trans_style.java:1512 -#: build/trans_style.java:1520 build/trans_style.java:1528 -#: build/trans_style.java:1536 build/trans_style.java:1544 -#: build/trans_style.java:1552 build/trans_style.java:1560 -#: build/trans_style.java:1568 +#: build/trans_style.java:1435 build/trans_style.java:1449 +#: build/trans_style.java:1457 build/trans_style.java:1466 +#: build/trans_style.java:1474 build/trans_style.java:1482 +#: build/trans_style.java:1490 build/trans_style.java:1498 +#: build/trans_style.java:1506 build/trans_style.java:1514 +#: build/trans_style.java:1522 build/trans_style.java:1530 +#: build/trans_style.java:1538 msgid "power" msgstr "alimentation électrique" @@ -25218,5 +25674,5 @@ #. #. color pier -#: build/trans_style.java:1609 build/trans_style.java:1610 +#: build/trans_style.java:1579 build/trans_style.java:1580 msgid "pier" msgstr "appontement/jetée" @@ -25230,5 +25686,5 @@ #. #. -#: build/trans_style.java:1618 +#: build/trans_style.java:1588 msgid "pipeline" msgstr "canalisation" @@ -25356,12 +25812,29 @@ #. #. -#: build/trans_style.java:1701 build/trans_style.java:1709 -#: build/trans_style.java:1717 build/trans_style.java:1725 -#: build/trans_style.java:1733 build/trans_style.java:1741 -#: build/trans_style.java:1757 build/trans_style.java:1765 -#: build/trans_style.java:1773 build/trans_style.java:1781 -#: build/trans_style.java:1789 build/trans_style.java:1797 -#: build/trans_style.java:1805 build/trans_style.java:1813 -#: build/trans_style.java:1821 +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color leisure +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:1678 build/trans_style.java:1686 +#: build/trans_style.java:1694 build/trans_style.java:1702 +#: build/trans_style.java:1710 build/trans_style.java:1718 +#: build/trans_style.java:1734 build/trans_style.java:1742 +#: build/trans_style.java:1750 build/trans_style.java:1758 +#: build/trans_style.java:1766 build/trans_style.java:1774 +#: build/trans_style.java:1782 build/trans_style.java:1790 +#: build/trans_style.java:1798 build/trans_style.java:1806 +#: build/trans_style.java:1814 msgid "leisure" msgstr "loisir" @@ -25375,5 +25848,5 @@ #. #. -#: build/trans_style.java:1749 +#: build/trans_style.java:1726 msgid "marina" msgstr "port" @@ -25411,4 +25884,20 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25427,4 +25916,12 @@ #. #. +#. +#. +#. color amenity +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25445,8 +25942,10 @@ #. #. -#: build/trans_style.java:1831 build/trans_style.java:1839 -#: build/trans_style.java:1847 build/trans_style.java:1855 -#: build/trans_style.java:1863 build/trans_style.java:1871 -#: build/trans_style.java:1879 build/trans_style.java:1887 +#: build/trans_style.java:1824 build/trans_style.java:1832 +#: build/trans_style.java:1840 build/trans_style.java:1848 +#: build/trans_style.java:1856 build/trans_style.java:1864 +#: build/trans_style.java:1872 build/trans_style.java:1880 +#: build/trans_style.java:1888 build/trans_style.java:1896 +#: build/trans_style.java:1904 msgid "amenity" msgstr "aménité" @@ -25548,10 +26047,10 @@ #. #. -#: build/trans_style.java:1895 build/trans_style.java:1903 -#: build/trans_style.java:1911 build/trans_style.java:1919 -#: build/trans_style.java:1927 build/trans_style.java:1935 -#: build/trans_style.java:1943 build/trans_style.java:1951 -#: build/trans_style.java:1959 build/trans_style.java:1966 -#: build/trans_style.java:1975 build/trans_style.java:1983 +#: build/trans_style.java:1912 build/trans_style.java:1920 +#: build/trans_style.java:1928 build/trans_style.java:1936 +#: build/trans_style.java:1944 build/trans_style.java:1952 +#: build/trans_style.java:1960 build/trans_style.java:1968 +#: build/trans_style.java:1976 build/trans_style.java:1983 +#: build/trans_style.java:1992 build/trans_style.java:2000 msgid "amenity_traffic" msgstr "équipement de traffic" @@ -25805,5 +26304,5 @@ #. #. -#. +#. #. color health #. @@ -25949,4 +26448,12 @@ #. #. +#. +#. color amenity_light +#. +#. 1 +#. 50000 +#. +#. +#. #. #. @@ -25966,23 +26473,23 @@ #. #. -#: build/trans_style.java:1991 build/trans_style.java:2006 -#: build/trans_style.java:2014 build/trans_style.java:2022 -#: build/trans_style.java:2037 build/trans_style.java:2045 -#: build/trans_style.java:2053 build/trans_style.java:2061 -#: build/trans_style.java:2176 build/trans_style.java:2184 -#: build/trans_style.java:2191 build/trans_style.java:2200 -#: build/trans_style.java:2208 build/trans_style.java:2216 -#: build/trans_style.java:2224 build/trans_style.java:2232 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2311 build/trans_style.java:2319 -#: build/trans_style.java:2327 build/trans_style.java:2336 -#: build/trans_style.java:2344 build/trans_style.java:2351 -#: build/trans_style.java:2359 build/trans_style.java:2367 -#: build/trans_style.java:2375 build/trans_style.java:2383 -#: build/trans_style.java:2391 build/trans_style.java:2399 -#: build/trans_style.java:2407 build/trans_style.java:2415 -#: build/trans_style.java:2423 build/trans_style.java:2431 -#: build/trans_style.java:2439 build/trans_style.java:2448 -#: build/trans_style.java:2463 +#: build/trans_style.java:2008 build/trans_style.java:2023 +#: build/trans_style.java:2031 build/trans_style.java:2039 +#: build/trans_style.java:2054 build/trans_style.java:2062 +#: build/trans_style.java:2070 build/trans_style.java:2078 +#: build/trans_style.java:2193 build/trans_style.java:2201 +#: build/trans_style.java:2208 build/trans_style.java:2217 +#: build/trans_style.java:2225 build/trans_style.java:2233 +#: build/trans_style.java:2241 build/trans_style.java:2249 +#: build/trans_style.java:2257 build/trans_style.java:2265 +#: build/trans_style.java:2328 build/trans_style.java:2336 +#: build/trans_style.java:2344 build/trans_style.java:2353 +#: build/trans_style.java:2361 build/trans_style.java:2368 +#: build/trans_style.java:2376 build/trans_style.java:2384 +#: build/trans_style.java:2392 build/trans_style.java:2400 +#: build/trans_style.java:2408 build/trans_style.java:2416 +#: build/trans_style.java:2424 build/trans_style.java:2432 +#: build/trans_style.java:2440 build/trans_style.java:2448 +#: build/trans_style.java:2456 build/trans_style.java:2464 +#: build/trans_style.java:2473 build/trans_style.java:2488 msgid "amenity_light" msgstr "équipement lumineux" @@ -26014,6 +26521,6 @@ #. #. -#: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3310 +#: build/trans_style.java:2086 build/trans_style.java:2094 +#: build/trans_style.java:3326 msgid "light_water" msgstr "eau (claire)" @@ -26074,14 +26581,14 @@ #. #. -#: build/trans_style.java:2255 build/trans_style.java:2263 -#: build/trans_style.java:2271 build/trans_style.java:2280 -#: build/trans_style.java:2287 build/trans_style.java:2295 -#: build/trans_style.java:2303 +#: build/trans_style.java:2272 build/trans_style.java:2280 +#: build/trans_style.java:2288 build/trans_style.java:2297 +#: build/trans_style.java:2304 build/trans_style.java:2312 +#: build/trans_style.java:2320 msgid "health" msgstr "santé" -#. color deprecated -#. 1 -#. 40000 +#. color amenity_light +#. 1 +#. 50000 #. #. @@ -26428,5 +26935,4 @@ #. #. -#: build/trans_style.java:2482 build/trans_style.java:2490 #: build/trans_style.java:2498 build/trans_style.java:2506 #: build/trans_style.java:2514 build/trans_style.java:2522 @@ -26449,5 +26955,6 @@ #: build/trans_style.java:2786 build/trans_style.java:2794 #: build/trans_style.java:2802 build/trans_style.java:2810 -#: build/trans_style.java:2819 +#: build/trans_style.java:2818 build/trans_style.java:2826 +#: build/trans_style.java:2835 msgid "shop" msgstr "magasin" @@ -26519,8 +27026,8 @@ #. #. -#: build/trans_style.java:2829 build/trans_style.java:2837 #: build/trans_style.java:2845 build/trans_style.java:2853 #: build/trans_style.java:2861 build/trans_style.java:2869 #: build/trans_style.java:2877 build/trans_style.java:2885 +#: build/trans_style.java:2893 build/trans_style.java:2901 msgid "hotel" msgstr "hôtel" @@ -26621,9 +27128,9 @@ #. #. -#: build/trans_style.java:2893 build/trans_style.java:2901 #: build/trans_style.java:2909 build/trans_style.java:2917 #: build/trans_style.java:2925 build/trans_style.java:2933 -#: build/trans_style.java:2934 build/trans_style.java:2942 -#: build/trans_style.java:2958 build/trans_style.java:2980 +#: build/trans_style.java:2941 build/trans_style.java:2949 +#: build/trans_style.java:2950 build/trans_style.java:2958 +#: build/trans_style.java:2974 build/trans_style.java:2996 msgid "tourism" msgstr "tourisme" @@ -26711,9 +27218,9 @@ #. #. -#: build/trans_style.java:2990 build/trans_style.java:2998 #: build/trans_style.java:3006 build/trans_style.java:3014 #: build/trans_style.java:3022 build/trans_style.java:3030 #: build/trans_style.java:3038 build/trans_style.java:3046 #: build/trans_style.java:3054 build/trans_style.java:3062 +#: build/trans_style.java:3070 build/trans_style.java:3078 msgid "historic" msgstr "patrimoine" @@ -26727,5 +27234,5 @@ #. #. -#: build/trans_style.java:3103 +#: build/trans_style.java:3119 msgid "quarry" msgstr "carrière" @@ -26739,5 +27246,5 @@ #. #. -#: build/trans_style.java:3111 +#: build/trans_style.java:3127 msgid "landfill" msgstr "décharge" @@ -26759,5 +27266,5 @@ #. #. -#: build/trans_style.java:3119 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3143 msgid "basin" msgstr "bassin" @@ -26771,5 +27278,5 @@ #. #. -#: build/trans_style.java:3135 +#: build/trans_style.java:3151 msgid "forest" msgstr "forêt" @@ -26783,5 +27290,5 @@ #. #. -#: build/trans_style.java:3167 +#: build/trans_style.java:3183 msgid "farmyard" msgstr "bâtiments de ferme" @@ -26804,5 +27311,5 @@ #. #. -#: build/trans_style.java:3176 build/trans_style.java:3184 +#: build/trans_style.java:3192 build/trans_style.java:3200 msgid "retail" msgstr "commerce de proximité" @@ -26816,5 +27323,5 @@ #. #. -#: build/trans_style.java:3192 +#: build/trans_style.java:3208 msgid "industrial" msgstr "zone industrielle" @@ -26828,5 +27335,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3216 msgid "brownfield" msgstr "terrain en friche" @@ -26840,5 +27347,5 @@ #. #. -#: build/trans_style.java:3208 +#: build/trans_style.java:3224 msgid "greenfield" msgstr "espace vert" @@ -26852,5 +27359,5 @@ #. #. -#: build/trans_style.java:3216 +#: build/trans_style.java:3232 msgid "railland" msgstr "zone ferroviaire" @@ -26907,7 +27414,7 @@ #. #. -#: build/trans_style.java:3233 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3284 +#: build/trans_style.java:3249 build/trans_style.java:3284 #: build/trans_style.java:3292 build/trans_style.java:3300 +#: build/trans_style.java:3308 build/trans_style.java:3316 msgid "military" msgstr "zone militaire" @@ -26921,5 +27428,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3257 msgid "cemetery" msgstr "cimetière" @@ -26932,5 +27439,5 @@ #. #. -#: build/trans_style.java:3317 +#: build/trans_style.java:3333 msgid "peak" msgstr "sommet" @@ -26945,5 +27452,5 @@ #. #. -#: build/trans_style.java:3326 +#: build/trans_style.java:3342 msgid "glacier" msgstr "glacier" @@ -26957,5 +27464,5 @@ #. #. -#: build/trans_style.java:3334 +#: build/trans_style.java:3350 msgid "volcano" msgstr "volcan" @@ -27010,8 +27517,8 @@ #. #. -#: build/trans_style.java:3342 build/trans_style.java:3343 -#: build/trans_style.java:3351 build/trans_style.java:3367 -#: build/trans_style.java:3440 build/trans_style.java:3448 -#: build/trans_style.java:3456 +#: build/trans_style.java:3358 build/trans_style.java:3359 +#: build/trans_style.java:3367 build/trans_style.java:3383 +#: build/trans_style.java:3447 build/trans_style.java:3455 +#: build/trans_style.java:3463 msgid "natural" msgstr "nature" @@ -27025,5 +27532,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3375 msgid "scrub" msgstr "broussailles" @@ -27037,5 +27544,5 @@ #. #. -#: build/trans_style.java:3375 +#: build/trans_style.java:3391 msgid "heath" msgstr "lande/bruyère" @@ -27049,5 +27556,5 @@ #. #. -#: build/trans_style.java:3383 +#: build/trans_style.java:3399 msgid "woodarea" msgstr "Zone de forêt" @@ -27061,5 +27568,5 @@ #. #. -#: build/trans_style.java:3424 +#: build/trans_style.java:3431 msgid "mud" msgstr "terrain boueux/vase" @@ -27073,5 +27580,5 @@ #. #. -#: build/trans_style.java:3432 +#: build/trans_style.java:3439 msgid "beach" msgstr "plage" @@ -27149,8 +27656,8 @@ #. #. -#: build/trans_style.java:3472 build/trans_style.java:3480 -#: build/trans_style.java:3488 build/trans_style.java:3496 -#: build/trans_style.java:3504 build/trans_style.java:3512 -#: build/trans_style.java:3520 build/trans_style.java:3528 +#: build/trans_style.java:3479 build/trans_style.java:3487 +#: build/trans_style.java:3495 build/trans_style.java:3503 +#: build/trans_style.java:3511 build/trans_style.java:3519 +#: build/trans_style.java:3527 build/trans_style.java:3535 msgid "route" msgstr "route" @@ -27198,7 +27705,7 @@ #. #. -#: build/trans_style.java:3538 build/trans_style.java:3546 -#: build/trans_style.java:3554 build/trans_style.java:3562 -#: build/trans_style.java:3570 +#: build/trans_style.java:3545 build/trans_style.java:3553 +#: build/trans_style.java:3561 build/trans_style.java:3569 +#: build/trans_style.java:3577 msgid "boundary" msgstr "frontière" @@ -27348,11 +27855,11 @@ #. #. -#: build/trans_style.java:4010 build/trans_style.java:4018 -#: build/trans_style.java:4026 build/trans_style.java:4034 -#: build/trans_style.java:4042 build/trans_style.java:4050 -#: build/trans_style.java:4058 build/trans_style.java:4066 -#: build/trans_style.java:4074 build/trans_style.java:4082 -#: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4017 build/trans_style.java:4025 +#: build/trans_style.java:4033 build/trans_style.java:4041 +#: build/trans_style.java:4049 build/trans_style.java:4057 +#: build/trans_style.java:4065 build/trans_style.java:4073 +#: build/trans_style.java:4081 build/trans_style.java:4089 +#: build/trans_style.java:4097 build/trans_style.java:4105 +#: build/trans_style.java:4113 msgid "place" msgstr "lieu" @@ -27400,6 +27907,6 @@ #. #. -#: build/trans_style.java:4223 build/trans_style.java:4230 -#: build/trans_style.java:4237 build/trans_style.java:4244 +#: build/trans_style.java:4202 build/trans_style.java:4209 +#: build/trans_style.java:4216 build/trans_style.java:4223 msgid "address" msgstr "adresse" @@ -27755,33 +28262,126 @@ msgstr "Sicile - Italie" +#~ msgid "Updating primitive" +#~ msgstr "Mise à jour des primitives" + +#~ msgid "Expected closing parenthesis." +#~ msgstr "Les parenthèses doivent être fermées." + #~ msgid "" -#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ "Current number of changes exceeds the max. number of changes, current is " +#~ "{0}, max is {1}" #~ msgstr "" -#~ "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " -#~ "présent." - -#~ msgid "Download all incomplete ways and nodes in relation" +#~ "Le nombre actuel de changements dépasse le maximum autorisé. Nombre " +#~ "courant : {0}, maximum : {1}" + +#~ msgid "Use an open changeset" +#~ msgstr "Utiliser ensemble de changements ouvert" + +#~ msgid "" +#~ "I can take a picture of my GPS receiver.
Can this help?" #~ msgstr "" -#~ "Télécharger tous les chemins et les nœuds incomplets dans la relation" - -#~ msgid "" -#~ "Enable to upload all changes in one request, disable to use one request " -#~ "per changed primitive" +#~ "Je peux prendre un autre phot de mon GPS.
Cela peut-il aider ?" + +#~ msgid "All images" +#~ msgstr "Toutes les images" + +#~ msgid "Images with no exif position" +#~ msgstr "Images sans position EXIF" + +#~ msgid "Not yet tagged images" +#~ msgstr "Images non encore étiquetées" + +#~ msgid "Found {0} matches of {1} in GPX track {2}" +#~ msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" + +#~ msgid "GPX Track loaded" +#~ msgstr "Trace GPX chargée" + +#~ msgid "Offset between track and photos: {0}m {1}s" +#~ msgstr "Différence entre la trace et les photos : {0}min. {1}sec." + +#~ msgid "Default Values" +#~ msgstr "Valeurs par défaut" + +#~ msgid "Enable proxy server" +#~ msgstr "Activer le serveur mandataire (proxy)" + +#~ msgid "Anonymous" +#~ msgstr "Anonyme" + +#~ msgid "Proxy server host" +#~ msgstr "Hôte du serveur mandataire" + +#~ msgid "Proxy server port" +#~ msgstr "Port du serveur mandataire" + +#~ msgid "Proxy server username" +#~ msgstr "Nom d’utilisateur du serveur mandataire" + +#~ msgid "Proxy server password" +#~ msgstr "Mot de passe du serveur mandataire" + +#~ msgid "NullPointerException, possibly some missing tags." #~ msgstr "" -#~ "Permettre l'envoi de tous les changements en une requête, désactivez pour " -#~ "utiliser une requête par primitive modifiée" - -#~ msgid "Images for {0}" -#~ msgstr "Images pour {0}" - -#~ msgid "Read GPX..." -#~ msgstr "Lecture GPX..." +#~ "Échec (NullPointerException). Sans doute parce qu'il manque des attributs." + +#~ msgid "Preparing..." +#~ msgstr "Préparation en cours…" + +#~ msgid "Uploading..." +#~ msgstr "Envoi en cours…" + +#~ msgid "Incorrect password or username." +#~ msgstr "Mot de passe ou nom d’utilisateur incorrect." + +#~ msgid "Enter Password" +#~ msgstr "Entrer le mot de passe" + +#~ msgid "Login" +#~ msgstr "Identifiant" + +#~ msgid "Auto-tag source added:" +#~ msgstr "Ajouter le commentaire de source suivant :" + +#~ msgid "Interpolation" +#~ msgstr "Interpolation" + +#~ msgid "Optional" +#~ msgstr "Optionnel" + +#~ msgid "Shop" +#~ msgstr "Concession/Réparation" + +#~ msgid "aqueduct" +#~ msgstr "aqueduc" + +#~ msgid "Move" +#~ msgstr "Déplacer" + +#~ msgid "Data Layer" +#~ msgstr "Calque de données" + +#~ msgid "No data imported." +#~ msgstr "Aucune donnée importée" + +#~ msgid "Select a bookmark first." +#~ msgstr "Sélectionner un marque-page en premier." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Aucun document ouvert donc rien à sauvegarder." + +#~ msgid "Unknown file extension." +#~ msgstr "Extension de fichier inconnue." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Résoudre les conflits" #~ msgid "No time for point {0} x {1}" #~ msgstr "Aucune heure pour le point {0}·x·{1}" -#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" -#~ msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" - #~ msgid "No images with readable timestamps found." #~ msgstr "Aucune image avec des informations horaires lisibles trouvée." @@ -27793,7 +28393,4 @@ #~ msgstr "Extinction du GPS : {0}" -#~ msgid "current delta: {0}s" -#~ msgstr "variation différentielle actuelle : {0}s" - #~ msgid "timezone difference: " #~ msgstr "différence de fuseau horaire : " @@ -27802,83 +28399,6 @@ #~ msgstr "{0} dans la trace." -#~ msgid "Sync clock" -#~ msgstr "Synchroniser l’horloge" - -#~ msgid "The date in file \"{0}\" could not be parsed." -#~ msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." - -#~ msgid "There is no EXIF time within the file \"{0}\"." -#~ msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." - #~ msgid "Image" #~ msgstr "Image" - -#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#~ msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" - -#~ msgid "GPS unit timezone (difference to photo)" -#~ msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" - -#~ msgid "Synchronize Time with GPS Unit" -#~ msgstr "Synchroniser l’heure avec l’instrument GPS" - -#~ msgid "Time entered could not be parsed." -#~ msgstr "La date indiquée ne peut être analysée." - -#~ 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." - -#~ msgid "AgPifoJ - Geotagged pictures" -#~ msgstr "AgPifoJ - Images géoétiquettées" - -#~ msgid "Open images with AgPifoJ..." -#~ msgstr "Ouvrir les images avec AgPifoJ..." - -#~ msgid "osmarender options" -#~ msgstr "options osmarender" - -#~ msgid "" -#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -#~ "import EXIF geotagged pictures." -#~ msgstr "" -#~ "Un autre greffon de géo-marquage pour JOSM. Corrèle des photos avec des " -#~ "traces GPS, ou importe des photos géo-marquées." - -#~ msgid "" -#~ "Several utilities that make your life easier: e.g. simplify way, join " -#~ "areas, jump to position." -#~ msgstr "" -#~ "Quelques utilitaires qui vous rendent la vie plus facile : par ex. " -#~ "simplifier un chemin, joindre des aires, aller à une position." - -#~ msgid "Move" -#~ msgstr "Déplacer" - -#~ msgid "Data Layer" -#~ msgstr "Calque de données" - -#~ msgid "No data imported." -#~ msgstr "Aucune donnée importée" - -#~ msgid "Select a bookmark first." -#~ msgstr "Sélectionner un marque-page en premier." - -#~ msgid "File could not be found." -#~ msgstr "Impossible de trouver le fichier." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Aucun document ouvert donc rien à sauvegarder." - -#~ msgid "Unknown file extension." -#~ msgstr "Extension de fichier inconnue." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Résoudre les conflits" #~ msgid "Object" @@ -27951,4 +28471,7 @@ #~ msgstr "Date" +#~ msgid "Images for {0}" +#~ msgstr "Images pour {0}" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -27966,4 +28489,7 @@ #~ msgid "requested: {0}" #~ msgstr "demandé : {0}" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Images géoétiquettées" #~ msgid "Metacarta Map Rectifier image id" @@ -28007,4 +28533,16 @@ #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" + +#~ msgid "Sync clock" +#~ msgstr "Synchroniser l’horloge" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" #~ msgid "Error while parsing" @@ -28032,4 +28570,7 @@ #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" #~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :" + +#~ msgid "Read GPX..." +#~ msgstr "Lecture GPX..." #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -28081,4 +28622,10 @@ #~ msgid "zoom" #~ msgstr "zoom" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Ouvrir les images avec AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "options osmarender" #~ msgid "error requesting update" @@ -28226,4 +28773,8 @@ #~ msgstr "id du nœud mal formé" +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "" +#~ "Télécharger tous les chemins et les nœuds incomplets dans la relation" + #~ msgid "" #~ "The selected nodes have differing relation memberships. Do you still " @@ -28452,4 +29003,19 @@ #~ msgstr "Fusionner les conflits." +#~ msgid "current delta: {0}s" +#~ msgstr "variation différentielle actuelle : {0}s" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchroniser l’heure avec l’instrument GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "La date indiquée ne peut être analysée." + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Nom d’utilisateur (e-mail) du compte OSM." @@ -28570,4 +29136,11 @@ #~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Un autre greffon de géo-marquage pour JOSM. Corrèle des photos avec des " +#~ "traces GPS, ou importe des photos géo-marquées." + +#~ msgid "" #~ "Tools to work with authors/users. Selects map data that belongs to " #~ "selected user, opens browser showing selected author profile page." @@ -28576,4 +29149,11 @@ #~ "donnée de l'utilisateur sur la carte pour ouvrir un navigateur affichant " #~ "la page du profil de l'auteur." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Quelques utilitaires qui vous rendent la vie plus facile : par ex. " +#~ "simplifier un chemin, joindre des aires, aller à une position." #~ msgid "Directly load TCX files from JOSM." @@ -28666,7 +29246,4 @@ #~ msgid "Select a starting node on the end of a way" #~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin" - -#~ msgid "Reached a junction" -#~ msgstr "Intersection atteinte" #~ msgid "Checking whether node {0} is gone ..." @@ -28858,4 +29435,11 @@ #~ msgstr "Téléchargement des référents depuis OSM..." +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Permettre l'envoi de tous les changements en une requête, désactivez pour " +#~ "utiliser une requête par primitive modifiée" + #~ msgid "Can't search because there is no loaded data." #~ msgstr "Impossible de rechercher car il n’y a pas de données chargées." @@ -28951,4 +29535,10 @@ #~ "HREF=\"{1}\">votre langage." +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " +#~ "présent." + #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données" @@ -29000,10 +29590,4 @@ #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." -#~ msgstr "" -#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, " -#~ "reçu \"{1}\"" - -#~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " #~ "''{1}''." @@ -29014,2 +29598,8 @@ #~ msgid "No type found. History is empty." #~ msgstr "Pas de type trouvé. L'historique est vide." + +#~ 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."