Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 17103) +++ applications/editors/josm/i18n/po/fr.po (revision 17485) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-18 13:46+0200\n" -"PO-Revision-Date: 2009-08-17 15:35+0000\n" -"Last-Translator: jeromekessler5@gmail.com \n" +"POT-Creation-Date: 2009-09-06 13:51+0200\n" +"PO-Revision-Date: 2009-09-05 16:41+0000\n" +"Last-Translator: David Crochet \n" "Language-Team: Fr\n" "MIME-Version: 1.0\n" @@ -14,77 +14,80 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-08-18 11:06+0000\n" +"X-Launchpad-Export-Date: 2009-09-06 11:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:186 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/Main.java:193 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Creating main GUI" msgstr "Création de l’interface graphique d'utilisateur (GUI)" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:196 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 +#: ../core/src/org/openstreetmap/josm/Main.java:203 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:318 msgid "Help" msgstr "Aide" -#: ../core/src/org/openstreetmap/josm/Main.java:289 +#: ../core/src/org/openstreetmap/josm/Main.java:296 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "La projection {0} ne peut être activée. Utilisation de Mercator" -#: ../core/src/org/openstreetmap/josm/Main.java:290 -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/Main.java:297 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/Main.java:534 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#: ../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:381 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 -#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:172 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 @@ -94,158 +97,166 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Error" msgstr "Erreur" -#: ../core/src/org/openstreetmap/josm/Main.java:399 -msgid "Hint: Some changes came from uploading new data to the server." -msgstr "" -"Indication : Certains changements viennent de l’envoi de nouvelles données " -"sur le serveur." - -#: ../core/src/org/openstreetmap/josm/Main.java:400 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/Main.java:445 +#, fuzzy, java-format +msgid "" +"There are unsaved changes in {0} layer. Discard the changes and continue?" +msgid_plural "" +"There are unsaved changes in {0} layers. Discard the changes and continue?" +msgstr[0] "" +"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " +"et continuer ?" +msgstr[1] "" +"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " +"et continuer ?" + +#: ../core/src/org/openstreetmap/josm/Main.java:452 msgid "Unsaved Changes" msgstr "Modifications non enregistrées" -#: ../core/src/org/openstreetmap/josm/Main.java:401 -msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "" -"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications " -"et continuer ?" - -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save and Exit" msgstr "Enregistrer et quitter" -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Annuler et quitter" -#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/Main.java:453 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 msgid "Cancel" msgstr "Annuler" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:477 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorant l’URL malformé : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:450 -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/Main.java:478 +#: ../core/src/org/openstreetmap/josm/Main.java:497 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:144 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 msgid "Warning" msgstr "Avertissement" -#: ../core/src/org/openstreetmap/josm/Main.java:449 +#: ../core/src/org/openstreetmap/josm/Main.java:496 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorant l URL malformé du fichier : \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:509 +#: ../core/src/org/openstreetmap/josm/Main.java:533 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92 +#, fuzzy, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"Lecture du fichier \"{0}\" impossible. L’erreur est :
{1}
" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -270,7 +281,8 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -308,5 +320,5 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 #: build/trans_surveyor.java:64 msgid "Info" @@ -330,6 +342,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "Plugins" msgstr "Greffons" @@ -344,8 +356,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 -#, java-format -msgid "" -"WARNING: unexpected format of API base URL. Redirection to history page for " -"OSM primitive will probably fail. API base URL is: ''{0}''" +#, fuzzy, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to info or history " +"page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" "ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page " @@ -353,10 +365,20 @@ "\"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, fuzzy, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to user page for OSM " +"user will probably fail. API base URL is: ''{0}''" +msgstr "" +"ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page " +"d’historique des primitives OSM échouera probablement. l’URL de l’API est : " +"\"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" "Veuillez sélectionner au moins un nœud, chemin ou relation déjà chargé." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105 #, java-format msgid "" @@ -367,5 +389,5 @@ "primitives sélectionnées uniquement." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Please select the target layer." msgstr "Veuillez sélectionner le calque de destination." @@ -375,11 +397,11 @@ msgstr "Sélectionnez le calque de destination" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469 msgid "Merge" msgstr "Fusionner" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89 #, java-format msgid "" @@ -390,5 +412,5 @@ "puisse être fusionné." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90 msgid "No target layers" msgstr "Pas de calque de destination" @@ -405,11 +427,11 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 @@ -438,5 +460,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 msgid "Latitude" msgstr "Latitude" @@ -445,30 +467,30 @@ #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 msgid "Longitude" msgstr "Longitude" +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254 msgid "Align Nodes in Circle" msgstr "Placer les nœuds en cercle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Déplacer les nœuds sélectionnés en un cercle." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -482,6 +504,6 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:72 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40 #, java-format @@ -489,58 +511,57 @@ msgstr "Outil : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Veuillez sélectionner au moins quatre nœuds." #. FIXME: not sure whether this fits in a dialog -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111 msgid "Information" msgstr "Information" #. Do it! +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131 msgid "Align Nodes in Line" msgstr "Aligner les nœuds" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 msgid "Move the selected nodes in to a line." msgstr "Déplacer les nœuds sélectionnés sur une ligne." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63 msgid "Please select at least three nodes." msgstr "Veuillez sélectionner au moins trois nœuds." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 #, java-format msgid "" @@ -551,10 +572,10 @@ "courant : {0}, maximum : {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108 msgid "API Capabilities Violation" msgstr "Violation des capacités de l’API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 #, java-format msgid "" @@ -565,5 +586,5 @@ "primitive supprimée {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 #, java-format msgid "" @@ -574,9 +595,9 @@ "longueur maximale autorisée {2}. la longueur actuelle est de {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 msgid "Precondition Violation" msgstr "Violation de la condition prédéfinie" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" @@ -585,37 +606,37 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "les données" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" msgstr "le calque" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "selection" msgstr "la sélection" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "le conflit" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" msgstr "téléchargement" +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57 #, java-format msgid "Zoom to {0}" msgstr "Zoom sur {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom the view to {0}." msgstr "Zoomer la vue sur {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -625,22 +646,22 @@ msgstr "Afficher : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "Nothing selected to zoom to." msgstr "Rien de sélectionné sur lequel zoomer." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124 msgid "No conflicts to zoom to" msgstr "Aucun conflit sur lequel zoomer" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "Fusionner des chemins" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "Fusionner plusieurs chemins en un seul." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Please select at least two ways to combine." msgstr "Veuillez sélectionner au moins deux chemins à fusionner." @@ -652,4 +673,8 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +msgid "Combine Anyway" +msgstr "Fusionner quand même" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -659,19 +684,7 @@ "Voulez-vous encore les fusionner ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 -msgid "Combine Anyway" -msgstr "Fusionner quand même" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 msgid "Change directions?" msgstr "Changer les directions ?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 -msgid "" -"The ways can not be combined in their current directions. Do you want to " -"reverse some of them?" -msgstr "" -"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans " -"la même direction. En retourner certaines ?" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 @@ -679,27 +692,34 @@ msgstr "Inverser et fusionner" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 +msgid "" +"The ways can not be combined in their current directions. Do you want to " +"reverse some of them?" +msgstr "" +"Les voies ne peuvent pas être fusionnées car elles ne sont pas toutes dans " +"la même direction. En retourner certaines ?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 msgid "Enter values for all conflicts." msgstr "Entrer des valeurs pour tous les conflits." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 msgid "Solve Conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #, java-format msgid "Combine {0} ways" msgstr "Fusionner {0} voies" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 msgid "All the ways were empty" msgstr "Toutes les voies étaient vides" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -709,32 +729,32 @@ "une seule chaîne de nœuds)" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 msgid "Copy" msgstr "Copier" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33 msgid "Copy selected objects to paste buffer." msgstr "Copier les objets sélectionnés dans la mémoire tampon." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:126 msgid "Please select something to copy." msgstr "Veuillez sélectionner quelque chose à copier." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 msgid "Create Circle" msgstr "Créer un cercle" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Créer un cercle à partir de trois nœuds sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." msgstr "Ces nœuds ne sont pas en cercle. Abandon." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -746,20 +766,20 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 msgid "Delete" msgstr "Supprimer" @@ -769,63 +789,64 @@ msgstr "Supprimer les objets sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 msgid "Overwrite" msgstr "Écrire dessus" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 msgid "File exists. Overwrite?" msgstr "Le fichier existe déjà. Écrire dessus ?" #. Do it! +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132 msgid "Distribute Nodes" msgstr "Distribuer les nœuds" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 msgid "Distribute the selected nodes to equal distances along a line." msgstr "Distribue les nœuds sélectionnés à égale distance le long d'une ligne." +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Téléchargement depuis OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 msgid "Download map data from the OSM server." msgstr "Télécharger des données depuis le serveur OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 #, java-format msgid "File: {0}" msgstr "Fichier : {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 msgid "Download" msgstr "Téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74 msgid "Please select at least one task to download" msgstr "Veuillez sélectionner au moins une tâche à télécharger" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download referrers from OSM..." msgstr "Téléchargement des référents depuis OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download primitives referring to one of the selected primitives" msgstr "" @@ -833,23 +854,23 @@ "sélectionnées" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." msgstr "Téléchargement des référents..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1558 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." msgstr "Il y a eu {0} conflits durant l'import." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125 msgid "Conflicts during download" msgstr "Conflits durant le téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145 #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" @@ -858,6 +879,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:378 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415 msgid "Duplicate" msgstr "Dupliquer" @@ -881,86 +902,92 @@ msgstr "Quitter l’application." +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 +#, fuzzy +msgid "All Formats" +msgstr "Toutes les images" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 msgid "Export to GPX..." msgstr "Exporter en GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 msgid "Export the data to GPX file." msgstr "Exporter les données vers un fichier GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Rien à exporter. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 #, java-format msgid "paramenter ''{0}'' must not be null" msgstr "le paramètre \"{0}\" ne doit pas être nul" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exporter en fichier GPX" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 msgid "JOSM Online Help" msgstr "Aide en ligne de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 msgid "Open in Browser" msgstr "Ouvrir dans le navigateur" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633 msgid "Edit" msgstr "Édition" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Recharger" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:114 msgid "Can only edit help pages from JOSM Online Help" msgstr "" "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:199 #, java-format msgid "Error while loading page {0}" msgstr "Erreur durant le chargement de la page {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218 #, java-format msgid "Help page missing. Create it in english." msgstr "Page d’aide manquante. Créez-la en français." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223 #, java-format msgid "" @@ -1014,22 +1041,26 @@ msgstr "Fusionne le calque courant avec un autre calque" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "Fusionner les nœuds" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "Fusionner les nœuds sur le plus ancien" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "Veuillez sélectionner au moins deux nœuds à fusionner." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 +msgid "Merge Anyway" +msgstr "Fusionner tout de même" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -1039,9 +1070,5 @@ "vous encore les fusionner ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162 -msgid "Merge Anyway" -msgstr "Fusionner tout de même" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1049,69 +1076,69 @@ "encore utilisé" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 #, java-format msgid "Merge {0} nodes" msgstr "Fusionner {0} nœuds" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 msgid "Merge selection" msgstr "Fusionner la sélection" -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 msgid "Merge the currently selected primitives into another layer" msgstr "Fusionne les primitives sélectionnées avec un autre calque" +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75 msgid "Mirror" msgstr "Mirroir" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 msgid "Mirror selected nodes and ways." msgstr "Inverse les nœuds et chemins sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." msgstr "Veuillez sélectionner au moins un nœud ou chemin" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 msgid "up" msgstr "haut" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 #, java-format msgid "Move objects {0}" msgstr "Déplacer des objets {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 msgid "down" msgstr "bas" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 msgid "left" msgstr "gauche" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "droite" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Déplacer {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Moves Objects {0}" msgstr "Déplacer les objets {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 msgid "Cannot move objects outside of the world." msgstr "Impossible de déplacer des objets en dehors de la Terre." @@ -1119,5 +1146,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337 msgid "New" msgstr "Nouveau" @@ -1127,19 +1154,22 @@ msgstr "Créer une nouvelle carte." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 msgid "Open..." msgstr "Ouvrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 msgid "Open a file." msgstr "Ouvrir un fichier" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 -#, java-format -msgid "Could not read file ''{0}''. Error is:
{1}" -msgstr "" -"Lecture du fichier \"{0}\" impossible. L’erreur est :
{1}
" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 +#, fuzzy +msgid "Opening files" +msgstr "Ouvrir un fichier" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 +#, fuzzy, java-format +msgid "Opening file ''{0}'' ..." +msgstr "Rôle inconnu \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -1177,13 +1207,13 @@ msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" msgstr "Seulement deux nœuds autorisés" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 msgid "Selection must consist only of ways." msgstr "La selection ne doit contenir uniquement que des chemins" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -1191,11 +1221,5 @@ "nœuds." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 -msgid "Please select ways with almost right angles to orthogonalize." -msgstr "" -"Veuillez sélectionner des chemins avec des angles droits afin de les " -"orthogonaliser." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122 msgid "" "You are using the EPSG:4326 projection which might lead
to " @@ -1203,10 +1227,14 @@ "projection to get rid of this warning.
Do you want to continue?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 +"Vous utilisez la projection EPSG:4326 qui pourrait conduire
à " +"d'indésirables résultats en faisant des alignements rectangulaires." +"
Changez votre projection pour supprimer cet avertissement.
Voulez-" +"vous continuer ?" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 msgid "Only one node selected" msgstr "Seulement un nœud sélectionné" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 msgid "Orthogonalize" msgstr "Orthogonaliser" @@ -1222,14 +1250,27 @@ msgstr "Coller les contenus du presse-papier." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Coller les étiquettes" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" "Appliquer les étiquettes de la mémoire tampon aux éléments sélectionnés." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 +#, fuzzy, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "Chargement {0}" +msgstr[1] "Chargement {0}" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 +#, fuzzy, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "Restaurer {0} primitives" +msgstr[1] "Restaurer {0} primitives" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1255,37 +1296,32 @@ msgstr "Refaire la dernière action annulée" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 msgid "Rename layer" msgstr "Renommer le calque" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 msgid "Also rename the file" msgstr "Renommer également le fichier" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 -#, java-format -msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 #, java-format msgid "Could not rename file ''{0}''" 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:50 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 msgid "Please select at least one way." msgstr "Veuillez sélectionner au moins un chemin." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 msgid "Reverse ways" msgstr "Inverser les chemins" @@ -1293,10 +1329,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 msgid "Save" msgstr "Sauvegarder" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 msgid "Save the current data." msgstr "Sauvegarder les données actuelles." @@ -1307,37 +1344,25 @@ msgstr "Le fichier {0} existe. L'écraser ?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 msgid "No Exporter found! Nothing saved." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94 -msgid "" -"Internal Error: cannot check conditions for no layer. Please report this as " -"a bug." -msgstr "" -"Erreur interne : impossible de vérifier les conditions pour aucun calque. " -"Merci de signaler ceci comme une erreur." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "No document open so nothing to save." -msgstr "Aucun document ouvert donc rien à sauvegarder." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +msgstr "Aucun exportateur n'a été trouvés! Rien à sauver." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Empty document" msgstr "Document vide" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "The document contains no data." msgstr "Le document ne contient pas de données." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 msgid "Save anyway" msgstr "Sauvegarder tout de même" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "Conflicts" msgstr "Conflits" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1347,28 +1372,28 @@ "sauvegardés si vous ne les traitez pas. Continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 msgid "Reject Conflicts and Save" msgstr "Rejeter les conflits et sauvegarder" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save OSM file" msgstr "Sauvegarder le fichier OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save GPX file" msgstr "Sauvegarder le fichier GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Save Layer" msgstr "Sauvegarder le calque" +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../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:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 msgid "Save As..." msgstr "Enregistrer sous…" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 msgid "Save the current data to a new file." msgstr "Sauvegarder les données actuelles dans un nouveau fichier." @@ -1403,33 +1428,33 @@ msgstr "Aide : {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 msgid "Status Report" msgstr "Rapport d'état" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 msgid "Copy to clipboard and close" msgstr "Copier vers le presse-papier et fermer" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Close" msgstr "Fermer" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 msgid "Split Way" msgstr "Couper un chemin" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 msgid "Split a way at the selected node." msgstr "Séparer un chemin au nœud sélectionné." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 msgid "The current selection cannot be used for splitting." msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1437,5 +1462,5 @@ msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1451,9 +1476,9 @@ "sélectionner le chemin également." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected nodes do not share the same way." msgstr "Les nœuds sélectionnés ne font pas partie du même chemin." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1461,11 +1486,11 @@ msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251 msgid "You must select two or more nodes to split a circular way." msgstr "" "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1475,5 +1500,5 @@ "sélectionner les nœuds au milieu du chemin.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -1481,5 +1506,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -1487,8 +1512,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 #, java-format msgid "Split way {0} into {1} parts" msgstr "Couper le chemin {0} en {1} parties" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +#, fuzzy +msgid "Close current changeset" +msgstr "Fermeture de la révision..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +#, fuzzy +msgid "Close the current changeset ..." +msgstr "Fermeture de la révision..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +#, fuzzy +msgid "There is currently no changeset open." +msgstr "Il n'y a actuellement pas de calque WMS à ajuster." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +#, fuzzy +msgid "No open changeset" +msgstr "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +#, fuzzy +msgid "Closing changeset" +msgstr "Fermeture de la révision..." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1506,57 +1557,57 @@ msgstr "Passer à la configuration globale \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Séparer les chemins" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 msgid "Duplicate nodes that are used by multiple ways." msgstr "Dupliquer les nœuds utilisés par plusieurs chemins." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 msgid "This node is not glued to anything else." msgstr "Ce nœud n’est pas collé à quelque chose d’autre." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 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:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 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:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "Select either:" msgstr "Sélectionner au choix :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" msgstr "* Un nœud taggué, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 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:124 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 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:124 +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:125 -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:126 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:128 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1570,9 +1621,9 @@ "sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 msgid "Unglued Node" msgstr "Nœud séparé" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 #, java-format msgid "Dupe into {0} nodes" @@ -1580,5 +1631,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1624,62 +1675,72 @@ "les données)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#. bounds defined? => use the bbox downloader +#. +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77 +msgid "Updating data" +msgstr "Mise à jour des données" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 msgid "No current dataset found" msgstr "Pas de jeu de données courant trouvé" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update Selection" msgstr "Mettre à jour la sélection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 msgid "Updates the currently selected primitives from the server" msgstr "Met à jour la sélection de primitive depuis le serveur" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 msgid "There are no selected primitives to update." msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" msgstr "La sélection est vide" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 msgid "Upload to OSM..." msgstr "Chargement vers OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 msgid "Upload all changes to the OSM server." msgstr "Envoyer tous les changements sur le serveur OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135 +#, fuzzy, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" +"Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 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:127 -msgid "There are unresolved conflicts. You have to resolve these first." -msgstr "" -"Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 msgid "No changes to upload." msgstr "Aucun changement à envoyer." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synchroniser {0} {1} seulement" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 msgid "Synchronize entire dataset" msgstr "Synchroniser tout le jeu de données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #, java-format msgid "" @@ -1701,17 +1762,17 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 msgid "Conflict detected" msgstr "Conflit détecté" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 #, java-format msgid "unexpected return value. Got {0}" msgstr "valeur inattendue retournée. Reçue {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #, java-format msgid "" @@ -1727,5 +1788,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1733,27 +1794,65 @@ "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 #, java-format msgid "Uploading failed.
{0}" msgstr "L’envoi a échoué.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 msgid "Upload to OSM API failed" msgstr "L’envoi vers l’API OSM a échoué" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 msgid "Updating primitive" msgstr "Mise à jour des primitives" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 +msgid "Upload these changes?" +msgstr "Charger ces changements ?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 +msgid "Upload Changes" +msgstr "Envoyer les changements" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 +#, fuzzy, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "éditer la nouvelle relation dans la couche \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651 +msgid "Use a new changeset and close it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652 +msgid "" +"Select to upload the data using a new changeset and to close the changeset " +"after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655 +msgid "Use a new changeset and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +msgid "" +"Select to upload the data using a new changeset and to leave the changeset " +"open after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658 +#, fuzzy +msgid "Upload to a new or to an existing changeset?" +msgstr "Ajouter un nœud à un chemin existant." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 msgid "upload all changes in one request" msgstr "Charger tous les changements dans une requête" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -1763,31 +1862,80 @@ "utiliser une requête par primitive modifiée" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 +#, fuzzy +msgid "Settings" +msgstr "Réglages de la carte" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 +#, fuzzy +msgid "Tags of new changeset" +msgstr "jeu de données" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 msgid "Objects to add:" msgstr "Objets à ajouter :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 msgid "Objects to modify:" msgstr "Objets à modifier :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 msgid "Objects to delete:" msgstr "Objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 -msgid "Upload these changes?" -msgstr "Charger ces changements ?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 -msgid "Upload Changes" -msgstr "Envoyer les changements" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 -msgid "Uploading" -msgstr "Téléchargement" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:803 +#, fuzzy, java-format +msgid "{0} object to add:" +msgid_plural "{0} objects to add:" +msgstr[0] "Objets à ajouter :" +msgstr[1] "Objets à ajouter :" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812 +#, fuzzy, java-format +msgid "{0} object to modifiy:" +msgid_plural "{0} objects to modify:" +msgstr[0] "Objets à modifier :" +msgstr[1] "Objets à modifier :" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821 +#, fuzzy, java-format +msgid "{0} object to delete:" +msgid_plural "{0} objects to delete:" +msgstr[0] "Objets à supprimer :" +msgstr[1] "Objets à supprimer :" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to close the changeset " +"after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to leave the changeset " +"open for further uploads" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942 +#, fuzzy, java-format +msgid "Tags of changeset {0}" +msgstr "Dernier changement le {0}" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1811,20 +1959,20 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 #, java-format msgid "Audio: {0}" msgstr "Audio : {0}" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 msgid "Faster" msgstr "Accélérer" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 msgid "Faster Forward" msgstr "Avancer plus vite" @@ -1866,10 +2014,10 @@ msgstr "Lire le marqueur précédent" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 msgid "Slower" msgstr "Plus lentement" -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 msgid "Slower Forward" msgstr "Avancer plus lentement" @@ -1897,31 +2045,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 msgid "No data imported." msgstr "Aucune donnée importée" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 msgid "OpenStreetMap data" msgstr "Données OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Téléchargement de {0} de {1} ({2} restant(s))" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 -msgid "Updating data" -msgstr "Mise à jour des données" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 #, java-format msgid "The following errors occurred during mass download:{0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 msgid "Errors during Download" msgstr "Erreurs durant le téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 #, java-format msgid "" @@ -1939,20 +2084,20 @@ "ignorer.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 msgid "Deleted or moved primitives" msgstr "Primitives supprimées ou déplacées" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 msgid "Delete Mode" msgstr "Mode Suppression" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 msgid "Delete nodes or ways." msgstr "Supprimer les nœuds ou les chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 @@ -1961,5 +2106,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1970,55 +2115,69 @@ "supprimer tous les objets utilisant cet objet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../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/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70 -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78 +#: ../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:51 +#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "le paramètre \"{0}\" ne doit pas être vide" +#: ../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:95 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 msgid "Draw" msgstr "Dessiner" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" msgstr "Dessiner des nœuds" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99 msgid "Mode: Draw Focus" msgstr "Mode : Desssiner" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 @@ -2026,38 +2185,38 @@ msgstr "sélectionné" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:358 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:531 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 msgid "Add node" msgstr "Ajouter un nœud" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:532 msgid "Add node into way" msgstr "Ajouter un nœud au chemin." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 msgid "Connect existing way to node" msgstr "Connecter le chemin existant au nœud" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 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:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:544 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:931 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930 msgid "Create new node." msgstr "Créer un nouveau nœud." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 msgid "Select node under cursor." msgstr "Sélectionner le nœud sous le curseur." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937 #, java-format msgid "Insert new node into way." @@ -2066,14 +2225,14 @@ msgstr[1] "Ajouter un nouveau nœud aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 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:950 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949 msgid "Continue way from last node." msgstr "Continuer le chemin à partir du dernier nœud." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972 msgid "Finish drawing." msgstr "Terminer le tracé." @@ -2093,5 +2252,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -2105,5 +2264,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 msgid "Release the mouse button to stop rotating." msgstr "Relacher le bouton de souris pour arrêter la rotation." @@ -2122,17 +2281,18 @@ "audio à ce point." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 #: ../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/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95 msgid "Select" msgstr "Sélectionner" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 msgid "Select, move and rotate objects" msgstr "Sélectionner, déplacer et tourner des objets" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211 #, java-format msgid "Add and move a virtual new node to way" @@ -2141,13 +2301,21 @@ msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468 +#: ../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:469 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" +#: ../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:470 +msgid "Undo move" +msgstr "Annuler déplacer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#, fuzzy, java-format +msgid "" +"You moved more than {0} elements. Moving a large number of elements is often " +"an error.\n" "Really move them?" msgstr "" @@ -2156,13 +2324,9 @@ "Souhaitez vous les déplacer ?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Move them" -msgstr "Les déplacer" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 -msgid "Undo move" -msgstr "Annuler déplacer" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +msgid "Always move and don't show dialog again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2171,5 +2335,5 @@ "fusionner avec le nœud le plus proche." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2198,62 +2362,62 @@ "droit de la souris" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43 msgid "Search..." msgstr "Recherche..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search for objects." msgstr "Rechercher des objets." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51 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." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65 msgid "Please enter a search string." msgstr "Entrer le texte à rechercher." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "replace selection" msgstr "remplacer la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 msgid "add to selection" msgstr "ajouter à la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 msgid "remove from selection" msgstr "supprimer de la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "case sensitive" msgstr "respecter la casse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 msgid "regular expression" msgstr "expression régulière" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Baker Street - 'Baker' et 'Street' dans n'importe quelle clé ou nom." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' et 'Street' dans n'importe quelle clé ou nom." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' n'importe où dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - clé 'type' avec la valeur exacte 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2263,51 +2427,52 @@ "*=valeur, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - pas 'Bak' dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot avec n'importe quelle valeur." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Special targets:" msgstr "Options spéciales :" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - type de l'objet (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - type de l'objet (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "user:... - all objects changed by user" msgstr "user:... - tous les objets modifiés par l'utilisateur" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#, fuzzy +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - objet avec l'ID spécifié" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "id:... - object with given ID" -msgstr "id:... - objet avec l'ID spécifié" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objet avec le nombre de nœuds spécifié" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "modified - all changed objects" msgstr "modified - tous les objets modifiés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "selected - all selected objects" msgstr "selected - tous les objets sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "incomplete - all incomplete objects" msgstr "incomplete - tous les objets incomplets" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "untagged - all untagged objects" msgstr "untagged - tous les objets non étiquetés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "" "child expr - all children of objects matching the expression" @@ -2316,5 +2481,5 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "" "parent expr - all parents of objects matching the expression" @@ -2323,55 +2488,55 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 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:111 +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:112 -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:113 msgid "Use ( and ) to group expressions" msgstr "Utilisez ( et ) pour grouper des expressions" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Chercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Start Search" msgstr "Commencer la recherche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 #, java-format msgid "No match found for ''{0}''" msgstr "Aucun résultat trouvé pour \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 #, 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:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 #, 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:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208 #, java-format msgid "Found {0} matches" msgstr "{0} résultats trouvés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 msgid "RX" msgstr "RX" @@ -2443,58 +2608,96 @@ msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 msgid "Load Selection" msgstr "Charger la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45 #, java-format msgid "Contact {0}..." msgstr "Contact de {0}..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47 msgid "Downloading..." msgstr "Téléchargement..." -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80 #, java-format msgid "Could not read from URL: \"{0}\"" msgstr "Impossible de lire quelque chose depuis l’URL : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83 #, java-format msgid "Parsing error in URL: \"{0}\"" msgstr "Erreur d’analyse dans l’URL : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87 msgid "Error while communicating with server." msgstr "Erreur de communication avec le serveur" -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 -#, java-format -msgid "Add {0} {1}" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 +#, fuzzy, java-format +msgid "Add node {0}" +msgstr "Ajouter un nœud" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 +#, fuzzy, java-format +msgid "Add way {0}" msgstr "Ajouter {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 -#, java-format -msgid "Change {0} {1}" -msgstr "Changer {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 +#, fuzzy, java-format +msgid "Add relation {0}" +msgstr "Relations : {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 +#, fuzzy, java-format +msgid "Change node {0}" +msgstr "Ensemble de changements {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 +#, fuzzy, java-format +msgid "Change way {0}" +msgstr "Ensemble de changements {0}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 +#, fuzzy, java-format +msgid "Change relation {0}" +msgstr "Changer la relation" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#, fuzzy, java-format +msgid "Remove \"{0}\" for node ''{1}''" msgstr "enlever \"{0}\" de {1} \"{2}\"" +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#, fuzzy, java-format +msgid "Remove \"{0}\" for way ''{1}''" +msgstr "enlever \"{0}\" de {1} \"{2}\"" + #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" +#, fuzzy, java-format +msgid "Remove \"{0}\" for relation ''{1}''" +msgstr "enlever \"{0}\" de {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 +#, fuzzy, java-format +msgid "Set {0}={1} for node ''{2}''" msgstr "Mettre {0}={1} pour {2}\"{3}\"" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:124 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:125 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 +#, fuzzy, java-format +msgid "Set {0}={1} for way ''{2}''" +msgstr "Mettre {0}={1} pour {2}\"{3}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 +#, fuzzy, java-format +msgid "Set {0}={1} for relation ''{2}''" +msgstr "Mettre {0}={1} pour {2}\"{3}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 msgid "object" @@ -2503,10 +2706,10 @@ msgstr[1] "objets" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 #, java-format msgid "Remove \"{0}\" for {1} {2}" msgstr "Enlever \"{0}\" pour {1} {2}" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118 #, java-format msgid "Set {0}={1} for {2} {3}" @@ -2518,5 +2721,5 @@ msgstr "Modifier le rôle du membre de la relation en {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 #, java-format msgid "" @@ -2525,10 +2728,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149 msgid "Double conflict" msgstr "Double conflit" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 #, java-format msgid "" @@ -2537,5 +2740,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 #, java-format msgid "Add conflict for ''{0}''" @@ -2561,44 +2764,60 @@ msgstr "impossible de résoudre un conflit non arbitré" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 -#, java-format -msgid "Delete {1} {0}" -msgstr "Supprimer {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 -#, java-format -msgid "Delete {0} {1}" -msgstr "Supprimer {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127 +#, fuzzy, java-format +msgid "Delete {0} object" +msgid_plural "Delete {0} objects" +msgstr[0] "Supprimer {0} {1}" +msgstr[1] "Supprimer {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#, fuzzy, java-format +msgid "Delete {0} node" +msgid_plural "Delete {0} nodes" +msgstr[0] "Mode Suppression" +msgstr[1] "Mode Suppression" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#, fuzzy, java-format +msgid "Delete {0} way" +msgid_plural "Delete {0} ways" +msgstr[0] "Supprimer {0} {1}" +msgstr[1] "Supprimer {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#, fuzzy, java-format +msgid "Delete {0} relation" +msgid_plural "Delete {0} relations" +msgstr[0] "Supprimer de la relation" +msgstr[1] "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 msgid "Conflicting relation" msgstr "Relation conflictuelle" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +msgid "Delete from relation" +msgstr "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " +"from relation?" msgstr "" "Sélection \"{0}\" est utilisé par la relation \"{1}\" avec le role {2}.\n" "Supprimer de la relation ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852 -msgid "Delete from relation" -msgstr "Supprimer de la relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213 +#, fuzzy, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".
Delete from relation?" +"" msgstr "" "La sélection \"{0}\" est utilisée par la relation \"{1}\".\n" "Supprimer de la relation ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446 msgid "Split way segment" msgstr "Séparer le segment du chemin" @@ -2606,6 +2825,6 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2617,5 +2836,5 @@ "voyez pas) pourraient les utiliser.
Voulez-vous vraiment les supprimer ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478 msgid "Delete confirmation" msgstr "Confirmation de suppression" @@ -2626,5 +2845,5 @@ msgstr "Résoudre les conflits de suppression dans {0}" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116 #, java-format msgid "Move {0} node" @@ -2661,10 +2880,20 @@ msgstr "Résoudre les conflits de la liste des membres de la relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "supprimer le membre de la relation {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 +#, java-format +msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 +#, java-format +msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 +#, java-format +msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 #, java-format msgid "Rotate {0} node" @@ -2677,17 +2906,37 @@ msgstr "Séquence" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in node {1}" msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in way {1}" +msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#, fuzzy, java-format +msgid "Resolve {0} tag conflicts in relation {1}" +msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 #, java-format msgid "Undelete {0} primitives" msgstr "Restaurer {0} primitives" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +#, fuzzy, java-format +msgid "Resolve version conflicts for node {0}" +msgstr "Résoudre les conflits de version de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 +#, fuzzy, java-format +msgid "Resolve version conflicts for way {0}" +msgstr "Résoudre les conflits de version de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 +#, fuzzy, java-format +msgid "Resolve version conflicts for relation {0}" msgstr "Résoudre les conflits de version de {0} {1}" @@ -2714,13 +2963,13 @@ "retournement pour préserver la consistence des données." -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 msgid "Relation" msgstr "Relation" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" msgstr "Ancien rôle" -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" msgstr "Nouveau rôle" @@ -2739,64 +2988,123 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 msgid "New value" msgstr "Nouvelle valeur" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 msgid "Apply selected changes" msgstr "Appliquer les changements sélectionnés" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 msgid "Don't apply changes" msgstr "Ne pas appliquer les changements" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85 msgid "Please select which property changes you want to apply." msgstr "Merci de sélectionner les changements que vous voulez appliquer" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97 msgid "Properties of " msgstr "Propriétés de " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123 msgid "Roles in relations referring to" msgstr "Rôles de la relation de référence" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" msgstr "Correction automatique d’étiquette" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263 +#, java-format +msgid "Warning: failed to persist preferences to ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368 #, 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:339 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Impossible d’ouvrir le répertoire des préférences : {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377 +#, fuzzy, java-format +msgid "" +"Warning: Failed to initialize preferences. Preference directory ''{0}'' " +"isn't a directory." +msgstr "" +"impossible de définir la référence. la référence d’id {0} ne correspond pas " +"à l'historique d’id {1}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 +#, java-format +msgid "" +"Failed to initialize preferences.
Preference directory ''{0}'' " +"isn't a directory." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388 +#, java-format +msgid "" +"Warning: Failed to initialize preferences. Failed to create missing " +"preference directory: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391 +#, java-format +msgid "" +"Failed to initialize preferences.
Failed to create missing " +"preference directory: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 +#, java-format +msgid "" +"Warning: Missing preference file ''{0}''. Creating a default preference file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#, java-format +msgid "" +"Warning: Replacing existing preference file ''{0}'' with default preference " +"file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#, java-format +msgid "" +"Failed to initialize preferences.
Failed to reset preference file " +"to default: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 +#, fuzzy, java-format +msgid "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." msgstr "" "Le fichier des préférences contient des erreurs. Sauvegarde de l’ancien " "fichier dans {0}." -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 +#, java-format +msgid "" +"Warning: Failed to initialize preferences.Failed to reset preference file to " +"default: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87 #, 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:95 #, 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:111 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:218 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217 #, java-format msgid "" @@ -2810,32 +3118,39 @@ msgstr "un conflit est déjà enregistré pour la primitive \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +#. * +#. * the decimal format 999.999 +#. +#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" msgstr "Degrés décimaux" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32 +#. * +#. * the minutes/seconds format 99" 99' +#. +#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" msgstr "Degrés Minutes Secondes" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "S" msgstr "S" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55 msgid "N" msgstr "N" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "W" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #, java-format msgid "Changeset {0}" -msgstr "" +msgstr "Ensemble de changements {0}" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 @@ -2844,15 +3159,237 @@ msgstr "paramètre {0} > 0 requis. Reçu {1}." -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186 -msgid "incomplete" -msgstr "incomplet" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Error: {0}" +msgstr "Erreur : {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#, java-format +msgid "Warning: {0}" +msgstr "Attention : {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +msgid "a primitive with id=0 can't be invisible" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 +#, java-format +msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" +msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#, java-format +msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" +msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}" + +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623 +msgid "" +"tag collection can't be applied to a primitive because there are keys with " +"multiple values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154 +msgid "There's no primitive with version {0} in this history" +msgstr "Il n’y a pas de primitive de version {0} dans cet historique" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161 +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163 +msgid "There's no version valid at date ''{0}'' in this history" +msgstr "" +"Il n’y a pas de version valide à la date du \"{0}\" dans cet historique" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174 +#, java-format +msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" +msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 +msgid "no earliest version found. History is empty." +msgstr "pas de verison plus ancienne trouvée. L’historique est vide." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 +msgid "no latest version found. History is empty." +msgstr "pas de version plus récente trouvée. L’historique est vide." + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78 +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" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84 +msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +msgstr "" +"Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34 +#, java-format +msgid "parameter ''{0}'' > 0 expected, got ''{1}''" +msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104 +msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" +msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 +#, java-format +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:246 +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:477 +#, java-format +msgid "multipolygon way ''{0}'' is not closed." +msgstr "Le multipolygone \"{0}\" n'est pas fermé." + +#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed +#. TODO Remove useless nullcheck when RelationMember.member is encalupsed +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835 +msgid "Empty member in relation." +msgstr "Membre vide dans la relation." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837 +#, 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:594 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848 +#, 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:599 +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:605 +msgid "More than one \"to\" way found." +msgstr "Plus d'un chemin \"destination\" trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625 +msgid "More than one \"via\" found." +msgstr "Plus d'un \"via\" trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "Rôle inconnu \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#, 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:639 +msgid "No \"from\" way found." +msgstr "Pas de chemin d'origine trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +msgid "No \"to\" way found." +msgstr "Pas de chemin \"destination\" trouvé." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +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:656 +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:660 +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:673 +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:677 +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:800 +#, 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:857 +#, 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:869 +#, 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:927 +#, 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:1016 +#, 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:1028 +#, 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:1081 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" +"Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#, 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:1311 +msgid "untagged" +msgstr "non étiqueté" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +msgid "text" +msgstr "texte" + +#. should not happen +#. +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242 +#, java-format +msgid "" +"My primitive with id {0} and version {1} is visible although their primitive " +"with lower version {2} is not visible. Can't deal with this inconsistency. " +"Keeping my primitive. " +msgstr "" +"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive " +"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette " +"contradiction. Je conserve ma primitive. " + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +msgid "inactive" +msgstr "inactif" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -2861,22 +3398,7 @@ msgstr[1] "nœuds" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Error: {0}" -msgstr "Erreur : {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 -#, java-format -msgid "Warning: {0}" -msgstr "Attention : {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -msgid "nodes" -msgstr "nœuds" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -2885,12 +3407,7 @@ msgstr[1] "voies" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -msgid "ways" -msgstr "chemins" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -2899,254 +3416,4 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 -msgid "relations" -msgstr "relations" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changeset" -msgstr "jeu de données" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 -msgid "changesets" -msgstr "jeux de données" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 -#, java-format -msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 -#, java-format -msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}" - -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193 -#, java-format -msgid "{0} member" -msgid_plural "{0} members" -msgstr[0] "{0} membre" -msgstr[1] "{0} membres" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194 -msgid "highway" -msgstr "highway" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195 -#: build/trans_presets.java:3013 -msgid "railway" -msgstr "voie ferrée" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196 -msgid "waterway" -msgstr "voie navigable" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197 -msgid "landuse" -msgstr "utilisation du terrain" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 -#, java-format -msgid "{0} node" -msgid_plural "{0} nodes" -msgstr[0] "{0} nœud" -msgstr[1] "{0} nœuds" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 -msgid "There's no primitive with version {0} in this history" -msgstr "Il n’y a pas de primitive de version {0} dans cet historique" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160 -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162 -msgid "There's no version valid at date ''{0}'' in this history" -msgstr "" -"Il n’y a pas de version valide à la date du \"{0}\" dans cet historique" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 -#, java-format -msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 -msgid "no earliest version found. History is empty." -msgstr "pas de verison plus ancienne trouvée. L’historique est vide." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 -msgid "no latest version found. History is empty." -msgstr "pas de version plus récente trouvée. L’historique est vide." - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 -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" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36 -msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -msgstr "" -"Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33 -#, java-format -msgid "parameter ''{0}'' > 0 expected, got ''{1}''" -msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104 -msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" -msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 -#, java-format -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:231 -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:438 -#, java-format -msgid "multipolygon way ''{0}'' is not closed." -msgstr "Le multipolygone \"{0}\" n'est pas fermé." - -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 -msgid "Empty member in relation." -msgstr "Membre vide dans la relation." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 -#, 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:554 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 -#, 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:559 -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:565 -msgid "More than one \"to\" way found." -msgstr "Plus d'un chemin \"destination\" trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 -msgid "More than one \"via\" found." -msgstr "Plus d'un \"via\" trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "Rôle inconnu \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592 -#, 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:597 -msgid "No \"from\" way found." -msgstr "Pas de chemin d'origine trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -msgid "No \"to\" way found." -msgstr "Pas de chemin \"destination\" trouvé." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -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:614 -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:618 -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:630 -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:634 -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:752 -#, 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:809 -#, 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:820 -#, 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:869 -#, 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:955 -#, 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:966 -#, 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:1017 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" -"Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 -#, 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:1239 -msgid "untagged" -msgstr "non étiqueté" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 -msgid "text" -msgstr "texte" - -#. should not happen -#. -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242 -#, java-format -msgid "" -"My primitive with id {0} and version {1} is visible although their primitive " -"with lower version {2} is not visible. Can't deal with this inconsistency. " -"Keeping my primitive. " -msgstr "" -"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive " -"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette " -"contradiction. Je conserve ma primitive. " - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 -msgid "inactive" -msgstr "inactif" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" @@ -3159,5 +3426,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 msgid "background" msgstr "arrière-plan" @@ -3167,5 +3434,5 @@ msgstr "surligner" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" msgstr "WGS84 Geographic" @@ -3175,5 +3442,5 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3189,21 +3456,21 @@ "et démarrez un nouveau calque sur cette nouvelle zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 msgid "Lambert Zone (France)" msgstr "Lambert Zone (France)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97 msgid "Lambert Zone (Estonia)" msgstr "Lambert Zone (Estonie)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37 msgid "Mercator" msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 msgid "Swiss Grid (Switzerland)" msgstr "Grille Suisse" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338 #, java-format msgid "UTM Zone {0}" @@ -3223,22 +3490,70 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 -#, java-format -msgid "Could not read bookmarks.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "Les signets ne peuvent être lus.
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 #, java-format msgid "Could not write bookmark.
{0}" -msgstr "" +msgstr "Les signets ne peuvent être écrits.
{0}" #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37 msgid "Do not show again" msgstr "Ne plus afficher" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr " [id: {0}]" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 +msgid "incomplete" +msgstr "incomplet" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +msgid "highway" +msgstr "highway" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: build/trans_presets.java:3141 +msgid "railway" +msgstr "voie ferrée" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +msgid "waterway" +msgstr "voie navigable" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +msgid "landuse" +msgstr "utilisation du terrain" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 +#, java-format +msgid "{0} node" +msgid_plural "{0} nodes" +msgstr[0] "{0} nœud" +msgstr[1] "{0} nœuds" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 +#, java-format +msgid "{0} member" +msgid_plural "{0} members" +msgstr[0] "{0} membre" +msgstr[1] "{0} membres" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 +#, fuzzy, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." msgstr "" "Impossible d’initialiser la communication avec le serveur OSM {0}.\n" @@ -3246,5 +3561,43 @@ "Internet." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 +#. item "Ways/Cycleway" combo "Pedestrians" +#. item "Ways/Footway" combo "Bikes" +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:773 +#: build/trans_presets.java:788 build/trans_presets.java:1330 +#: build/trans_presets.java:1397 build/trans_presets.java:1398 +#: build/trans_presets.java:1399 build/trans_presets.java:2439 +#: build/trans_presets.java:2440 build/trans_presets.java:2441 +msgid "unknown" +msgstr "inconnu" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61 +#, java-format +msgid "" +"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +"changeset will automatically be closed by the server after a timeout." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 #, java-format msgid "" @@ -3257,36 +3610,9 @@ "d’erreur est :
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 msgid "Precondition violation" msgstr "Condition préalable non remplie" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 -#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:768 -#: build/trans_presets.java:783 build/trans_presets.java:1325 -#: build/trans_presets.java:1387 -msgid "unknown" -msgstr "inconnu" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 #, java-format msgid "" @@ -3296,9 +3622,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "Security exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133 +msgstr "Exception de sécurité" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 #, java-format msgid "" @@ -3309,9 +3635,9 @@ "votre connexion internet." -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 msgid "Network exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158 +msgstr "Exception de réseau" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 #, java-format msgid "" @@ -3320,9 +3646,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 msgid "IO Exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203 +#, java-format +msgid "" +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213 +msgid "Internal Server Error" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235 #, java-format msgid "" @@ -3332,9 +3669,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 #, java-format msgid "" @@ -3347,12 +3684,7 @@ "message d’erreur est :
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 msgid "Primitive already deleted" msgstr "Primitive déjà supprimée" - -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 -#, java-format -msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 @@ -3369,39 +3701,39 @@ msgstr "Téléchargement du \"Message du jour\"" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Charger les préférences" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 msgid "Upload the current preferences to the server" msgstr "Charger les préférences actuelles vers le serveur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "chaîne de caractères" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "Name of the user." msgstr "Nom de l’utilisateur." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "OSM Password." msgstr "Mot de passe OSM." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "" "Redimensionner l'applet aux dimensions suivantes (format : LARGEURxHAUTEUR)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "texte;texte;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3411,5 +3743,5 @@ "contenant lat=y&lon=x&zoom=z ou encore un nom de fichier." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3419,5 +3751,5 @@ "y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3427,76 +3759,95 @@ "caractères comme pour Google ou un URL retournant du osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "any" msgstr "n’importe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "If specified, reset the configuration instead of reading it." msgstr "" "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162 msgid "Username" msgstr "Nom d’utilisateur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 msgid "Password" msgstr "Mot de passe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "options" msgstr "Options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Show this help" msgstr "Montrer cette aide" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Standard unix geometry argument" msgstr "Argument de géométrie standard UNIX" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box" msgstr "Télécharge la zone sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 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:105 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 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:106 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 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:107 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Select with the given search" msgstr "Sélectionner avec la recherche actuelle" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "Launch in maximized mode" msgstr "Lancer maximisé" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112 msgid "Reset the preferences to default" msgstr "Rétablir les préférences par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113 msgid "Set the language." msgstr "Définir la langue" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 +msgid "options provided as Java system properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 +msgid "Change the folder for all user settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +msgid "" +"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " +"the following\n" +" Java option to increase the maximum size of allocated memory" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 msgid "examples" msgstr "exemples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3507,47 +3858,47 @@ "sur d’avoir chargé des données avant --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128 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:124 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 msgid "Activating updated plugins" msgstr "Activation des greffons mis à jour" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading early plugins" msgstr "Chargement des premiers greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 msgid "Setting defaults" msgstr "Régalage des valeurs par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "Loading plugins" msgstr "Chargement des greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185 #, 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:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "File" msgstr "Fichier" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 msgid "Tools" msgstr "Outils" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Balises" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 @@ -3559,21 +3910,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:234 msgid "Wireframe View" msgstr "Affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236 msgid "Toggle Wireframe view" msgstr "Bascule vers l'affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262 msgid "Full Screen" msgstr "Plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264 msgid "Toggle Full Screen view" msgstr "Basculer en mode plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Audio" msgstr "Audio" @@ -3613,59 +3964,45 @@ msgstr "Zoom arrière" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41 msgid "scale" msgstr "échelle" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93 msgid "The geographic longitude at the mouse pointer." msgstr "La longitude géographique au niveau du pointeur de souris." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 msgid "The name of the object at the mouse pointer." msgstr "Le nom de l’objet au niveau du pointeur de souris." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The geographic latitude at the mouse pointer." msgstr "La latitude géographique au niveau du pointeur de souris." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 msgid "The angle between the previous and the current way segment." msgstr "L'angle entre le segment de chemin précédent et l’actuel." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The (compass) heading of the line segment being drawn." msgstr "L’orientation (boussole) du segment en train d’être dessiné." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The length of the new way segment being drawn." msgstr "La longueur du nouveau segment du chemin étant actuellement dessiné." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165 msgid "(no object)" msgstr "(aucun objet)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301 msgid "layer not in list." msgstr "le calque n’est pas dans la liste." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488 #, java-format msgid "Layer ''{0}'' must be in list of layers" msgstr "La couche \"{0}\" doit se trouver dans la liste des couches" - -#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:265 -#, java-format -msgid "" -"Warning: failed to put option pane dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 -#, java-format -msgid "" -"Warning: failed to put ''please wait dialog'' always on top. Exception was: " -"{0}" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 @@ -3676,10 +4013,4 @@ msgid "File not found" msgstr "Fichier non trouvé" - -#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3741,7 +4072,6 @@ #: ../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:299 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" @@ -3757,5 +4087,5 @@ #: ../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:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3862,5 +4192,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Ma version" @@ -3871,5 +4201,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 msgid "Merged version" @@ -3885,5 +4215,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Leur version" @@ -3971,6 +4301,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -4086,10 +4416,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182 #, java-format msgid "unexpected column index. Got {0}" msgstr "index de colonne inattendu. Reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 #, java-format msgid "" @@ -4100,19 +4430,19 @@ "serveur
Détails :{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 msgid "Communication with server failed" msgstr "La communication avec le serveur a échoué" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Oui, les restaurer également" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Non, annuler l’opération" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 #, java-format msgid "" @@ -4123,5 +4453,5 @@ "supprimés du serveur.

Voulez-vous les restaurer également ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 msgid "Undelete additional nodes?" msgstr "Restaurer ces nœuds également ?" @@ -4142,9 +4472,9 @@ msgstr "Restaurer les primitives ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propriétés de mon jeu de données, i.e. les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4154,95 +4484,97 @@ "éléments lorsque la fusion sera appliquée." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Propriétés de leur jeu de données, i.e. les données du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107 msgid "Coordinates:" msgstr "Coordonnées :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 msgid "Deleted State:" msgstr "Etat supprimé :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Visible State:" msgstr "État visible :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(aucun)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50 msgid "deleted" msgstr "supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 msgid "not deleted" msgstr "non supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "visible (on the server)" msgstr "visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "non visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Keep a clone of the local version" msgstr "Garder une copie de la version locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "Supprimer physiquement du jeu de données local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 msgid "Keep my coordiates" msgstr "Conserver mes coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 msgid "Keep their coordiates" msgstr "Conserver leurs coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 msgid "Undecide conflict between different coordinates" msgstr "Ne pas résoudre le conflit de coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 msgid "Keep my deleted state" msgstr "Conserver mon état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 msgid "Keep their deleted state" msgstr "Conserver leur état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 msgid "Undecide conflict between deleted state" msgstr "Ne pas résoudre le conflit d'état" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 msgid "Keep my visible state" msgstr "Conserver mon état de visibilité" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 msgid "Yes, reset the id" msgstr "Oui, réinitialiser l’id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 msgid "No, abort" msgstr "Non, annuler" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of {0} {1} to " -"0.
On the next upload the server will assign
it a new id.
Do yo " -"agree?" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#, fuzzy, java-format +msgid "" +"To keep your local version, JOSM
has to reset the id of primitive " +"{0} to 0.
On the next upload the server will assign
it a new id.
Do " +"yo agree?" msgstr "" "Pour conserver votre version locale, JOSM
doit réinitialiser l’id " @@ -4250,17 +4582,17 @@ "id
Êtes-vous d'accord ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 msgid "Reset id to 0" msgstr "Réinitialisation de l’id à 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Keep their visible state" msgstr "Conserver l'état de visbilité du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Yes, purge it" msgstr "Oui, le supprimer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 #, java-format msgid "" @@ -4271,21 +4603,21 @@ "données.
Êtes-vous d'accord ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 msgid "Remove from dataset" msgstr "Suppression du jeu de données" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 msgid "Undecide conflict between visible state" msgstr "Conflit non résolu entre deux états de visiblité" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 msgid "Role" msgstr "Rôle" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitive" @@ -4327,10 +4659,11 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 #: ../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 @@ -4339,10 +4672,11 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 -#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4358,5 +4692,5 @@ #. should not happen, but just in case -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39 #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}" @@ -4397,4 +4731,141 @@ msgid "Their dataset does not include a tag with key {0}" msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 +msgid "none" +msgstr "rien" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: build/trans_presets.java:2272 +msgid "all" +msgstr "all" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 +#, fuzzy +msgid "Choose a value" +msgstr "Choisir une couleur" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43 +msgid "Please decided which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47 +#, fuzzy, java-format +msgid "Value ''{0}'' is going to be applied for key ''{1}''" +msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#, java-format +msgid "The key ''{0}'' and all it's values are going to be removed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56 +#, java-format +msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 +#, fuzzy, java-format +msgid "parameter ''{0}'' must not be empty" +msgstr "le paramètre \"{0}\" ne doit pas être vide" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 +#, fuzzy, java-format +msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}" +msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 +msgid "tag collection doesn't include the selected value ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 +#, fuzzy +msgid "not yet decided" +msgstr "non supprimé" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289 +#, fuzzy +msgid "Not decided yet" +msgstr "Pas encore implémenté." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 +msgid "Tags from nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 +#, fuzzy +msgid "Tags from ways" +msgstr "chemin d'origine" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 +#, fuzzy +msgid "Tags from relations" +msgstr "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 +#, fuzzy +msgid "Conflicts in pasted tags" +msgstr "Conflits dans les données" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 +#, java-format +msgid "{0} way" +msgid_plural "{0} ways" +msgstr[0] "{0} voie" +msgstr[1] "{0} voies" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 +#, java-format +msgid "{0} relation" +msgid_plural "{0} relations" +msgstr[0] "{0} relation" +msgstr[1] "{0} relations" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +#, fuzzy +msgid "Cancel conflict resolution" +msgstr "Résolution de conflits" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +#, fuzzy +msgid "Apply resolved conflicts" +msgstr "Résoudre les conflits" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 +msgid "Apply" +msgstr "Appliquer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +#, fuzzy +msgid "Paste ..." +msgstr "Coller" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428 +#, fuzzy, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} voie" +msgstr[1] "{0} voies" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4410,10 +4881,10 @@ #: ../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/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4421,5 +4892,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #, java-format msgid "Toggle: {0}" @@ -4452,5 +4923,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4459,31 +4930,25 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 -msgid "" -"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -"Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162 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:186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:180 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:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181 msgid "Apply Resolution" msgstr "Appliquer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194 msgid "Continue resolving" msgstr "Continuer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196 #, java-format msgid "" @@ -4495,152 +4960,118 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 msgid "Conflict not resolved completely" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +msgstr "Conflit partiellement résolu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 msgid "Resolve conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243 #, java-format msgid "Resolve conflicts for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 +msgstr "Résolution des conflits pour ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 msgid "History" msgstr "Historique" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 msgid "Display the history of all selected items." msgstr "Afficher l’historique de tous les articles sélectionnés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 -#, java-format -msgid "Failed to load history from the server. Details:
{0}" -msgstr "" -"Impossible de charger l’historique depuis le serveur. Détails :
{0}" -"" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239 #, java-format msgid "index out of bounds Got {0}" msgstr "index en dehors des limites. Reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#, java-format +msgid "Node {0}" +msgstr "Nœud {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#, fuzzy, java-format +msgid "Way {0}" +msgstr "Couche : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#, fuzzy, java-format +msgid "Relation {0}" +msgstr "Relations : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 msgid "History item" msgstr "Historique de l’objet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 -msgid "Load history" -msgstr "Chargement de l'historique" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 -#, java-format -msgid "Loading history for {0} with id {1}" -msgstr "Chargement de l’historique de {0} d’id {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317 msgid "Reload all currently selected objects and refresh the list." msgstr "Recharger les objets actuellement sélectionnés et rafraîchir la liste." #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341 msgid "Show" msgstr "Afficher" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342 msgid "Display the history of the selected primitive" msgstr "Afficher l'historique de la primitive sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87 msgid "Dialog not created yet. Invoke createInstance() first" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149 msgid "Layers" msgstr "Calques" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148 msgid "Open a list of all loaded layers." msgstr "Ouvrir une liste de tous les calques chargés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297 msgid "Delete the selected layer." msgstr "Supprimer le calque sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304 -#, java-format -msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305 -msgid "Delete Layer" -msgstr "Supprimer le calque" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332 -#, java-format -msgid "Do you really want to delete layer ''{0}''?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132 -msgid "Confirmation" -msgstr "Confirmation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324 -msgid "Yes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325 -msgid "No" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326 -msgid "Delete all" -msgstr "Tout supprimer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333 -#, java-format -msgid "Deleting layer {0} of {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367 msgid "Show/Hide" msgstr "Montrer/Cacher" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378 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:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420 msgid "Activate the selected layer" msgstr "Active la couche sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475 msgid "Merge this layer into another layer" msgstr "Fusionne cette couche dans une autre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581 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:670 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600 msgid "Move the selected layer one row down." msgstr "Déplacer le calque sélectionné un niveau vers le bas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 msgid "Information about layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4649,28 +5080,22 @@ msgstr[1] "Cela modifiera {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 msgid "An empty value deletes the key." msgstr "Une valeur vide supprime la clé." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Changer les valeurs ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#, java-format -msgid "" -"Warning: failed to put properties dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4679,90 +5104,85 @@ msgstr[1] "Modifier les propriétés de {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Veuillez sélectionner une clé" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Veuillez sélectionner une valeur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360 -#, java-format -msgid "Warning: failed to put dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 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:468 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Propriétés/Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 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:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 msgid "Member Of" msgstr "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 msgid "Add Properties" msgstr "Ajouter des Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65 msgid "Add" msgstr "Ajouter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 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:593 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 msgid "Edit Properties" msgstr "Éditer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 msgid "Edit the value of the selected key for all objects" msgstr "Éditer la valeur de la clé selectionnée pour tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriétés : {0} / Appartenances : {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 msgid "Properties / Memberships" msgstr "Propriétés / Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 msgid "Change relation" msgstr "Changer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 #, 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:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 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:880 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 msgid "Delete Properties" msgstr "Supprimer les propriétés" @@ -4771,34 +5191,34 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148 -#: build/trans_presets.java:2978 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 +#: build/trans_presets.java:3106 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 msgid "Open a list of all relations." msgstr "Ouvrir une liste de toutes les relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144 #, java-format msgid "Relations: {0}" msgstr "Relations : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265 +#: ../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:306 +#: ../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:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336 msgid "Create a new relation" msgstr "Créer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -4833,23 +5253,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362 #: ../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:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} voie" -msgstr[1] "{0} voies" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} relation" -msgstr[1] "{0} relations" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 #, java-format @@ -4857,14 +5263,9 @@ msgstr "Sélection : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434 msgid "Undock the panel" msgstr "Détacher le panneau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 -#, java-format -msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4873,65 +5274,100 @@ "d'outils de gauche." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457 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:56 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 +#: ../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:56 +#: ../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:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 +#, fuzzy, java-format +msgid "{0} Author" +msgid_plural "{0} Authors" +msgstr[0] "Auteur" +msgstr[1] "Auteur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 +msgid "Select primitives submitted by this user" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 +#, fuzzy +msgid "Show info" +msgstr "Afficher" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 +#, fuzzy +msgid "Launches a browser with information about the user" +msgstr "Plus d'informations à propos de cette balise" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 +#, fuzzy, java-format +msgid "" +"Warning: only launching info browsers for the first {0} of {1} selected users" +msgstr "" +"ATTENTION : ouverture des’ fenêtres du navigateur pour les {0} sur {1} " +"primitives sélectionnées uniquement." + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "Author" msgstr "Auteur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 msgid "# Objects" msgstr "# Objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 -#, java-format -msgid "Authors: {0}" -msgstr "Auteurs : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435 msgid "Edit the relation the currently selected relation member refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgstr "éditer la relation en référence du membre de relation sélectionné" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download all child relations (recursively)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +msgstr "Télécharger toutes les relations enfants (récursivement)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 msgid "Download All Children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 msgid "Download selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +msgstr "Télécharger les relations sélectionnée." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 msgid "Download Selected Children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1533 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502 msgid "Download relation members" msgstr "télécharger les membres de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 msgid "Conflicts in data" msgstr "Conflits dans les données" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343 #, java-format msgid "" @@ -4939,19 +5375,21 @@ "loaded" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +"La relation enfant
{0}
est supprimée sur le serveur et ne peut " +"être chargée." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 msgid "Relation is deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +msgstr "La relation est supprimée." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 #, java-format msgid "Downloading relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1597 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +msgstr "Téléchargement de la relation {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" @@ -4959,29 +5397,23 @@ "Attention : exception ignorée car la tâche est annulée. Exception : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Tags and Members" msgstr "Étiquettes et membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173 msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +msgstr "Relations parentes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166 msgid "Child Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 -#, java-format -msgid "" -"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" -msgstr "" +msgstr "Relations enfants" #. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 msgid "Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 +msgstr "Rôle :" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 msgid "" "There is at least one member in this relation referring
to the " @@ -4990,14 +5422,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680 #, java-format msgid "" @@ -5007,9 +5439,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 #, java-format msgid "" @@ -5019,5 +5451,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5026,5 +5458,5 @@ "premier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5033,5 +5465,5 @@ "dernier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5039,5 +5471,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5045,20 +5477,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869 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:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Relation Editor: Remove Selected" msgstr "Éditeur de relation : supprimer la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 #, java-format msgid "" @@ -5067,57 +5499,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961 msgid "Sort the relation members" msgstr "trier les membres de la relation" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Relation Editor: Sort" msgstr "éditeur de relation : trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 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:1011 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979 msgid "Relation Editor: Move Up" msgstr "Éditeur de relation : déplacer vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995 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:1030 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998 msgid "Relation Editor: Move Down" msgstr "Éditeur de relation : déplacer vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017 msgid "Relation Editor: Remove" msgstr "éditeur de relation : supprimer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 msgid "Delete the currently edited relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148 +msgstr "Supprimer la relation actuellement éditée." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 msgid "Yes, create a conflict and close" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149 +msgstr "Oui, créer un conflit et fermer." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117 msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153 +msgstr "Non, continuer à éditer." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5126,9 +5558,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 msgid "Conflict in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 +msgstr "Conflit dans les données." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143 #, java-format msgid "" @@ -5137,20 +5569,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 msgid "Apply the current updates" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 -msgid "Apply" -msgstr "Appliquer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Apply the updates and close the dialog" msgstr "Appliquer les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -5160,37 +5588,37 @@ msgstr "OK" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 msgid "Cancel the updates and close the dialog" msgstr "Annuler les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241 msgid "Add an empty tag" msgstr "Ajouter une étiquette vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Delete the currently selected tags" msgstr "Supprimer les étiquettes sélectionnées" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 msgid "Download all incomplete ways and nodes in relation" msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Relation Editor: Download Members" msgstr "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340 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:1374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Apply Role" msgstr "Appliquer le rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356 #, java-format msgid "" @@ -5200,30 +5628,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360 msgid "Yes, apply it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392 +msgstr "Oui, l'appliquer." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361 msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +msgstr "Non, ne pas l'appliquer." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 msgid "Zoom to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223 msgid "Zoom to primitive the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -5237,22 +5665,27 @@ msgstr "Lié" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 msgid "Download referring relations" msgstr "télécharger les relations référentes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81 #, java-format msgid "child.id >0 expected. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 msgid "including immediate children of parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 msgid "Load parent relations" msgstr "Charger les relations parentes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#, fuzzy +msgid "Loading parent relations" +msgstr "Charger les relations parentes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 msgid "Edit the currently selected relation" msgstr "éditer la relation sélectionnée" @@ -5285,34 +5718,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 -#, java-format -msgid "Remove old keys from up to {0} object" -msgid_plural "Remove old keys from up to {0} objects" -msgstr[0] "Enlever des clés anciennes d'au maximum {0} objet" -msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 msgid "Bookmarks" msgstr "Marque-pages" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82 msgid "Please enter the desired coordinates first." msgstr "Entrer les coordonnées désirées en premier." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89 msgid "Please enter a name for the location." msgstr "Entrer un nom pour cet emplacement." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107 msgid "Select a bookmark first." msgstr "Sélectionner un marque-page en premier." @@ -5372,13 +5792,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118 msgid "Null pointer exception, possibly some missing tags." msgstr "Erreur de pointeur nul, des étiquettes sont peut-être manquantes." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 msgid "Please enter a search string" msgstr "Veuillez saisir une chaîne de caractères pour la recherche" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192 msgid "Cannot read place search results from server" msgstr "" @@ -5387,18 +5807,17 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214 msgid "Enter a place name to search for:" msgstr "Entrez un nom d’endroit à rechercher :" -#. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 -#: build/trans_presets.java:2623 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 +#: build/trans_presets.java:2744 msgid "Places" msgstr "Lieux/endroits" #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 msgid "name" msgstr "nom" @@ -5437,37 +5856,37 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "type" msgstr "type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251 msgid "near" msgstr "à côté de" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -5476,5 +5895,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 msgid "Slippy map" msgstr "Carte glissante" @@ -5501,20 +5920,29 @@ msgstr "Numéros des tuiles" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 -#, java-format -msgid "History for {0} {1}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44 +#, fuzzy, java-format +msgid "History for node {0}" msgstr "Historique de {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 -#, java-format -msgid "" -"Warning: failed to put history browser always on top. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 +#, fuzzy, java-format +msgid "History for way {0}" +msgstr "Historique de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 +#, fuzzy, java-format +msgid "History for relation {0}" +msgstr "Historique de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 msgid "Close the dialog" msgstr "Fermer la boîte de dialogue" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 +#, fuzzy +msgid "Reload the history from the server" +msgstr "Afficher l'historique de la primitive sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 msgid "history not initialized yet. Failed to set reference primitive." msgstr "" @@ -5522,6 +5950,6 @@ "primitive." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:182 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201 #, java-format msgid "failed to set reference. reference id {0} doesn't match history id {1}" @@ -5530,5 +5958,5 @@ "à l'historique d’id {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185 #, java-format msgid "failed to set reference. reference version {0} not available in history" @@ -5537,5 +5965,5 @@ "pas disponible dans l’historique" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199 msgid "history not initialized yet. Failed to set current primitive." msgstr "" @@ -5543,5 +5971,5 @@ "courante." -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204 #, java-format msgid "failed to set current. current version {0} not available in history" @@ -5550,8 +5978,27 @@ "disponible dans l’historique" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#, java-format -msgid "Node {0}" -msgstr "Nœud {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 +msgid "Load history" +msgstr "Chargement de l'historique" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 +#, fuzzy, java-format +msgid "id > 0 expected, got {0}" +msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115 +#, fuzzy, java-format +msgid "Loading history for node {0}" +msgstr "Chargement de l’historique de {0} d’id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 +#, fuzzy, java-format +msgid "Loading history for way {0}" +msgstr "Chargement de l’historique de {0} d’id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 +#, fuzzy, java-format +msgid "Loading history for relation {0}" +msgstr "Chargement de l’historique de {0} d’id {1}" #. item "Streets/Motorway" text "Reference" @@ -5869,14 +6316,28 @@ #. item "Tourism/Artwork" label "Edit Artwork" #. -#. item "Tourism/Information Office" label "Edit Information Office" +#. item +#. #. #. #. item -#. +#. #. +#. +#. item +#. +#. +#. #. item #. #. #. +#. item +#. +#. +#. +#. item +#. +#. +#. #. item #. @@ -6052,8 +6513,14 @@ #. item "Shops/Supermarket" label "Edit Supermarket" #. +#. item "Shops/Chemist" label "Edit Chemist" +#. #. item "Shops/Convenience Store" label "Edit Convenience Store" #. #. item "Shops/Kiosk" label "Edit Kiosk" #. +#. item "Shops/Book Store" label "Edit Book Store" +#. +#. item "Shops/Travel Agency" label "Edit Travel Agency" +#. #. item "Shops/Butcher" label "Edit Butcher" #. @@ -6150,4 +6617,7 @@ #. #. +#. item "Places/Islet" label "Edit Islet" +#. +#. #. item "Places/Cave Entrance" label "Edit Cave Entrance" #. @@ -6261,6 +6731,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 #: build/trans_presets.java:66 build/trans_presets.java:102 #: build/trans_presets.java:142 build/trans_presets.java:179 @@ -6268,156 +6738,174 @@ #: build/trans_presets.java:234 build/trans_presets.java:252 #: build/trans_presets.java:272 build/trans_presets.java:305 -#: build/trans_presets.java:350 build/trans_presets.java:370 -#: build/trans_presets.java:385 build/trans_presets.java:402 -#: build/trans_presets.java:422 build/trans_presets.java:442 -#: build/trans_presets.java:461 build/trans_presets.java:479 -#: build/trans_presets.java:499 build/trans_presets.java:519 -#: build/trans_presets.java:540 build/trans_presets.java:561 -#: build/trans_presets.java:582 build/trans_presets.java:603 -#: build/trans_presets.java:624 build/trans_presets.java:653 -#: build/trans_presets.java:674 build/trans_presets.java:687 -#: build/trans_presets.java:700 build/trans_presets.java:713 -#: build/trans_presets.java:726 build/trans_presets.java:739 -#: build/trans_presets.java:750 build/trans_presets.java:759 -#: build/trans_presets.java:806 build/trans_presets.java:827 -#: build/trans_presets.java:836 build/trans_presets.java:896 -#: build/trans_presets.java:1046 build/trans_presets.java:1054 -#: build/trans_presets.java:1062 build/trans_presets.java:1070 -#: build/trans_presets.java:1080 build/trans_presets.java:1088 -#: build/trans_presets.java:1093 build/trans_presets.java:1100 -#: build/trans_presets.java:1107 build/trans_presets.java:1112 -#: build/trans_presets.java:1120 build/trans_presets.java:1129 -#: build/trans_presets.java:1135 build/trans_presets.java:1141 -#: build/trans_presets.java:1146 build/trans_presets.java:1152 -#: build/trans_presets.java:1158 build/trans_presets.java:1167 -#: build/trans_presets.java:1176 build/trans_presets.java:1183 -#: build/trans_presets.java:1191 build/trans_presets.java:1204 -#: build/trans_presets.java:1210 build/trans_presets.java:1219 -#: build/trans_presets.java:1225 build/trans_presets.java:1231 -#: build/trans_presets.java:1239 build/trans_presets.java:1294 -#: build/trans_presets.java:1341 build/trans_presets.java:1347 -#: build/trans_presets.java:1353 build/trans_presets.java:1359 -#: build/trans_presets.java:1365 build/trans_presets.java:1376 -#: build/trans_presets.java:1384 build/trans_presets.java:1393 -#: build/trans_presets.java:1400 build/trans_presets.java:1406 -#: build/trans_presets.java:1414 build/trans_presets.java:1421 -#: build/trans_presets.java:1430 build/trans_presets.java:1438 -#: build/trans_presets.java:1445 build/trans_presets.java:1456 -#: build/trans_presets.java:1466 build/trans_presets.java:1476 -#: build/trans_presets.java:1496 build/trans_presets.java:1508 -#: build/trans_presets.java:1519 build/trans_presets.java:1536 -#: build/trans_presets.java:1543 build/trans_presets.java:1558 -#: build/trans_presets.java:1565 build/trans_presets.java:1570 -#: build/trans_presets.java:1576 build/trans_presets.java:1582 -#: build/trans_presets.java:1587 build/trans_presets.java:1593 -#: build/trans_presets.java:1599 build/trans_presets.java:1607 -#: build/trans_presets.java:1614 build/trans_presets.java:1621 -#: build/trans_presets.java:1627 build/trans_presets.java:1632 -#: build/trans_presets.java:1638 build/trans_presets.java:1644 -#: build/trans_presets.java:1651 build/trans_presets.java:1658 -#: build/trans_presets.java:1665 build/trans_presets.java:1671 -#: build/trans_presets.java:1677 build/trans_presets.java:1683 -#: build/trans_presets.java:1691 build/trans_presets.java:1697 -#: build/trans_presets.java:1704 build/trans_presets.java:1712 -#: build/trans_presets.java:1718 build/trans_presets.java:1725 -#: build/trans_presets.java:1731 build/trans_presets.java:1741 -#: build/trans_presets.java:1746 build/trans_presets.java:1753 -#: build/trans_presets.java:1759 build/trans_presets.java:1765 -#: build/trans_presets.java:1771 build/trans_presets.java:1776 +#: build/trans_presets.java:351 build/trans_presets.java:371 +#: build/trans_presets.java:386 build/trans_presets.java:403 +#: build/trans_presets.java:423 build/trans_presets.java:443 +#: build/trans_presets.java:463 build/trans_presets.java:482 +#: build/trans_presets.java:502 build/trans_presets.java:522 +#: build/trans_presets.java:543 build/trans_presets.java:564 +#: build/trans_presets.java:585 build/trans_presets.java:606 +#: build/trans_presets.java:627 build/trans_presets.java:658 +#: build/trans_presets.java:679 build/trans_presets.java:692 +#: build/trans_presets.java:705 build/trans_presets.java:718 +#: build/trans_presets.java:731 build/trans_presets.java:744 +#: build/trans_presets.java:755 build/trans_presets.java:764 +#: build/trans_presets.java:811 build/trans_presets.java:832 +#: build/trans_presets.java:841 build/trans_presets.java:901 +#: build/trans_presets.java:1051 build/trans_presets.java:1059 +#: build/trans_presets.java:1067 build/trans_presets.java:1075 +#: build/trans_presets.java:1085 build/trans_presets.java:1093 +#: build/trans_presets.java:1098 build/trans_presets.java:1105 +#: build/trans_presets.java:1112 build/trans_presets.java:1117 +#: build/trans_presets.java:1125 build/trans_presets.java:1134 +#: build/trans_presets.java:1140 build/trans_presets.java:1146 +#: build/trans_presets.java:1151 build/trans_presets.java:1157 +#: build/trans_presets.java:1163 build/trans_presets.java:1172 +#: build/trans_presets.java:1181 build/trans_presets.java:1188 +#: build/trans_presets.java:1196 build/trans_presets.java:1209 +#: build/trans_presets.java:1215 build/trans_presets.java:1224 +#: build/trans_presets.java:1230 build/trans_presets.java:1236 +#: build/trans_presets.java:1244 build/trans_presets.java:1299 +#: build/trans_presets.java:1346 build/trans_presets.java:1352 +#: build/trans_presets.java:1358 build/trans_presets.java:1364 +#: build/trans_presets.java:1370 build/trans_presets.java:1381 +#: build/trans_presets.java:1390 build/trans_presets.java:1405 +#: build/trans_presets.java:1412 build/trans_presets.java:1418 +#: build/trans_presets.java:1426 build/trans_presets.java:1433 +#: build/trans_presets.java:1442 build/trans_presets.java:1450 +#: 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:1548 +#: build/trans_presets.java:1555 build/trans_presets.java:1570 +#: build/trans_presets.java:1577 build/trans_presets.java:1582 +#: build/trans_presets.java:1588 build/trans_presets.java:1594 +#: build/trans_presets.java:1599 build/trans_presets.java:1605 +#: build/trans_presets.java:1611 build/trans_presets.java:1619 +#: build/trans_presets.java:1627 build/trans_presets.java:1635 +#: build/trans_presets.java:1642 build/trans_presets.java:1648 +#: build/trans_presets.java:1655 build/trans_presets.java:1662 +#: build/trans_presets.java:1670 build/trans_presets.java:1677 +#: build/trans_presets.java:1685 build/trans_presets.java:1692 +#: build/trans_presets.java:1698 build/trans_presets.java:1705 +#: build/trans_presets.java:1712 build/trans_presets.java:1719 +#: build/trans_presets.java:1736 build/trans_presets.java:1744 +#: build/trans_presets.java:1759 build/trans_presets.java:1769 #: build/trans_presets.java:1781 build/trans_presets.java:1788 -#: build/trans_presets.java:1794 build/trans_presets.java:1799 -#: build/trans_presets.java:1807 build/trans_presets.java:1816 -#: build/trans_presets.java:1825 build/trans_presets.java:1834 -#: build/trans_presets.java:1843 build/trans_presets.java:1848 -#: build/trans_presets.java:1855 build/trans_presets.java:1861 -#: build/trans_presets.java:1867 build/trans_presets.java:1873 -#: build/trans_presets.java:1879 build/trans_presets.java:1885 -#: build/trans_presets.java:1891 build/trans_presets.java:1897 -#: build/trans_presets.java:1903 build/trans_presets.java:1909 -#: build/trans_presets.java:1915 build/trans_presets.java:1921 -#: build/trans_presets.java:1927 build/trans_presets.java:1933 -#: build/trans_presets.java:1939 build/trans_presets.java:1946 -#: build/trans_presets.java:1955 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:2029 build/trans_presets.java:2035 -#: build/trans_presets.java:2041 build/trans_presets.java:2047 -#: build/trans_presets.java:2053 build/trans_presets.java:2059 +#: build/trans_presets.java:1794 build/trans_presets.java:1804 +#: build/trans_presets.java:1809 build/trans_presets.java:1817 +#: build/trans_presets.java:1824 build/trans_presets.java:1830 +#: build/trans_presets.java:1836 build/trans_presets.java:1841 +#: build/trans_presets.java:1846 build/trans_presets.java:1853 +#: build/trans_presets.java:1859 build/trans_presets.java:1864 +#: build/trans_presets.java:1872 build/trans_presets.java:1881 +#: build/trans_presets.java:1890 build/trans_presets.java:1899 +#: build/trans_presets.java:1908 build/trans_presets.java:1914 +#: build/trans_presets.java:1922 build/trans_presets.java:1928 +#: build/trans_presets.java:1934 build/trans_presets.java:1940 +#: build/trans_presets.java:1946 build/trans_presets.java:1952 +#: build/trans_presets.java:1958 build/trans_presets.java:1964 +#: build/trans_presets.java:1970 build/trans_presets.java:1976 +#: build/trans_presets.java:1982 build/trans_presets.java:1988 +#: build/trans_presets.java:1994 build/trans_presets.java:2000 +#: build/trans_presets.java:2006 build/trans_presets.java:2013 +#: build/trans_presets.java:2022 build/trans_presets.java:2030 +#: build/trans_presets.java:2036 build/trans_presets.java:2042 +#: build/trans_presets.java:2048 build/trans_presets.java:2054 +#: build/trans_presets.java:2060 build/trans_presets.java:2066 #: build/trans_presets.java:2072 build/trans_presets.java:2078 -#: build/trans_presets.java:2084 build/trans_presets.java:2091 -#: build/trans_presets.java:2098 build/trans_presets.java:2106 -#: 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 +#: build/trans_presets.java:2084 build/trans_presets.java:2090 +#: build/trans_presets.java:2096 build/trans_presets.java:2102 +#: build/trans_presets.java:2108 build/trans_presets.java:2114 +#: build/trans_presets.java:2120 build/trans_presets.java:2126 +#: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2158 -#: build/trans_presets.java:2164 build/trans_presets.java:2171 -#: build/trans_presets.java:2179 build/trans_presets.java:2210 -#: build/trans_presets.java:2215 build/trans_presets.java:2220 -#: build/trans_presets.java:2225 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2251 build/trans_presets.java:2257 -#: build/trans_presets.java:2263 build/trans_presets.java:2269 -#: build/trans_presets.java:2275 build/trans_presets.java:2285 -#: build/trans_presets.java:2378 build/trans_presets.java:2385 -#: build/trans_presets.java:2399 build/trans_presets.java:2405 -#: build/trans_presets.java:2411 build/trans_presets.java:2432 -#: build/trans_presets.java:2438 build/trans_presets.java:2444 -#: build/trans_presets.java:2449 build/trans_presets.java:2455 -#: build/trans_presets.java:2460 build/trans_presets.java:2465 -#: build/trans_presets.java:2470 build/trans_presets.java:2475 -#: build/trans_presets.java:2480 build/trans_presets.java:2486 -#: build/trans_presets.java:2492 build/trans_presets.java:2498 -#: build/trans_presets.java:2503 build/trans_presets.java:2508 -#: build/trans_presets.java:2513 build/trans_presets.java:2518 -#: build/trans_presets.java:2523 build/trans_presets.java:2529 -#: build/trans_presets.java:2535 build/trans_presets.java:2541 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2560 build/trans_presets.java:2567 -#: build/trans_presets.java:2581 build/trans_presets.java:2586 -#: build/trans_presets.java:2593 build/trans_presets.java:2599 -#: build/trans_presets.java:2619 build/trans_presets.java:2628 -#: build/trans_presets.java:2634 build/trans_presets.java:2640 -#: build/trans_presets.java:2646 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2673 build/trans_presets.java:2679 -#: build/trans_presets.java:2685 build/trans_presets.java:2693 -#: build/trans_presets.java:2700 build/trans_presets.java:2707 -#: build/trans_presets.java:2713 build/trans_presets.java:2720 -#: build/trans_presets.java:2727 build/trans_presets.java:2736 -#: build/trans_presets.java:2742 build/trans_presets.java:2748 -#: build/trans_presets.java:2754 build/trans_presets.java:2760 -#: build/trans_presets.java:2769 build/trans_presets.java:2779 -#: build/trans_presets.java:2788 build/trans_presets.java:2794 -#: build/trans_presets.java:2800 build/trans_presets.java:2805 -#: build/trans_presets.java:2811 build/trans_presets.java:2817 -#: build/trans_presets.java:2826 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2862 build/trans_presets.java:2869 -#: build/trans_presets.java:2875 build/trans_presets.java:2880 -#: build/trans_presets.java:2887 build/trans_presets.java:2894 -#: build/trans_presets.java:2900 build/trans_presets.java:2909 -#: build/trans_presets.java:2917 build/trans_presets.java:2923 -#: build/trans_presets.java:2929 build/trans_presets.java:2936 -#: build/trans_presets.java:2942 build/trans_presets.java:2949 -#: build/trans_presets.java:2955 build/trans_presets.java:2961 -#: build/trans_presets.java:2967 build/trans_presets.java:2973 -#: build/trans_presets.java:2986 build/trans_presets.java:3000 -#: build/trans_presets.java:3014 +#: build/trans_presets.java:2165 build/trans_presets.java:2173 +#: build/trans_presets.java:2180 build/trans_presets.java:2186 +#: build/trans_presets.java:2192 build/trans_presets.java:2198 +#: build/trans_presets.java:2204 build/trans_presets.java:2210 +#: build/trans_presets.java:2218 build/trans_presets.java:2225 +#: build/trans_presets.java:2232 build/trans_presets.java:2239 +#: build/trans_presets.java:2247 build/trans_presets.java:2279 +#: build/trans_presets.java:2284 build/trans_presets.java:2289 +#: build/trans_presets.java:2294 build/trans_presets.java:2300 +#: build/trans_presets.java:2306 build/trans_presets.java:2312 +#: build/trans_presets.java:2320 build/trans_presets.java:2326 +#: build/trans_presets.java:2332 build/trans_presets.java:2338 +#: build/trans_presets.java:2344 build/trans_presets.java:2354 +#: build/trans_presets.java:2448 build/trans_presets.java:2455 +#: build/trans_presets.java:2469 build/trans_presets.java:2475 +#: build/trans_presets.java:2482 build/trans_presets.java:2489 +#: build/trans_presets.java:2495 build/trans_presets.java:2501 +#: build/trans_presets.java:2523 build/trans_presets.java:2530 +#: build/trans_presets.java:2537 build/trans_presets.java:2543 +#: build/trans_presets.java:2550 build/trans_presets.java:2556 +#: build/trans_presets.java:2562 build/trans_presets.java:2568 +#: build/trans_presets.java:2574 build/trans_presets.java:2580 +#: build/trans_presets.java:2587 build/trans_presets.java:2594 +#: build/trans_presets.java:2601 build/trans_presets.java:2607 +#: build/trans_presets.java:2613 build/trans_presets.java:2619 +#: build/trans_presets.java:2625 build/trans_presets.java:2631 +#: build/trans_presets.java:2638 build/trans_presets.java:2645 +#: build/trans_presets.java:2652 build/trans_presets.java:2658 +#: build/trans_presets.java:2664 build/trans_presets.java:2674 +#: build/trans_presets.java:2683 build/trans_presets.java:2698 +#: build/trans_presets.java:2704 build/trans_presets.java:2712 +#: build/trans_presets.java:2719 build/trans_presets.java:2739 +#: build/trans_presets.java:2749 build/trans_presets.java:2755 +#: build/trans_presets.java:2761 build/trans_presets.java:2767 +#: build/trans_presets.java:2773 build/trans_presets.java:2780 +#: build/trans_presets.java:2787 build/trans_presets.java:2794 +#: build/trans_presets.java:2800 build/trans_presets.java:2806 +#: build/trans_presets.java:2814 build/trans_presets.java:2821 +#: build/trans_presets.java:2828 build/trans_presets.java:2835 +#: build/trans_presets.java:2841 build/trans_presets.java:2848 +#: build/trans_presets.java:2855 build/trans_presets.java:2864 +#: build/trans_presets.java:2870 build/trans_presets.java:2876 +#: build/trans_presets.java:2882 build/trans_presets.java:2888 +#: build/trans_presets.java:2897 build/trans_presets.java:2907 +#: build/trans_presets.java:2916 build/trans_presets.java:2922 +#: build/trans_presets.java:2928 build/trans_presets.java:2933 +#: build/trans_presets.java:2939 build/trans_presets.java:2945 +#: build/trans_presets.java:2954 build/trans_presets.java:2960 +#: build/trans_presets.java:2966 build/trans_presets.java:2972 +#: build/trans_presets.java:2978 build/trans_presets.java:2984 +#: build/trans_presets.java:2990 build/trans_presets.java:2997 +#: build/trans_presets.java:3003 build/trans_presets.java:3008 +#: build/trans_presets.java:3015 build/trans_presets.java:3022 +#: build/trans_presets.java:3028 build/trans_presets.java:3037 +#: build/trans_presets.java:3045 build/trans_presets.java:3051 +#: build/trans_presets.java:3057 build/trans_presets.java:3064 +#: build/trans_presets.java:3070 build/trans_presets.java:3077 +#: build/trans_presets.java:3083 build/trans_presets.java:3089 +#: build/trans_presets.java:3095 build/trans_presets.java:3101 +#: build/trans_presets.java:3114 build/trans_presets.java:3128 +#: build/trans_presets.java:3142 msgid "Name" msgstr "Nom" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50 +#, fuzzy, java-format msgid "" "Version {0} created on {1} by " -"{2}" +"{2} in changeset {3}" msgstr "" "Version {0} créée le {1} par " "{2}" +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#, fuzzy +msgid "Changeset info" +msgstr "Ensemble de changements {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#, fuzzy +msgid "Launch browser with information about the changeset" +msgstr "Plus d'informations à propos de cette balise" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#, fuzzy, java-format +msgid "Show changeset {0}" +msgstr "Ensemble de changements {0}" + #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format @@ -6425,32 +6913,287 @@ msgstr "Version {0} créée le {1} par {2}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" msgstr "Version" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 +msgid "Launch a file chooser to select a file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#, fuzzy +msgid "Select filename" +msgstr "Nom de la rue" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "Yes" +msgstr "Oui" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgid "No" +msgstr "Non" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#, java-format +msgid "Layer ''{0}'' has modifications which should be uploaded to the server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#, java-format +msgid "Layer ''{0}'' has no modifications to be uploaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#, java-format +msgid "" +"Layer ''{0}'' has modifications which should be saved to its assoicated file " +"''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#, java-format +msgid "Layer ''{0}'' has no modifications to be saved" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +msgid "No file associated with this layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#, fuzzy +msgid "Please select a file" +msgstr "Veuillez sélectionner une valeur" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#, fuzzy, java-format +msgid "Layer ''{0}'' is not backed by a file" +msgstr "La couche \"{0}\" doit se trouver dans la liste des couches" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#, java-format +msgid "File ''{0}'' is not writable. Please enter another file name." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#, java-format +msgid "Select to upload layer ''{0}'' to the server ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49 +#, java-format +msgid "Saving layer to ''{0}'' ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 +msgid "Unsaved changes - Save/Upload before exiting?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120 +msgid "Unsaved changes - Save/Upload before deleting?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140 +msgid "Uploading and saving modified layers ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195 +#, java-format +msgid "" +"{0} layer has unresolved conflicts.
Either resolve them first or " +"discard the modifications.
Layer with conflicts:" +msgid_plural "" +"{0} layers have unresolved conflicts.
Either resolve them first or " +"discard the modifications.
Layers with conflicts:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 +#, fuzzy +msgid "Unsafed data and conflicts" +msgstr "Corriger les conflits d'étiquettes" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213 +#, java-format +msgid "" +"{0} layer needs saving but has no associated file.
Either select a " +"file for this layer or discard the changes.
Layer without a file:" +msgid_plural "" +"{0} layers need saving but have no associated file.
Either select a " +"file for each of them or discard the changes.
Layers without a file:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 +msgid "Unsafed data and missing associated file" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231 +#, java-format +msgid "" +"{0} layer needs saving but has an associated file
which can't be " +"written.
Either select another file for this layer or discard the changes." +"
Layer with a non-writable file:" +msgid_plural "" +"{0} layers need saving but have associated files
which can't be " +"written.
Either select another file for each of them or discard the " +"changes.
Layers with non-writable files:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 +msgid "Unsafed data non-writable files" +msgstr "" + +#: ../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:318 +msgid "Exit JOSM without saving. Unsaved changes are lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 +#, fuzzy +msgid "Discard and Delete" +msgstr "Annuler et quitter" + +#: ../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:350 +msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 +#, fuzzy +msgid "Save and Delete" +msgstr "Enregistrer et quitter" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 +msgid "Save/Upload layers before deleting. Unsaved changes are not lost." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403 +#, java-format +msgid "Preparing layer ''{0}'' for upload ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 +msgid "" +"An upload and/or save operation of one layer with modifications
was " +"cancelled or has been failed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 +msgid "Incomplete upload and/or save" +msgstr "" + +#. item "Streets/Motorway" text "Name" +#. item "Streets/Motorway Link" label "Edit Motorway Link" +#. +#. +#. +#. item "Streets/Trunk" text "Name" +#. item "Streets/Trunk Link" text "Reference" +#. +#. item "Streets/Primary" text "Name" +#. item "Streets/Primary Link" label "Edit Primary Link" +#. +#. +#. +#. item "Streets/Secondary" text "Name" +#. item "Streets/Tertiary" text "Name" +#. item "Streets/Unclassified" check "Embankment" +#. item "Streets/Residential" check "Embankment" +#. item "Streets/Living Street" check "Embankment" +#. item "Streets/Service" check "Embankment" +#. item "Streets/Road (Unknown Type)" check "Embankment" +#. item "Streets/Roundabout" check "Embankment" +#. item "Streets/Bridge" text "Name" +#. item "Streets/Tunnel" text "Name" +#. item "Ways/Construction" check "Embankment" +#. item "Ways/Bridleway" check "Embankment" +#. item "Ways/Pedestrian" check "Embankment" +#. item "Ways/Steps" check "Embankment" +#. item "Ways/Path" check "Embankment" +#. item "Water/Drain" text "Name" +#. item "Water/Stream" text "Name" +#. item "Water/Canal" text "Name" +#. item "Water/River" text "Name" +#. item "Railway/Bus Guideway" check "Embankment" +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: build/trans_presets.java:67 build/trans_presets.java:84 +#: build/trans_presets.java:103 build/trans_presets.java:122 +#: build/trans_presets.java:143 build/trans_presets.java:159 +#: build/trans_presets.java:180 build/trans_presets.java:200 +#: build/trans_presets.java:223 build/trans_presets.java:241 +#: build/trans_presets.java:259 build/trans_presets.java:278 +#: build/trans_presets.java:311 build/trans_presets.java:357 +#: build/trans_presets.java:372 build/trans_presets.java:387 +#: build/trans_presets.java:409 build/trans_presets.java:429 +#: build/trans_presets.java:450 build/trans_presets.java:470 +#: build/trans_presets.java:489 build/trans_presets.java:508 +#: build/trans_presets.java:528 build/trans_presets.java:549 +#: build/trans_presets.java:570 build/trans_presets.java:591 +#: build/trans_presets.java:612 build/trans_presets.java:633 +#: build/trans_presets.java:664 build/trans_presets.java:1060 +#: build/trans_presets.java:1068 build/trans_presets.java:1076 +#: build/trans_presets.java:1086 build/trans_presets.java:1305 +msgid "Layer" +msgstr "Calque" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#, fuzzy +msgid "Should upload?" +msgstr "À l’envoi" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +msgid "Should save?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#, fuzzy +msgid "Filename" +msgstr "Fichier" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#, fuzzy +msgid "Upload" +msgstr "Téléchargement" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#, fuzzy +msgid "Preparing primitives to upload ..." +msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 #, java-format msgid "Images for {0}" msgstr "Images pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 msgid "Read GPX..." msgstr "Lecture GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 #, java-format msgid "No time for point {0} x {1}" msgstr "Aucune heure pour le point {0}·x·{1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 msgid "No images with readable timestamps found." msgstr "Aucune image avec des informations horaires lisibles trouvée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -6458,29 +7201,29 @@ msgstr "Lecture de {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Images géolocalisées" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 #, java-format msgid "GPS start: {0}" msgstr "Allumage du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS end: {0}" msgstr "Extinction du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 #, java-format msgid "current delta: {0}s" msgstr "variation différentielle actuelle : {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 msgid "timezone difference: " msgstr "différence de fuseau horaire : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -6489,14 +7232,14 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 #, java-format msgid "{0} within the track." msgstr "{0} dans la trace." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 msgid "Sync clock" msgstr "Synchroniser l’horloge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -6504,82 +7247,82 @@ msgstr "images JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 msgid "Image" msgstr "Image" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 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)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 msgid "GPS unit timezone (difference to photo)" msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 msgid "Synchronize Time with GPS Unit" msgstr "Synchroniser l’heure avec l’instrument GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 msgid "Time entered could not be parsed." msgstr "La date indiquée ne peut être analysée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236 msgid "gps point" msgstr "point GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196 msgid "Customize line drawing" msgstr "Personnaliser le dessin des lignes" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200 +msgid "Use global settings." +msgstr "Utiliser les réglages généraux." + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201 -msgid "Use global settings." -msgstr "Utiliser les réglages généraux." +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:123 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 -msgid "Draw lines between points for this layer." -msgstr "Dessiner des lignes entre les points pour ce calque." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Do not draw lines between points for this layer." msgstr "Ne pas dessiner de ligne entre les points pour ce calque." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 msgid "Select line drawing options" msgstr "Sélectionner les options de dessin des lignes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Personnaliser la couleur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Par défaut" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" @@ -6639,5 +7382,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Description: {0}" @@ -6653,10 +7396,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59 msgid "Convert to data layer" msgstr "Convertir en calque de données" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -6668,11 +7411,11 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 @@ -6714,4 +7457,9 @@ "Voulez-vous
continuer ?" +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 +#, fuzzy +msgid "Download data" +msgstr "Téléchargement des données" + #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 msgid "No GPX track available in layer to associate audio with." @@ -6736,19 +7484,19 @@ "estimer leur horodatage ont été omis." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 #, java-format msgid "Data Layer {0}" msgstr "Couche de données {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -6756,46 +7504,46 @@ "0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 #, java-format msgid " ({0} deleted.)" msgstr " ({0} supprimés)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 msgid "unset" msgstr "non défini" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Convertir en calque GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "track" msgid_plural "tracks" @@ -6803,5 +7551,5 @@ msgstr[1] "traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 msgid "point" msgid_plural "points" @@ -6809,5 +7557,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188 #, java-format msgid "a track with {0} point" @@ -6816,5 +7564,5 @@ msgstr[1] "une trace avec {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 #, java-format msgid "{0} consists of {1} track" @@ -6823,5 +7571,5 @@ msgstr[1] "{0} est constitué de {1} traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 #, java-format msgid "{0} point" @@ -6830,9 +7578,9 @@ msgstr[1] "{0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151 msgid "gps marker" msgstr "marqueur gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172 msgid "marker" msgid_plural "markers" @@ -6840,5 +7588,5 @@ msgstr[1] "marqueurs" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6859,5 +7607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250 #, java-format msgid "Audio synchronized at point {0}." @@ -6865,5 +7613,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259 msgid "Unable to synchronize in layer being played." msgstr "Impossible de synchroniser dans le calque actuellemnt lu." @@ -6895,5 +7643,5 @@ msgstr "Bascule l'état de visibilté du marqueur de texte et d'icônes." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6903,5 +7651,5 @@ "laquelle vous voulez l'associer (après le premier marqueur)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6911,29 +7659,29 @@ "marqueur audio ou sur le point de la trace où vous voulez synchroniser." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241 msgid "Unable to create new audio marker." msgstr "Impossible de créer un nouveau marqueur audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" msgstr "Il y a eu une erreur en essayant d’afficher l’URL pour ce marqueur" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "(URL was: " msgstr "(L’URL était : " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "Error displaying URL" msgstr "Erreur à l'affichage de l'URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" msgstr "Configuration avancée" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Setting Preference entries directly. Use with caution!" msgstr "Régler les préférences directement. À utiliser avec précaution !" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6941,14 +7689,14 @@ msgstr "Rechercher : " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100 msgid "Current value is default." msgstr "La valeur actuelle est par défaut." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102 #, java-format msgid "Default value is ''{0}''." msgstr "La valeur par défaut est \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6956,13 +7704,13 @@ "été utilisé)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654 msgid "Please select the row to edit." msgstr "Veuille sélectionnez la rangée à éditer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6970,14 +7718,14 @@ msgstr "Nouvelle valeur pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 msgid "Please select the row to delete." msgstr "Veuillez sélectionnez la rangée à supprimer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 msgid "Enter a new key/value pair" msgstr "Entrez une nouvelle paire clé/valeur" @@ -7123,40 +7871,40 @@ msgstr "Calibration de l’enregistrement de la voix" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Couleur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 #, java-format msgid "Paint style {0}: {1}" msgstr "Style de rendu {0} : {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 #, java-format msgid "Layer: {0}" msgstr "Couche : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 msgid "Choose" msgstr "Choisir" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 #, java-format msgid "Choose a color for {0}" msgstr "Choisir une couleur pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 msgid "Set to default" msgstr "Mettre la valeur par défaut" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 msgid "Set all to default" msgstr "Réinitialiser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 msgid "Colors used by different objects in JOSM." msgstr "Couleurs utilisées par les différents objets dans JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 msgid "Colors" msgstr "Couleurs" @@ -7202,5 +7950,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:1369 +#: build/trans_presets.java:1374 msgid "Car" msgstr "Voiture" @@ -7222,16 +7970,17 @@ #. item "Public Transport/Subway Entrance" check "Wheelchair" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:323 build/trans_presets.java:649 -#: build/trans_presets.java:852 build/trans_presets.java:871 -#: build/trans_presets.java:885 build/trans_presets.java:907 -#: build/trans_presets.java:944 build/trans_presets.java:957 -#: build/trans_presets.java:969 build/trans_presets.java:981 -#: build/trans_presets.java:993 build/trans_presets.java:1005 -#: build/trans_presets.java:1015 build/trans_presets.java:1024 -#: build/trans_presets.java:1033 build/trans_presets.java:1425 -#: build/trans_presets.java:1498 +#: build/trans_presets.java:324 build/trans_presets.java:650 +#: build/trans_presets.java:857 build/trans_presets.java:876 +#: build/trans_presets.java:890 build/trans_presets.java:912 +#: build/trans_presets.java:949 build/trans_presets.java:962 +#: build/trans_presets.java:974 build/trans_presets.java:986 +#: build/trans_presets.java:998 build/trans_presets.java:1010 +#: build/trans_presets.java:1020 build/trans_presets.java:1029 +#: build/trans_presets.java:1038 build/trans_presets.java:1437 +#: build/trans_presets.java:1510 msgid "Bicycle" msgstr "Vélos" +#. item "Ways/Path" label "Type" #. item "Barriers/Bollard" label "Allowed traffic:" #. @@ -7261,12 +8010,12 @@ #. #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: build/trans_presets.java:324 build/trans_presets.java:651 -#: build/trans_presets.java:851 build/trans_presets.java:870 -#: build/trans_presets.java:884 build/trans_presets.java:906 -#: build/trans_presets.java:943 build/trans_presets.java:956 -#: build/trans_presets.java:968 build/trans_presets.java:980 -#: build/trans_presets.java:992 build/trans_presets.java:1004 -#: build/trans_presets.java:1014 build/trans_presets.java:1023 -#: build/trans_presets.java:1032 +#: build/trans_presets.java:325 build/trans_presets.java:649 +#: build/trans_presets.java:856 build/trans_presets.java:875 +#: build/trans_presets.java:889 build/trans_presets.java:911 +#: build/trans_presets.java:948 build/trans_presets.java:961 +#: build/trans_presets.java:973 build/trans_presets.java:985 +#: build/trans_presets.java:997 build/trans_presets.java:1009 +#: build/trans_presets.java:1019 build/trans_presets.java:1028 +#: build/trans_presets.java:1037 msgid "Foot" msgstr "Piétons" @@ -7459,5 +8208,5 @@ #. Show splash screen on startup #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79 msgid "Show splash screen at startup" msgstr "Afficher l'écran de démarrage" @@ -7465,18 +8214,29 @@ #. Show ID in selection #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84 msgid "Show object ID in selection lists" msgstr "Montrer l'ID de l'objet dans les listes de sélections" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 +#, fuzzy +msgid "Show localized name in selection lists" +msgstr "Montrer l'ID de l'objet dans les listes de sélections" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93 msgid "Draw rubber-band helper line" msgstr "Dessiner la ligne d'aide" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42 msgid "Modeless working (Potlatch style)" msgstr "Fonctionnement sans mode (comme Potlatch)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 +#. Show localized names +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 +#, fuzzy +msgid "Show localized name in selection lists, if available" +msgstr "Montrer l'ID de l'objet dans les listes de sélections" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "" @@ -7484,6 +8244,6 @@ "Potlatch)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109 msgid "Look and Feel" msgstr "Apparence et ressenti" @@ -7515,54 +8275,54 @@ msgstr "style utilisé" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 msgid "Configure available plugins." msgstr "Configurer les greffons disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50 msgid "Download List" msgstr "Télécharger la liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100 msgid "Update" msgstr "Actualiser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66 msgid "Configure Sites..." msgstr "Configurer les sites..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91 msgid "Add JOSM Plugin description URL." msgstr "Ajouter une description à l'URL des greffons de JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Enter URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 +msgstr "Saisir l'URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128 msgid "Please select an entry." msgstr "Veuillez sélectionner une entrée." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113 msgid "Edit JOSM Plugin description URL." msgstr "Modifier la description de l'URL des greffons de JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "JOSM Plugin description URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141 msgid "Configure Plugin Sites" msgstr "Configurer les sites de greffon." #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Display Settings" msgstr "Réglages de l’affichage" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "" "Various settings that influence the visual representation of the whole " @@ -7570,42 +8330,42 @@ msgstr "Divers réglages de l’apparence de tout le programme." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings" msgstr "Réglages de connexion" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Connection Settings for the OSM server." msgstr "Paramètres de connexion du serveur OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Map Settings" msgstr "Réglages de la carte" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the map projection and data interpretation." msgstr "" "Réglages pour la projection de la carte et l’interprétation des données." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Audio Settings" msgstr "Paramètres Audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46 msgid "Settings for the audio player and audio markers." msgstr "Réglages pour le lecteur et les marqueurs audios." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 msgid "You have to restart JOSM for some settings to take effect." msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:54 msgid "Display coordinates as" msgstr "Afficher les coordonnées en" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57 msgid "Projection method" msgstr "Méthode de projection" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62 msgid "Map Projection" msgstr "Projection de la carte" @@ -7638,12 +8398,4 @@ msgid "Proxy server password" msgstr "Mot de passe du serveur mandataire" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 -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:38 -msgid "Base Server URL" -msgstr "URL du serveur de base" #. 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 @@ -7670,61 +8422,60 @@ msgstr "Raccourci" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61 #, java-format msgid "Short Description: {0}" msgstr "Description brève : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 #, java-format msgid "Author: {0}" msgstr "auteur : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Webpage: {0}" msgstr "page web : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Version: {0}" msgstr "Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293 msgid "Icon paths" msgstr "Chemins des icônes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243 msgid "Copy defaults" msgstr "Copier les valeurs par défaut" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248 msgid "Please select the row to copy." msgstr "Veuillez sélectionner la colonne à copier" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274 msgid "Add a new XML source to the list." msgstr "Ajouter une nouvelle source XML à la liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Delete the selected source from the list." msgstr "Supprimer la source sélectionnée de la liste." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7915,36 +8666,59 @@ msgstr "Touches de raccourcis" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 +#, java-format +msgid "Remove old keys from up to {0} object" +msgid_plural "Remove old keys from up to {0} objects" +msgstr[0] "Enlever des clés anciennes d'au maximum {0} objet" +msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 +#, fuzzy +msgid "Add a new tag" +msgstr "Ajouter un nouveau calque" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 +#, fuzzy +msgid "Delete the selection in the tag table" +msgstr "Supprimer le calque sélectionné." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 msgid "More information about this feature" msgstr "Plus d'informations à propos de cette balise" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 msgid "Optional Attributes:" msgstr "Attributs optionnels:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499 #, java-format msgid "Use preset ''{0}''" msgstr "Utiliser la balise \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 msgid "closedway" msgstr "voie sans issue" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544 #, java-format msgid "Unknown type: {0}" msgstr "Type inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50 #, java-format @@ -7952,15 +8726,15 @@ msgstr "Impossible de lire la source des balises prédéfinies : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631 #, java-format msgid "Error parsing {0}: " msgstr "Erreur de traitement {0} : " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #, 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:670 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7970,22 +8744,22 @@ msgstr[1] "Changer {0} objets." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 msgid "Change Properties" msgstr "Changer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 #, java-format msgid "Preset group ''{0}''" @@ -8026,11 +8800,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184 #, java-format msgid "Could not read \"{0}\"" msgstr "Impossible de lire \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -8040,38 +8814,38 @@ "de traces sous licence GPL." -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43 -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:24 msgid "GPX Files" msgstr "Fichiers GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71 msgid "gps track description" msgstr "description de la trace GPS" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" msgstr "Ajouter des informations sur l’auteur" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 msgid "Real name" msgstr "Nom réel" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92 msgid "Predefined" msgstr "Prédéfini" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94 msgid "Copyright year" msgstr "Année du copyright" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110 msgid "Keywords" msgstr "Mots-clés" @@ -8081,9 +8855,9 @@ msgstr "Options d’export" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 msgid "Export and Save" msgstr "Exporter et sauvegarder" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175 #, java-format msgid "" @@ -8094,10 +8868,10 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:258 msgid "Choose a predefined license" msgstr "Choisir une licence prédéfinie" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 @@ -8107,12 +8881,12 @@ msgstr "Marqueurs de {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41 #, java-format msgid "File \"{0}\" does not exist" msgstr "Le fichier \"{0}\" n'existe pas" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44 #, java-format msgid "Parsing file \"{0}\" failed" @@ -8137,6 +8911,6 @@ "déduire le type de primitive" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -8146,10 +8920,20 @@ msgstr "Téléchargement des données OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 -#, java-format -msgid "Fetching {0} with id {1} from ''{2}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 +#, java-format +msgid "Fetching node with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, java-format +msgid "Fetching way with id {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 +#, fuzzy, java-format +msgid "Fetching relation with id {0} from ''{1}''" +msgstr "éditer la relation #{0} dans la couche \"{1}" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -8157,10 +8941,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:399 -#, java-format -msgid "Fetching a package of {0} from ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#, java-format +msgid "Fetching a package of nodes from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 +#, java-format +msgid "Fetching a package of ways from ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 +#, fuzzy, java-format +msgid "Fetching a package of relations from ''{0}''" +msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8170,34 +8964,34 @@ "requêtes individuelles pour chaque primitive" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" msgstr "Fichiers NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Coordonnées importées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 msgid "Malformed sentences: " msgstr "Phrases malformées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Checksum errors: " msgstr "Erreurs de syntaxe : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 msgid "Unknown sentences: " msgstr "Phrases inconnues : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 msgid "Zero coordinates: " msgstr "Pas de coordonnées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53 msgid "NMEA import success" msgstr "Succès de l'import des trames NMEA" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56 msgid "NMEA import faliure!" msgstr "Erreur lors de l'import des trames NMEA !" @@ -8208,9 +9002,9 @@ msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 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:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 #, java-format msgid "" @@ -8221,5 +9015,5 @@ "supporte que les versions {0} à {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 #, java-format msgid "Communications with {0} established using protocol version {1}" @@ -8227,10 +9021,10 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238 #, 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:261 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 #, java-format msgid "" @@ -8240,33 +9034,91 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -msgid "Opening changeset..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 +#, fuzzy +msgid "Creating changeset..." msgstr "Ouverture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316 +#, java-format +msgid "Successfully opened changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 +msgid "No currently open changeset. Opening a new changeset..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310 +msgid "" +"Warning: could not reuse an existing changeset as requested. Opening a new " +"one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318 +#, fuzzy, java-format +msgid "Reusing existing changeset {0}" +msgstr "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 +#, fuzzy +msgid "Updating changeset..." +msgstr "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +#, java-format +msgid "Changeset {0} is unchanged. Skipping update." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 +#, fuzzy, java-format +msgid "Updating changeset {0}..." +msgstr "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +msgid "" +"Failed to update changeset. Either there is no current changeset or the id " +"of the current changeset is 0" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 +#, fuzzy, java-format +msgid "Closing changeset {0}..." +msgstr "Fermeture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#, fuzzy, java-format +msgid "Leaving changeset {0} open..." +msgstr "Ouverture de la révision..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "No changeset present for diff upload" msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 msgid "Uploading..." msgstr "Envoi en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 msgid "Waiting 10 seconds ... " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgstr "Attends 10 secondes… " + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#, java-format +msgid "Starting retry {0} of {1} in {2} seconds ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515 #, java-format msgid "Starting retry {0} of {1}." @@ -8294,29 +9146,33 @@ msgstr "Fichier bz2 invalide." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160 msgid "Incorrect password or username." msgstr "Mot de passe ou nom d’utilisateur incorrect." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168 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:177 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172 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:181 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178 msgid "Enter Password" msgstr "Entrer le mot de passe" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 msgid "Login" msgstr "Identifiant" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242 +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:243 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:230 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244 msgid "" "Login password to the OSM account. Leave blank to not store any password." @@ -8325,13 +9181,17 @@ "aucun mot de passe." -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245 +msgid "Base Server URL" +msgstr "URL du serveur de base" + +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247 msgid "OSM username (e-mail)" msgstr "Nom d'utilisateur OSM (e-mail))" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249 msgid "OSM password" msgstr "Mot de passe OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235 +#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251 msgid "" "WARNING: The password is stored in plain text in the preferences file." @@ -8343,20 +9203,20 @@ "encodé dans l'URL.
N'utilisez pas un mot de passe de valeur." -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 msgid "OSM Server Files" msgstr "Fichiers du serveur OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45 #, java-format msgid "Expected instance of OsmDataLayer. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" @@ -8364,6 +9224,8 @@ "html>" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +"Une erreur est survenue lors du chargement d'une sauvegarde." +"
L'erreur est :
{0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -8576,35 +9438,46 @@ "Internet." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 -#, java-format -msgid "" -"Failed to close changeset {0}, will be closed by server after timeout. " -"Exception was: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" +msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 +#, fuzzy, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" +msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 #, java-format msgid "" "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " -"use changesets, but API is not able to handle them. Ignoring changesets." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +"use diff uploads, but API is not able to handle them. Ignoring diff upload." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194 +#, fuzzy +msgid "Starting to upload in one request ..." +msgstr "Rien à envoyer. Obtenez d’abord des données." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 +msgid "Starting to upload with one request per primitive ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update Plugins" msgstr "Mise à jour des greffons" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Télécharger les greffons" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54 #, java-format msgid "" @@ -8617,5 +9490,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -8624,23 +9497,23 @@ msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75 #, java-format msgid "Downloading Plugin {0}..." msgstr "Téléchargement du greffon {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 msgid "Skip download" msgstr "Annuler le téléchargement" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "Version {0} de JOSM requise pour le greffon {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Download Plugin" msgstr "Télécharger le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" msgstr "Annuler le téléchargement" @@ -8651,30 +9524,30 @@ msgstr "Une erreur est survenue dans le greffon {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:70 #, java-format msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 #, java-format msgid "Plugin not found: {0}." msgstr "Greffon non trouvé : {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "La dernière mise à jour du greffon date de plus de {0} jours." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:142 msgid "" "(You can change the number of days after which this warning appears
by " @@ -8685,21 +9558,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Disable plugin" msgstr "Désactiver le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 msgid "Keep plugin" msgstr "Garder le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -8709,5 +9582,5 @@ "l’autorisation de remplacer les greffons existants." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 #, java-format msgid "" @@ -8716,10 +9589,10 @@ "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "D’après les informations du greffon, l’auteur est {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -8728,9 +9601,9 @@ "d'extension avant de rapporter un bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290 msgid "Should the plugin be disabled?" msgstr "Ce module d'extension doit-il être désactivé ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -8740,13 +9613,14 @@ "greffon ne soit plus chargé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 msgid "The plugin could not be removed. Probably it was already disabled" msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +"Le greffon ne peut pas être supprimé. Il était probablement déjà désactivé." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 msgid "Plugin information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +msgstr "Informations sur le greffon" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -8757,5 +9631,5 @@ msgstr "Plus de détails" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -8764,18 +9638,18 @@ msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 msgid "No plugin information found." msgstr "Pas d'information sur les greffons trouvée." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 #, java-format msgid "Plug-in named {0} is not available. Update skipped." msgstr "Le plugin {0} n'est pas disponible. Mise à jour annulée." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93 msgid "All installed plugins are up to date." msgstr "Tous les greffons installés sont à jour." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 #, java-format msgid "" @@ -8788,9 +9662,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 msgid "Download missing plugins" msgstr "Télécharger les greffons manquants" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141 #, java-format msgid "" @@ -8803,35 +9677,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224 msgid "Plugin bundled with JOSM" msgstr "Greffon intégré à JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Erreur à la lecture du fichier d’information du greffon : {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301 msgid "This is after the end of the recording" msgstr "Ceci est après la fin de l’enregistrement" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343 msgid "Error playing sound" msgstr "Erreur lors de la lecture du son" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Do nothing" msgstr "Ne rien faire" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53 msgid "Report Bug" msgstr "Signaler une erreur" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "" "An unexpected exception occurred.\n" @@ -8846,14 +9720,14 @@ "rapport d'erreur." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" msgstr "Exception inattendue" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 #, java-format msgid "Please report a ticket at {0}" msgstr "Veuillez rapporter un billet à {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -8861,5 +9735,5 @@ "que possible) !" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8869,13 +9743,13 @@ "rapporter un bogue." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "Be sure to include the following information:" msgstr "Soyez sûr(e) d'inclure l'information suivante :" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76 msgid "(The text has already been copied to your clipboard.)" msgstr "(Ce texte a déjà été copié dans votre presse-papier.)" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -8884,6 +9758,6 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182 #, java-format msgid "" @@ -8892,5 +9766,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 #, java-format msgid "" @@ -8899,5 +9773,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format msgid "" @@ -8910,5 +9784,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453 msgid "" "This action will have no shortcut.\n" @@ -8918,5 +9792,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455 #, java-format msgid "" @@ -8927,22 +9801,57 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "" "(Astuce : Vous pouvez modifier les raccourcis-clavier dans les préférences.)" -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:75 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:87 #, java-format msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 -#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:80 #, java-format msgid "" "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " "was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window " +"geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got " +"{2}. Can''t restore window geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#, java-format +msgid "" +"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: " +"{2}. Can''t restore window geometry from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#, java-format +msgid "" +"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry " +"from preferences." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#, java-format +msgid "" +"Warning: failed to restore window geometry from key ''{0}''. Falling back to " +"default geometry. Details: {1}" msgstr "" @@ -8971,9 +9880,27 @@ msgstr "Créer un reseau de voies" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59 +msgid "Private (only shared as anonymous, unordered points)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60 +msgid "Public (shown in trace list and as anonymous, unordered points)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61 +msgid "Trackable (only shared as anonymous, ordered points with timestamps)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62 +msgid "" +"Identifiable (shown in trace list and as identifiable, ordered points with " +"timestamps)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 msgid "Upload Trace" msgstr "Envoyer la trace" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 +#: ../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 @@ -8981,27 +9908,40 @@ msgstr "Charger les traces" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 -msgid "Public" -msgstr "Public" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 -msgid "Selected makes your trace public in openstreetmap.org" -msgstr "Cette sélection rend votre trace publique dans openstreetmap.org" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134 +msgid "Visibility" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135 +msgid "Defines the visibility of your trace for other OSM users." +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +#, fuzzy +msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" +msgstr "http://www.openstreetmap.org/traces" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +msgid "(What does that mean?)" +msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 -#: build/trans_presets.java:3017 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141 +#: build/trans_presets.java:3145 msgid "Description" msgstr "Description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 msgid "Please enter Description about your trace." msgstr "Veuillez saisir une description de votre trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144 +msgid "Tags (comma delimited)" +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145 msgid "Please enter tags about your trace." msgstr "Veuillez entrer des mot-clés liés à votre trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192 #, java-format msgid "Selected track: {0}" @@ -9009,47 +9949,47 @@ #. Set progress dialog to indeterminate while connecting -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215 msgid "Connecting..." msgstr "Connexion..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 msgid "Upload cancelled" msgstr "Envoi annulé" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248 msgid "Error while uploading" msgstr "Erreur lors du chargement" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302 msgid "GPX upload was successful" msgstr "Succès de l'envoi de la trace GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 msgid "Upload failed. Server returned the following message: " msgstr "L'envoi a échoué. Le serveur a retourné le message suivant : " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Envoyer la trace GPX : {0}% ({1} ou {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 msgid "No description provided. Please provide some description." msgstr "Pas de description fournie. Merci de fournir une description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Pas de calque GPX sélectionné. Impossible de téléverser une trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383 msgid "No username provided." msgstr "Pas de nom d'utilisateur fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386 msgid "No password provided." msgstr "Pas de mot de passe fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418 msgid "Uploading GPX Track" msgstr "Envoyer la trace GPX" @@ -9162,19 +10102,19 @@ msgstr "Charger l'ensemble des images comme un nouveau calque." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Fichiers GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:175 #, java-format msgid "Error while parsing {0}" msgstr "Erreur pendant le traitement {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9186,34 +10126,34 @@ "hpoto et sélectionnez un fuseau horaire.
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:241 msgid "Photo time (from exif):" msgstr "Heure de la photo (information EXIF) :" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256 msgid "Gps time (read from the above photo): " msgstr "Heure du GPS (lu sur la photo) : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:268 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [jj/mm/aaa hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:276 msgid "I'm in the timezone of: " msgstr "Je suis dans le fuseau horaire de : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:339 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:375 msgid "No date" msgstr "Aucune date" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:348 msgid "Open an other photo" msgstr "Ouvrez une autre photo" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchroniser l’heure avec une photo du GPS" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:403 msgid "" "Error while parsing the date.\n" @@ -9223,29 +10163,29 @@ "Merci d’utiliser le format demandé" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:405 msgid "Invalid date" msgstr "Date non valide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:454 msgid "GPX track: " msgstr "Trace GPX : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459 msgid "Open another GPX trace" msgstr "Ouvrir une autre trace GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:475 msgid "Timezone: " msgstr "Fuseau horaire : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:497 msgid "Offset:" msgstr "Décallage :" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:509 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -9253,41 +10193,41 @@ "html>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:526 msgid "Update position for: " msgstr "Mettre à jour la position pour : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:535 msgid "All images" msgstr "Toutes les images" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:545 msgid "Images with no exif position" msgstr "Images sans position EXIF" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:555 msgid "Not yet tagged images" msgstr "Images non encore étiquetées" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575 msgid "Correlate images with GPX track" msgstr "Correler les images avec la trace GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Correlate" msgstr "Corréler" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Auto-Guess" msgstr "Estimation automatique" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587 msgid "You should select a GPX track" msgstr "Vous devez sélectionner une trace GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "No selected GPX track" msgstr "Aucune trace GPX sélectionnée" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600 #, java-format msgid "" @@ -9298,9 +10238,9 @@ "Format attendu : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 msgid "Invalid timezone" msgstr "Fuseau horaire invalide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613 #, java-format msgid "" @@ -9311,27 +10251,27 @@ "Format attendu : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 msgid "Invalid offset" msgstr "Décallage invalide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 msgid "GPX Track loaded" msgstr "Trace GPX chargée" +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693 +msgid "The selected photos don't contain time information." +msgstr "" +"Les photos sélectionnées ne contiennent pas d'information d'horodatage." + #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 -msgid "The selected photos don't contain time information." -msgstr "" -"Les photos sélectionnées ne contiennent pas d'information d'horodatage." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Les photos ne contienne tpas d'information d'horodatage" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -9340,39 +10280,39 @@ "autre." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729 msgid "GPX Track has no time information" msgstr "La trace GPX n'a pas d'horodatage." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 #, java-format msgid "Timezone: {0}" msgstr "Fuseau horaire : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 #, java-format msgid "Minutes: {0}" msgstr "Minutes : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Seconds: {0}" msgstr "Secondes : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796 #, java-format msgid "(Time difference of {0} days)" msgstr "(Différence de temps de {0} jours)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803 #, 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." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9383,13 +10323,13 @@ "manuellement." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "Matching photos to track failed" msgstr "La correspondance des photos avec la trace a échoué" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883 msgid "Adjust timezone and offset" msgstr "Ajuster le fuseau horaire et le décalage" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Default Values" msgstr "Valeurs par défaut" @@ -9410,5 +10350,5 @@ msgstr "Erreur sur le fichier {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 #, java-format msgid "" @@ -9417,16 +10357,18 @@ "(No = new cache)" msgstr "" +"Le lieu \"{0}\" a été trouvé dans le cache.\n" +"Charger le cache d'abord ?\n" +"(Non = nouveau cache)" #. this below is a temporary workaround to fix the "always on top" issue #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:89 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:382 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386 msgid "Select Feuille" -msgstr "Tout sélectionner" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +msgstr "Sélectionner la feuille cadastrale." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" @@ -9455,8 +10397,8 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77 -#, java-format -msgid "" -"Town/city {0} not found or not available in WMS.\n" -"Please check its availibility on www.cadastre.gouv.fr" +#, fuzzy, java-format +msgid "" +"Town/city {0} not found or not available\n" +"or action canceled" msgstr "" "Ville {0} non trouvée ou non disponible sur le WMS.\n" @@ -9467,21 +10409,21 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:361 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:365 msgid "Select commune" msgstr "Sélectionner la commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354 msgid "Choose from..." msgstr "Choisir parmi..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -9495,37 +10437,50 @@ "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "Restaurer la fontion de téléchargement à la touche F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 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/CadastrePreferenceSetting.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" +"Attention : la boîte de dialogue des options n'a pu être affichée au premier " +"plan. L'exception était : {0}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 msgid "Replace original background by JOSM background color." msgstr "Remplacer le fond original par la couleur de fond de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 msgid "Reverse grey colors (for black backgrounds)." msgstr "Inverser les couleurs grises (pour les fonds noir)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Set background transparent." msgstr "Rendre le fond transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 msgid "Draw boundaries of downloaded data." msgstr "Tracer les limites des données téléchargées." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174 +msgid "Disable image cropping during georeferencing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 msgid "Enable automatic caching." msgstr "Activer le tampon automatique." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 msgid "Max. cache size (in MB)" msgstr "Taille max. du tampon (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -9542,9 +10497,9 @@ "
avant tout chargement de données créé à partir de ce greffon." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 msgid "French cadastre WMS" msgstr "WMS du cadastre français" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -9552,10 +10507,10 @@ "celle-ci est activé" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:172 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -9565,5 +10520,5 @@ "préférences de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -9573,9 +10528,9 @@ "intermédiaires). Utile pour lire les textes sur fond noir." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" msgstr "Permet l'empilement de plusieurs calques" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -9583,5 +10538,5 @@ "gauche." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" @@ -9589,11 +10544,10 @@ #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115 msgid "Vector images grab multiplier:" -msgstr "Division du téléchargement de zone :" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" @@ -9601,18 +10555,17 @@ "mémoire)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138 msgid "Fixed size square (default is 100m)" msgstr "Carré de taille fixe (par défaut : 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:152 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Taille fixe (de 25 à 1000 mètres)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" -msgstr "Division du téléchargement de zone :" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -9672,12 +10625,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32 -#, fuzzy msgid "Contacting cadastre WMS ..." -msgstr "Contact du serveur WMS..." +msgstr "Contact du serveur WMS du cadastre…" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38 -#, fuzzy msgid "Image already loaded" -msgstr "image non chargée" +msgstr "L'image a déjà été chargée." #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74 @@ -9711,20 +10662,23 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 +#, fuzzy msgid "" "To enable the cadastre WMS plugin, change\n" "the current projection to one of the cadastre\n" -"projection and retry" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:44 +"projections and retry" +msgstr "" +"Pour activer le greffon WMS du cadastre, changez\n" +"la projection actuelle vers une du cadastre et réessayez." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 msgid "Grab non-georeferenced image" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68 msgid "Georeferencing interrupted" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:95 +msgstr "Géoréférencement interrompu." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 msgid "" "Click first corner for image cropping\n" @@ -9732,9 +10686,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 +#, fuzzy +msgid "Image cropping" +msgstr "chargement de l’image..." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 msgid "Click second corner for image cropping" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:123 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196 msgid "" "Click first Lambert crosspiece for georeferencing\n" @@ -9742,31 +10702,39 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:132 -msgid "Click second Lambert crosspiece for georeferencing\n" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:148 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 +msgid "Image georeferencing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 +msgid "Click second Lambert crosspiece for georeferencing" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233 +msgid "" +"Do you want to cancel completely\n" +"or just retry " +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249 msgid "Enter cadastre east,north position" -msgstr "Entrez la Lat./Long. pour vous rendre à la position." - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:149 +msgstr "Entrez la position est,nord du cadastre." + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 msgid "East" msgstr "Est" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 msgid "North" msgstr "Nord" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, fuzzy -msgid "Set Lambert coordinate" -msgstr "Conserver leurs coordonnées" +msgid "Set " +msgstr "Sélectionner" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -9833,6 +10801,6 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 #, java-format msgid "Simplify Way (remove {0} node)" @@ -9856,6 +10824,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 msgid "Blank Layer" msgstr "Calque vide" @@ -9871,7 +10839,7 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 -#, fuzzy, java-format +#, java-format msgid "Raster size: {0}" -msgstr "Centre de la trame : {0}" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 @@ -10404,6 +11372,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 #: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3441 -#: build/trans_style.java:3449 +#: build/trans_style.java:1023 build/trans_style.java:3392 +#: build/trans_style.java:3400 msgid "water" msgstr "eau" @@ -10416,8 +11384,4 @@ msgid "land" msgstr "terre" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -msgid "none" -msgstr "rien" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -10719,9 +11683,9 @@ msgstr "Boucle de téléchargement OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:108 msgid "Displays OpenStreetBugs issues" msgstr "Afficher les problèmes d'OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 msgid "" "The openstreetbus plugin is using the old server at appspot.com.
A " @@ -10733,5 +11697,5 @@ "passer au nouveau serveur ? (fortement recommandé)" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 msgid "Switch to new openstreetbugs server?" msgstr "Basculer vers le nouveau serveur openstreetbugs ?" @@ -11212,4 +12176,6 @@ "found." msgstr "" +"Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont été " +"trouvés." #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -11312,5 +12278,5 @@ #. item "Buildings/Addresses" text "House name" #: ../plugins/terracer/src/terracer/TerracerAction.java:475 -#: build/trans_presets.java:2192 +#: build/trans_presets.java:2261 msgid "Street name" msgstr "Nom de la rue" @@ -11329,29 +12295,29 @@ msgstr "Afficher la liste des auteurs" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89 msgid "Open User Page" msgstr "Ouvrir la page utilisateur" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90 msgid "Open User Page in browser" msgstr "Ouvrir la page utilisateur dans le navigateur" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103 msgid "Select User's Data" msgstr "Sélectionner les données de l'utilisateur" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104 msgid "Replaces Selection with Users data" msgstr "Remplacer la sélection par les données utilisateurs" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130 msgid "Please select some data" msgstr "Veuillez sélectionner quelques données" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134 msgid "Please choose a user using the author panel" msgstr "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs" -#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165 +#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147 msgid "Sorry, doesn't work with anonymous users" msgstr "Désolé, cela ne fonctionne pas avec des utilisateurs anonymes" @@ -11365,25 +12331,15 @@ msgstr "Joint les zones qui se superposent l'une l'autre" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 -msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -msgstr "" -"CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de " -"charger." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 -msgid "Continue anyway" -msgstr "Continuer tout de même" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:134 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 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." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:139 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 #, 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." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:156 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:65 msgid "" "The selected way(s) have nodes outside of the downloaded data region.\n" @@ -11396,39 +12352,39 @@ "Voulez-vous vraiment continuer ?" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:159 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 msgid "Please abort if you are not sure" msgstr "Veuillez abandonner si vous n'êtes pas sûr(e)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 msgid "Please select at least one closed way the should be joined." msgstr "Veuillez sélectionner au moins un chemin clos devant être fusionné." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 msgid "No intersection found. Nothing was changed." msgstr "Pas d’intersection trouvée. Rien n’a été modifié." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196 msgid "Added node on all intersections" msgstr "Noeuds ajoutés sur toutes les intersections" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:227 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220 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" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225 msgid "Fix relations" msgstr "Corriger les relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" msgstr "Ai fusionné une aire superposée sur elle même" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Joined overlapping areas" msgstr "Ai fusionné des aires superposées" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:242 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -11438,83 +12394,83 @@ "Veuillez vérifier qu'aucune erreur n'a été introduite." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "Corriger les conflits d'étiquettes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 msgid "Removed Element from Relations" msgstr "Élément supprimé des relations" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 msgid "Join Areas: Remove Short Ways" msgstr "Aires jointes: enlever les voies courtes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 msgid "Closed Way" msgstr "Chemin fermé" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 msgid "Remove tags from inner ways" msgstr "Supprime les étiquettes des chemins internes" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 msgid "Join Areas Function" msgstr "Fonction de jointure des zones" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Aller à la position" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Opens a dialog that allows to jump to a specific location" msgstr "" "Ouvre une boite de dialogue permettant de se rendre à une position spécifique" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 msgid "Enter Lat/Lon to jump to position." msgstr "Entrez la Lat./Long. pour vous rendre à la position." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Vous pouvez aussi coller une URL de www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 msgid "Zoom (in metres)" msgstr "Zoom (en mètres)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 msgid "Jump there" msgstr "Aller ici" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 msgid "Jump to Position" msgstr "Aller à la position" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "Impossible d'analyser la Latitude, Longitude ou le Zoom. Veuillez vérifier." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 msgid "Unable to parse Lon/Lat" msgstr "Analyse syntaxique de la Lat./Lon. impossible" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" msgstr "Simplifier le chemin" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." msgstr "Supprimer les nœuds non nécessaires du chemin" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 msgid "Please select at least one way to simplify." msgstr "Veuillez sélectionner au moins un chemin à simplifier." -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88 #, java-format msgid "The selection contains {0} way. Are you sure you want to simplify it?" @@ -11526,25 +12482,25 @@ "La sélection contient {0} chemins. Êtes-vous sûr de vouloir les simplifier ?" -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90 +#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 msgid "Are you sure?" msgstr "Êtes-vous sur ?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 msgid "Validation errors" msgstr "Erreurs de validation" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:90 msgid "No validation errors" msgstr "Aucune erreur de validation" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165 msgid "Grid" msgstr "Grille" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #, java-format msgid "" @@ -11637,53 +12593,53 @@ msgstr "Validation des données" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 msgid "Data with errors. Upload anyway?" msgstr "Les données contiennent des erreurs. Envoyer quand même ?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 msgid "Open the validation window." msgstr "Ouvrir la fenêtre de validation." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79 msgid "Zoom to problem" msgstr "Zoomer sur le problème" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 msgid "Fix" msgstr "Réparer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 msgid "Fix the selected errors." msgstr "Résoudre l'erreur sélectionné" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104 msgid "Ignore" msgstr "Ignorer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Ignore the selected errors next time." msgstr "Ignorer les erreurs sélectionnées à l'avenir." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Whole group" msgstr "Groupe complet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Single elements" msgstr "Eléments seuls" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 msgid "Nothing" msgstr "Rien" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189 msgid "Ignore whole group or individual elements?" msgstr "Ignorer le groupe complet ou les éléments individuels ?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190 msgid "Ignoring elements" msgstr "Ignore les éléments" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 #, java-format msgid "Replace \"{0}\" by \"{1}\" for" @@ -11707,24 +12663,58 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46 -msgid "" -"This test checks if two roads, railways or waterways crosses in the same " -"layer, but are not connected by a node." +#, fuzzy +msgid "" +"This test checks if two roads, railways, waterways or buildings crosses in " +"the same layer, but are not connected by a node." msgstr "" "Ce test vérifie si deux routes, chemins de fer ou voies d’eau se croisent " "sur le même calque sans être connectés par un nœud." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 +#, fuzzy +msgid "Crossing buildings" +msgstr "Créer les bêtiments" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122 msgid "Crossing ways" msgstr "Chemins se croisant" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72 msgid "Duplicated nodes" msgstr "Nœuds dupliqués" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Ce test vérifie si des nœuds ne sont pas exactement à la même position." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69 +#, fuzzy +msgid "Nodes at same position" +msgstr "Nœuds avec le même nom." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +msgid "Confirmation" +msgstr "Confirmation" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76 +#, fuzzy +msgid "Duplicated ways" +msgstr "Chemin dupliqué" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 +#, fuzzy +msgid "" +"This test checks that there are no ways with same tags and same node " +"coordinates." +msgstr "" +"Ce test vérifie si des nœuds ne sont pas exactement à la même position." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 +#, fuzzy +msgid "Delete duplicate ways" +msgstr "Créer un chemin dupliqué" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -11814,23 +12804,23 @@ "mal ortographiés." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 msgid "Properties checker :" msgstr "Vérificateur de propriétés :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "This plugin checks for errors in property keys and values." msgstr "Ce greffon vérifie les erreurs dans les clés et les valeurs." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ligne du vérificateur d’étiquettes invalide - {0} : {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Erreur d’orthographe ligne : {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 #, java-format msgid "" @@ -11841,7 +12831,7 @@ "{0}" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 msgid "Illegal tag/value combinations" msgstr "Combinaisons étiquette/valeur non valide" @@ -11849,83 +12839,83 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 msgid "Painting problem" msgstr "Problème de rendu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 #, java-format msgid "Key ''{0}'' invalid." msgstr "Clé \"{0}\" non valide." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 msgid "Tags with empty values" msgstr "Étiquettes avec des valeurs vides" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 msgid "Invalid property key" msgstr "Clé de propriété invalide" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 msgid "Invalid white space in property key" msgstr "espace blanc dans une clé non valide" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 msgid "Property values start or end with white space" msgstr "Les valeurs commencent ou finissent par un espace blanc" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 msgid "Property values contain HTML entity" msgstr "Les valeurs contiennent du code HTML" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 #, java-format msgid "Key ''{0}'' not in presets." msgstr "La clé \"{0}\" ne fait pas partie des balises prédéfinies." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 msgid "Presets do not contain property key" msgstr "Les balises ne contiennent pas de propriété" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#, java-format +msgid "Value ''{0}'' for key ''{1}'' not in presets." +msgstr "" +"La valeur \"{0}\" pour la clé \"{1}\" n'est pas dans les balises prédéfinies." + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 -#, java-format -msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" -"La valeur \"{0}\" pour la clé \"{1}\" n'est pas dans les balises prédéfinies." - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Les balises ne contiennent pas de valeur de propriété" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 msgid "Check property keys." msgstr "Vérifier les clés de propriétés." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Validate that property keys are valid checking against list of words." msgstr "" "Valider que les clés sont valides en comparasion avec une liste de mots?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 msgid "Use complex property checker." msgstr "Utiliser un vérificateur de propriétés complexe." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Validate property values and tags using complex rules." msgstr "" "Valider les étiquettes et les valeurs en utilisant des règles complexes." +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Source de TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -11936,21 +12926,21 @@ "données de vérification des étiquettes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "Add a new source to the list." msgstr "Ajouter une nouvelle source à la liste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Edit the selected source." msgstr "Modifier la source sélectionnée." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691 msgid "Data sources" msgstr "Sources de données" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711 msgid "Check property values." msgstr "Vérifier les valeurs des propriétés" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -11958,9 +12948,9 @@ "prédéfinies." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719 msgid "Check for FIXMES." msgstr "Vérifier les FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" @@ -11968,54 +12958,54 @@ "étiquette." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check for paint notes." msgstr "Vérifier les notes de rendu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check if map painting found data errors." msgstr "Vérifier si le rendu de carte a généré des erreurs." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Use default data file." msgstr "Utiliser le fichier de données par défaut." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use the default data file (recommended)." msgstr "Utiliser le fichier de données par défaut (recommandé)." +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739 +msgid "Use default tag ignore file." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 -msgid "Use default tag ignore file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Use default spellcheck file." msgstr "Utiliser la vérification orthographique par défaut." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use the default spellcheck file (recommended)." msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838 msgid "Fix properties" msgstr "Corriger les propriétés" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959 msgid "Could not find element type" msgstr "Impossible de trouver le type element" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976 msgid "Could not find warning level" msgstr "Impossible de trouver le niveau d’avertissement" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985 #, java-format msgid "Illegal expression ''{0}''" msgstr "Expression interdite \"{0}\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 #, java-format msgid "Illegal regular expression ''{0}''" @@ -12160,7 +13150,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4192 build/trans_style.java:4199 -#: build/trans_style.java:4206 build/trans_style.java:4213 -#: build/trans_style.java:4220 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 +#: build/trans_style.java:4179 msgid "building" msgstr "bâtiment" @@ -12174,5 +13164,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4227 +#: build/trans_style.java:4186 msgid "area" msgstr "zone" @@ -12232,5 +13222,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "carrefour sans nom" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -12276,5 +13266,5 @@ #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 msgid "Scanned Map..." -msgstr "" +msgstr "Carte scannée…" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 @@ -12282,4 +13272,5 @@ "Display a map that was previously scanned and uploaded to walking-papers.org" msgstr "" +"Afficher une carte précédemment scannée et envoyée sur walking-papers.org" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 @@ -12287,4 +13278,6 @@ "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" msgstr "" +"Saisir une URL walking-papers.org ou un identifiant (la valeur après le ?id= " +"dans l'URL)" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 @@ -12292,9 +13285,10 @@ msgid "Could not read information from walking-papers.org the id \"{0}\"" msgstr "" +"Impossible de lire l'information depuis walking-papers.org pour l'id \"{0}\"" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 #, java-format msgid "Walking Papers: {0}" -msgstr "" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -12314,5 +13308,5 @@ msgstr "Intersection atteinte" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 msgid "Exception occurred" msgstr "Une exception s’est produite" @@ -12380,14 +13374,14 @@ msgstr "Aide sur le greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Rectifier l'image..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 msgid "Download Rectified Images From Various Services" msgstr "Télécharge des images rectifiées depuis différents services" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 #, java-format msgid "WMS: {0}" @@ -12398,26 +13392,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 msgid "Custom WMS Link" msgstr "Lien WMS Personalisé" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" msgstr "Services de rectification supportés :" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" msgstr "Visiter la page d'accueil" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 msgid "WMS URL or Image ID:" msgstr "URL WMS ou i d’image :" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Add Rectified Image" msgstr "Ajouter l'Image rectifiée" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -12427,37 +13421,55 @@ "Veuillez réessayer." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "No valid WMS URL or id" msgstr "Pas d’URL WMS valide ou d’id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 msgid "Adjust WMS" msgstr "Ajuster WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust the position of the selected WMS layer" msgstr "Ajuster la position du calque WMS sélectionné" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +msgstr "Veuillez sélectionner le calque WMS à ajuster." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Select WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +msgstr "Sélectionnez le calque WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 msgid "Start adjusting" -msgstr "" +msgstr "Commencer à ajuster" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +msgid "There are currently no WMS layer to adjust." +msgstr "Il n'y a actuellement pas de calque WMS à ajuster." #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 -msgid "There are currently no WMS layer to adjust." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192 msgid "No layers to adjust" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +msgstr "Pas de calque à ajuster." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#, java-format +msgid "" +"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' " +"or a trailing '?'." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +msgid "" +"Warning: Fetching WMS tiles is likely to fail. Please check you preference " +"settings." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#, java-format +msgid "Warning: The complete URL is ''{0}''." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 #, java-format msgid "" @@ -12472,15 +13484,43 @@ msgstr "Téléchargement automatique" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:94 +#, java-format +msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#, fuzzy +msgid "(deactivated)" +msgstr "désigné" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#, java-format +msgid "" +"The base URL
''{0}''
for this WML layer does neither end with a " +"''&'' nor with a ''?''.
This is likely to lead to invalid WMS request. " +"You should check your
preference settings.
Do you want to fetch WMS " +"tiles anyway?" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +msgid "Yes, fetch images" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 +#, fuzzy +msgid "Invalid URL?" +msgstr "Date non valide" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -12489,37 +13529,37 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 msgid "Load WMS layer" msgstr "Charger la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -12528,54 +13568,66 @@ "attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 msgid "Open a blank WMS layer to load data from a file" msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "WMS Plugin Preferences" msgstr "Préférences du greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" "Modifier la liste des serveurs WMS affichée dans le menu du greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 msgid "Menu Name" msgstr "Nom du menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "WMS URL" msgstr "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "Menu Name (Default)" msgstr "Nom du menu (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 msgid "WMS URL (Default)" msgstr "URL de WMS (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Entrer un nom pour le menu et un URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 -msgid "Copy Default" -msgstr "Copier défaut" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#, fuzzy +msgid "Copy Selected Default(s)" +msgstr "Copier les valeurs par défaut" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 +#, fuzzy +msgid "Please select at least one row to copy." +msgstr "Veuillez sélectionner au moins un chemin." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 msgid "Downloader:" -msgstr "" +msgstr "Outil de téléchargement :" + +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 +#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 +#, fuzzy +msgid "WMS Files (*.wms)" +msgstr "fichiers TCX (*.tcx)" #. * @@ -12806,4 +13858,7 @@ "defined in routes.xml file in plugin directory" msgstr "" +"Permet de faire un rendu des routes (bus, chemins de randonnées, itinéraires " +"cyclables…). Les types de routes doivent être défini dans le fichier routes." +"xml, dans le dossier du greffon." #. Plugin routing @@ -12990,62 +14045,7 @@ #: build/trans_presets.java:120 build/trans_presets.java:140 #: build/trans_presets.java:177 build/trans_presets.java:197 -#: build/trans_presets.java:1545 build/trans_presets.java:3015 +#: build/trans_presets.java:1557 build/trans_presets.java:3143 msgid "Reference" msgstr "Référence" - -#. item "Streets/Motorway" text "Name" -#. item "Streets/Motorway Link" label "Edit Motorway Link" -#. -#. -#. -#. item "Streets/Trunk" text "Name" -#. item "Streets/Trunk Link" text "Reference" -#. -#. item "Streets/Primary" text "Name" -#. item "Streets/Primary Link" label "Edit Primary Link" -#. -#. -#. -#. item "Streets/Secondary" text "Name" -#. item "Streets/Tertiary" text "Name" -#. item "Streets/Unclassified" check "Embankment" -#. item "Streets/Residential" check "Embankment" -#. item "Streets/Living Street" check "Embankment" -#. item "Streets/Service" check "Embankment" -#. item "Streets/Road (Unknown Type)" check "Embankment" -#. item "Streets/Roundabout" check "Embankment" -#. item "Streets/Bridge" text "Name" -#. item "Streets/Tunnel" text "Name" -#. item "Ways/Construction" check "Embankment" -#. item "Ways/Bridleway" check "Embankment" -#. item "Ways/Cycleway" check "Embankment" -#. item "Ways/Footway" check "Embankment" -#. item "Ways/Pedestrian" check "Embankment" -#. item "Ways/Steps" check "Embankment" -#. item "Ways/Path" check "Embankment" -#. item "Water/Drain" text "Name" -#. item "Water/Stream" text "Name" -#. item "Water/Canal" text "Name" -#. item "Water/River" text "Name" -#. item "Railway/Bus Guideway" check "Embankment" -#: build/trans_presets.java:67 build/trans_presets.java:84 -#: build/trans_presets.java:103 build/trans_presets.java:122 -#: build/trans_presets.java:143 build/trans_presets.java:159 -#: build/trans_presets.java:180 build/trans_presets.java:200 -#: build/trans_presets.java:223 build/trans_presets.java:241 -#: build/trans_presets.java:259 build/trans_presets.java:278 -#: build/trans_presets.java:311 build/trans_presets.java:356 -#: build/trans_presets.java:371 build/trans_presets.java:386 -#: build/trans_presets.java:408 build/trans_presets.java:428 -#: build/trans_presets.java:448 build/trans_presets.java:467 -#: build/trans_presets.java:486 build/trans_presets.java:505 -#: build/trans_presets.java:525 build/trans_presets.java:546 -#: build/trans_presets.java:567 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:630 -#: build/trans_presets.java:659 build/trans_presets.java:1055 -#: build/trans_presets.java:1063 build/trans_presets.java:1071 -#: build/trans_presets.java:1081 build/trans_presets.java:1300 -msgid "Layer" -msgstr "Calque" #. item "Streets/Motorway" combo "Layer" @@ -13060,5 +14060,5 @@ #: build/trans_presets.java:104 build/trans_presets.java:123 #: build/trans_presets.java:144 build/trans_presets.java:160 -#: build/trans_presets.java:181 build/trans_presets.java:357 +#: build/trans_presets.java:181 build/trans_presets.java:358 msgid "Lanes" msgstr "Voies" @@ -13073,5 +14073,4 @@ #. item "Streets/Tertiary" combo "Layer" #. item "Streets/Unclassified" combo "Layer" -#. item "Streets/Road (Unknown Type)" combo "Layer" #. item "Streets/Bridge" combo "Layer" #. item "Streets/Tunnel" combo "Layer" @@ -13081,10 +14080,10 @@ #: build/trans_presets.java:182 build/trans_presets.java:201 #: build/trans_presets.java:224 build/trans_presets.java:280 -#: build/trans_presets.java:312 build/trans_presets.java:333 -#: build/trans_presets.java:372 build/trans_presets.java:387 -#: build/trans_presets.java:411 build/trans_presets.java:430 -#: build/trans_presets.java:450 build/trans_presets.java:469 -#: build/trans_presets.java:507 build/trans_presets.java:661 -#: build/trans_presets.java:1302 +#: build/trans_presets.java:313 build/trans_presets.java:334 +#: build/trans_presets.java:373 build/trans_presets.java:388 +#: build/trans_presets.java:412 build/trans_presets.java:431 +#: build/trans_presets.java:452 build/trans_presets.java:472 +#: build/trans_presets.java:510 build/trans_presets.java:666 +#: build/trans_presets.java:1307 msgid "Max. speed (km/h)" msgstr "Vitesse max (km/h)" @@ -13128,9 +14127,9 @@ #: build/trans_presets.java:254 build/trans_presets.java:273 #: build/trans_presets.java:293 build/trans_presets.java:306 -#: build/trans_presets.java:319 build/trans_presets.java:351 -#: build/trans_presets.java:403 build/trans_presets.java:423 -#: build/trans_presets.java:443 build/trans_presets.java:462 -#: build/trans_presets.java:481 build/trans_presets.java:500 -#: build/trans_presets.java:654 build/trans_presets.java:1295 +#: build/trans_presets.java:320 build/trans_presets.java:352 +#: build/trans_presets.java:404 build/trans_presets.java:424 +#: build/trans_presets.java:444 build/trans_presets.java:464 +#: build/trans_presets.java:484 build/trans_presets.java:503 +#: build/trans_presets.java:659 build/trans_presets.java:1300 msgid "Oneway" msgstr "Sens unique" @@ -13178,13 +14177,13 @@ #: build/trans_presets.java:219 build/trans_presets.java:237 #: build/trans_presets.java:255 build/trans_presets.java:274 -#: build/trans_presets.java:307 build/trans_presets.java:352 -#: build/trans_presets.java:361 build/trans_presets.java:404 -#: build/trans_presets.java:424 build/trans_presets.java:444 -#: build/trans_presets.java:463 build/trans_presets.java:482 -#: build/trans_presets.java:501 build/trans_presets.java:520 -#: build/trans_presets.java:541 build/trans_presets.java:562 -#: build/trans_presets.java:583 build/trans_presets.java:604 -#: build/trans_presets.java:625 build/trans_presets.java:655 -#: build/trans_presets.java:1296 build/trans_surveyor.java:12 +#: build/trans_presets.java:307 build/trans_presets.java:353 +#: build/trans_presets.java:362 build/trans_presets.java:405 +#: build/trans_presets.java:425 build/trans_presets.java:445 +#: build/trans_presets.java:465 build/trans_presets.java:485 +#: build/trans_presets.java:504 build/trans_presets.java:523 +#: build/trans_presets.java:544 build/trans_presets.java:565 +#: build/trans_presets.java:586 build/trans_presets.java:607 +#: build/trans_presets.java:628 build/trans_presets.java:660 +#: build/trans_presets.java:1301 build/trans_surveyor.java:12 msgid "Bridge" msgstr "Pont" @@ -13226,13 +14225,13 @@ #: build/trans_presets.java:220 build/trans_presets.java:238 #: build/trans_presets.java:256 build/trans_presets.java:275 -#: build/trans_presets.java:308 build/trans_presets.java:353 -#: build/trans_presets.java:377 build/trans_presets.java:405 -#: build/trans_presets.java:425 build/trans_presets.java:445 -#: build/trans_presets.java:464 build/trans_presets.java:483 -#: build/trans_presets.java:502 build/trans_presets.java:521 -#: build/trans_presets.java:542 build/trans_presets.java:563 -#: build/trans_presets.java:584 build/trans_presets.java:605 -#: build/trans_presets.java:626 build/trans_presets.java:656 -#: build/trans_presets.java:1297 +#: build/trans_presets.java:308 build/trans_presets.java:354 +#: build/trans_presets.java:378 build/trans_presets.java:406 +#: build/trans_presets.java:426 build/trans_presets.java:446 +#: build/trans_presets.java:466 build/trans_presets.java:486 +#: build/trans_presets.java:505 build/trans_presets.java:524 +#: build/trans_presets.java:545 build/trans_presets.java:566 +#: build/trans_presets.java:587 build/trans_presets.java:608 +#: build/trans_presets.java:629 build/trans_presets.java:661 +#: build/trans_presets.java:1302 msgid "Tunnel" msgstr "Tunnel" @@ -13272,12 +14271,12 @@ #: build/trans_presets.java:221 build/trans_presets.java:239 #: build/trans_presets.java:257 build/trans_presets.java:276 -#: build/trans_presets.java:309 build/trans_presets.java:354 -#: build/trans_presets.java:406 build/trans_presets.java:426 -#: build/trans_presets.java:446 build/trans_presets.java:465 -#: build/trans_presets.java:484 build/trans_presets.java:503 -#: build/trans_presets.java:522 build/trans_presets.java:543 -#: build/trans_presets.java:564 build/trans_presets.java:585 -#: build/trans_presets.java:606 build/trans_presets.java:627 -#: build/trans_presets.java:657 build/trans_presets.java:1298 +#: build/trans_presets.java:309 build/trans_presets.java:355 +#: build/trans_presets.java:407 build/trans_presets.java:427 +#: build/trans_presets.java:447 build/trans_presets.java:467 +#: build/trans_presets.java:487 build/trans_presets.java:506 +#: build/trans_presets.java:525 build/trans_presets.java:546 +#: build/trans_presets.java:567 build/trans_presets.java:588 +#: build/trans_presets.java:609 build/trans_presets.java:630 +#: build/trans_presets.java:662 build/trans_presets.java:1303 msgid "Cutting" msgstr "Découpe" @@ -13317,12 +14316,12 @@ #: build/trans_presets.java:222 build/trans_presets.java:240 #: build/trans_presets.java:258 build/trans_presets.java:277 -#: build/trans_presets.java:310 build/trans_presets.java:355 -#: build/trans_presets.java:407 build/trans_presets.java:427 -#: build/trans_presets.java:447 build/trans_presets.java:466 -#: build/trans_presets.java:485 build/trans_presets.java:504 -#: build/trans_presets.java:523 build/trans_presets.java:544 -#: build/trans_presets.java:565 build/trans_presets.java:586 -#: build/trans_presets.java:607 build/trans_presets.java:628 -#: build/trans_presets.java:658 build/trans_presets.java:1299 +#: build/trans_presets.java:310 build/trans_presets.java:356 +#: build/trans_presets.java:408 build/trans_presets.java:428 +#: build/trans_presets.java:448 build/trans_presets.java:468 +#: build/trans_presets.java:488 build/trans_presets.java:507 +#: build/trans_presets.java:526 build/trans_presets.java:547 +#: build/trans_presets.java:568 build/trans_presets.java:589 +#: build/trans_presets.java:610 build/trans_presets.java:631 +#: build/trans_presets.java:663 build/trans_presets.java:1304 msgid "Embankment" msgstr "Remblai" @@ -13478,17 +14477,17 @@ #: build/trans_presets.java:225 build/trans_presets.java:243 #: build/trans_presets.java:261 build/trans_presets.java:281 -#: build/trans_presets.java:313 build/trans_presets.java:358 -#: build/trans_presets.java:374 build/trans_presets.java:388 -#: build/trans_presets.java:412 build/trans_presets.java:431 -#: build/trans_presets.java:451 build/trans_presets.java:470 -#: build/trans_presets.java:488 build/trans_presets.java:508 -#: build/trans_presets.java:529 build/trans_presets.java:550 -#: build/trans_presets.java:571 build/trans_presets.java:592 -#: build/trans_presets.java:613 build/trans_presets.java:634 -#: build/trans_presets.java:662 build/trans_presets.java:675 -#: build/trans_presets.java:688 build/trans_presets.java:701 -#: build/trans_presets.java:714 build/trans_presets.java:727 -#: build/trans_presets.java:740 build/trans_presets.java:1303 -#: build/trans_presets.java:1486 build/trans_presets.java:1528 +#: build/trans_presets.java:314 build/trans_presets.java:359 +#: build/trans_presets.java:375 build/trans_presets.java:389 +#: build/trans_presets.java:413 build/trans_presets.java:432 +#: build/trans_presets.java:453 build/trans_presets.java:473 +#: build/trans_presets.java:491 build/trans_presets.java:511 +#: build/trans_presets.java:532 build/trans_presets.java:553 +#: build/trans_presets.java:574 build/trans_presets.java:595 +#: build/trans_presets.java:616 build/trans_presets.java:637 +#: build/trans_presets.java:667 build/trans_presets.java:680 +#: build/trans_presets.java:693 build/trans_presets.java:706 +#: build/trans_presets.java:719 build/trans_presets.java:732 +#: build/trans_presets.java:745 build/trans_presets.java:1308 +#: build/trans_presets.java:1498 build/trans_presets.java:1540 msgid "Width (meters)" msgstr "Largeur (mètres)" @@ -13515,4 +14514,5 @@ #. item "Streets/Service" combo "Layer" #. item "Streets/Parking Aisle" check "Oneway" +#. item "Streets/Road (Unknown Type)" combo "Layer" #. item "Ways/Construction" combo "Layer" #. item "Ways/Bridleway" combo "Layer" @@ -13531,11 +14531,12 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:566 build/trans_presets.java:587 -#: build/trans_presets.java:608 build/trans_presets.java:629 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:569 +#: build/trans_presets.java:590 build/trans_presets.java:611 +#: build/trans_presets.java:632 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "Surface" msgstr "Revêtement" @@ -13545,4 +14546,5 @@ #. item "Streets/Service" combo "Surface" #. item "Streets/Parking Aisle" combo "Surface" +#. item "Streets/Road (Unknown Type)" combo "Surface" #. item "Ways/Construction" combo "Surface" #. item "Ways/Bridleway" combo "Surface" @@ -13557,9 +14559,10 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "paved" msgstr "avec revêtement" @@ -13567,10 +14570,73 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "unpaved" msgstr "sans revêtement" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "asphalt" +msgstr "Châlet" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +msgid "concrete" +msgstr "béton" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "metal" +msgstr "Location" + +#. color heath +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 build/trans_style.java:3367 +msgid "wood" +msgstr "bois" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "paving_stones" +msgstr "parking_tickets" #. item "Ways/Track Grade 2" combo "Surface" @@ -13578,12 +14644,94 @@ #: build/trans_presets.java:242 build/trans_presets.java:260 #: build/trans_presets.java:279 build/trans_presets.java:294 -#: build/trans_presets.java:409 build/trans_presets.java:429 -#: build/trans_presets.java:449 build/trans_presets.java:468 -#: build/trans_presets.java:487 build/trans_presets.java:506 -#: build/trans_presets.java:524 build/trans_presets.java:545 -#: build/trans_presets.java:566 build/trans_presets.java:587 -#: build/trans_presets.java:660 build/trans_presets.java:1301 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:548 build/trans_presets.java:569 +#: build/trans_presets.java:590 build/trans_presets.java:665 +#: build/trans_presets.java:1306 msgid "cobblestone" msgstr "pavés" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "gravel" +msgstr "gravier" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "pebblestone" +msgstr "pavés" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "compacted" +msgstr "incomplet" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:665 +#: build/trans_presets.java:1306 +#, fuzzy +msgid "grass_paver" +msgstr "herbe" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "grass" +msgstr "herbe" + +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "sand" +msgstr "sable" + +#. item "Ways/Track Grade 4" combo "Surface" +#. item "Ways/Track Grade 5" combo "Surface" +#: build/trans_presets.java:242 build/trans_presets.java:260 +#: build/trans_presets.java:279 build/trans_presets.java:294 +#: build/trans_presets.java:312 build/trans_presets.java:410 +#: build/trans_presets.java:430 build/trans_presets.java:451 +#: build/trans_presets.java:471 build/trans_presets.java:490 +#: build/trans_presets.java:509 build/trans_presets.java:527 +#: build/trans_presets.java:569 build/trans_presets.java:590 +#: build/trans_presets.java:611 build/trans_presets.java:632 +#: build/trans_presets.java:665 build/trans_presets.java:1306 +msgid "ground" +msgstr "terre" #. item "Streets/Residential" text "Width (meters)" @@ -13664,20 +14812,20 @@ #. #. -#: build/trans_presets.java:317 +#: build/trans_presets.java:318 msgid "Road Restrictions" msgstr "Rue à accès restreint" #. item -#: build/trans_presets.java:318 +#: build/trans_presets.java:319 msgid "Edit Road Restrictions" msgstr "Éditer les restrictions d’une route" #. item "Streets/Road Restrictions" check "Oneway" -#: build/trans_presets.java:320 +#: build/trans_presets.java:321 msgid "Toll" msgstr "Péage" #. item "Streets/Road Restrictions" check "Toll" -#: build/trans_presets.java:321 +#: build/trans_presets.java:322 msgid "No exit (cul-de-sac)" msgstr "Sans issue (cul-de-sac)" @@ -13690,8 +14838,8 @@ #. item "Ways/Track Grade 4" combo "Layer" #. item "Ways/Track Grade 5" combo "Layer" -#: build/trans_presets.java:322 build/trans_presets.java:526 -#: build/trans_presets.java:547 build/trans_presets.java:568 -#: build/trans_presets.java:589 build/trans_presets.java:610 -#: build/trans_presets.java:631 +#: build/trans_presets.java:323 build/trans_presets.java:529 +#: build/trans_presets.java:550 build/trans_presets.java:571 +#: build/trans_presets.java:592 build/trans_presets.java:613 +#: build/trans_presets.java:634 msgid "Access" msgstr "Accès" @@ -13726,32 +14874,47 @@ #. item "Ways/Track Grade 5" combo "Motorcycle" #. item "Ways/Track Grade 5" combo "Motorcar" +#. item "Ways/Path" combo "Foot" +#. item "Ways/Path" combo "Bicycle" +#. item "Ways/Path" combo "Horse" +#. item "Ways/Path" combo "Ski" +#. item "Ways/Path" combo "Snowmobile" #. item "Ways/Path" combo "Motorcar" -#. item "Ways/Path" combo "Snowmobile" -#. item "Ways/Path" combo "Horse" -#. item "Ways/Path" combo "Bicycle" -#. item "Ways/Path" combo "Ski" -#. item "Ways/Path" combo "Foot" +#. item "Car/Parking" combo "Park and Ride" +#. item "Car/Parking" combo "Fee" #. item "Car/Parking" combo "Spaces for Disabled" +#. item "Car/Parking" combo "Spaces for Women" +#. item "Car/Parking" combo "Spaces for Parents" +#. item "Tourism/Information Terminal" combo "Fee" +#. item "Tourism/Audioguide" combo "Fee" #. item "Amenities/Toilets" combo "Fee" +#. item "Amenities/Hunting Stand" combo "Shelter" +#. item "Amenities/Hunting Stand" combo "Hide" +#. item "Amenities/Hunting Stand" combo "Lock" #. item "Health/Pharmacy" combo "Dispensing" -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 build/trans_presets.java:1387 -#: build/trans_presets.java:2328 build/trans_presets.java:2592 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 build/trans_presets.java:1393 +#: build/trans_presets.java:1394 build/trans_presets.java:1397 +#: build/trans_presets.java:1398 build/trans_presets.java:1399 +#: build/trans_presets.java:1763 build/trans_presets.java:1773 +#: build/trans_presets.java:2397 build/trans_presets.java:2439 +#: build/trans_presets.java:2440 build/trans_presets.java:2441 +#: build/trans_presets.java:2711 msgid "yes" msgstr "oui" @@ -13764,40 +14927,40 @@ #. #. -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:212 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:212 msgid "private" msgstr "privé" -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 msgid "designated" msgstr "désigné" @@ -13810,19 +14973,19 @@ #. #. -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:219 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:219 msgid "destination" msgstr "destination" @@ -13845,65 +15008,70 @@ #. #. -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_style.java:205 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_style.java:205 msgid "permissive" msgstr "permis par le propriétaire" -#: build/trans_presets.java:322 build/trans_presets.java:326 -#: build/trans_presets.java:329 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 +#: build/trans_presets.java:323 build/trans_presets.java:327 +#: build/trans_presets.java:330 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 msgid "agricultural" msgstr "véhicules agricoles" -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:331 -#: build/trans_presets.java:332 build/trans_presets.java:526 -#: build/trans_presets.java:527 build/trans_presets.java:528 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:568 -#: build/trans_presets.java:569 build/trans_presets.java:570 -#: build/trans_presets.java:589 build/trans_presets.java:590 -#: build/trans_presets.java:591 build/trans_presets.java:610 -#: build/trans_presets.java:611 build/trans_presets.java:612 -#: build/trans_presets.java:631 build/trans_presets.java:632 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:647 build/trans_presets.java:648 -#: build/trans_presets.java:649 build/trans_presets.java:650 -#: build/trans_presets.java:651 build/trans_presets.java:768 -#: build/trans_presets.java:783 build/trans_presets.java:1325 -#: build/trans_presets.java:1387 build/trans_presets.java:2328 -#: build/trans_presets.java:2592 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:649 +#: build/trans_presets.java:650 build/trans_presets.java:651 +#: build/trans_presets.java:652 build/trans_presets.java:653 +#: build/trans_presets.java:654 build/trans_presets.java:773 +#: build/trans_presets.java:788 build/trans_presets.java:1330 +#: build/trans_presets.java:1393 build/trans_presets.java:1394 +#: build/trans_presets.java:1397 build/trans_presets.java:1398 +#: build/trans_presets.java:1399 build/trans_presets.java:1763 +#: build/trans_presets.java:1773 build/trans_presets.java:2397 +#: build/trans_presets.java:2439 build/trans_presets.java:2440 +#: build/trans_presets.java:2441 build/trans_presets.java:2711 msgid "no" msgstr "non" -#: build/trans_presets.java:325 +#: build/trans_presets.java:326 msgid "Goods" msgstr "Biens" -#: build/trans_presets.java:326 +#: build/trans_presets.java:327 msgid "Heavy Goods Vehicles (hgv)" msgstr "Poids-lourds" @@ -13918,10 +15086,10 @@ #. item "Barriers/Bump Gate" check "Bicycle" #. item "Barriers/Sally Port" check "Bicycle" -#: build/trans_presets.java:327 build/trans_presets.java:648 -#: build/trans_presets.java:853 build/trans_presets.java:886 -#: build/trans_presets.java:908 build/trans_presets.java:945 -#: build/trans_presets.java:958 build/trans_presets.java:970 -#: build/trans_presets.java:982 build/trans_presets.java:994 -#: build/trans_presets.java:1034 +#: build/trans_presets.java:328 build/trans_presets.java:651 +#: build/trans_presets.java:858 build/trans_presets.java:891 +#: build/trans_presets.java:913 build/trans_presets.java:950 +#: build/trans_presets.java:963 build/trans_presets.java:975 +#: build/trans_presets.java:987 build/trans_presets.java:999 +#: build/trans_presets.java:1039 msgid "Horse" msgstr "Cheval" @@ -13937,17 +15105,16 @@ #. item "Barriers/Bump Gate" check "Horse" #. item "Barriers/Sally Port" check "Horse" -#: build/trans_presets.java:328 build/trans_presets.java:527 -#: build/trans_presets.java:548 build/trans_presets.java:569 -#: build/trans_presets.java:590 build/trans_presets.java:611 -#: build/trans_presets.java:632 build/trans_presets.java:854 -#: build/trans_presets.java:872 build/trans_presets.java:887 -#: build/trans_presets.java:909 build/trans_presets.java:946 -#: build/trans_presets.java:959 build/trans_presets.java:971 -#: build/trans_presets.java:983 build/trans_presets.java:995 -#: build/trans_presets.java:1035 +#: build/trans_presets.java:329 build/trans_presets.java:530 +#: build/trans_presets.java:551 build/trans_presets.java:572 +#: build/trans_presets.java:593 build/trans_presets.java:614 +#: build/trans_presets.java:635 build/trans_presets.java:859 +#: build/trans_presets.java:877 build/trans_presets.java:892 +#: build/trans_presets.java:914 build/trans_presets.java:951 +#: build/trans_presets.java:964 build/trans_presets.java:976 +#: build/trans_presets.java:988 build/trans_presets.java:1000 +#: build/trans_presets.java:1040 msgid "Motorcycle" msgstr "Motos" -#. item "Ways/Path" label "Type" #. item "Barriers/Cattle Grid" check "Motorcycle" #. item "Barriers/Spikes" check "Motorcycle" @@ -13959,30 +15126,30 @@ #. item "Barriers/Bump Gate" check "Motorcycle" #. item "Barriers/Sally Port" check "Motorcycle" -#: build/trans_presets.java:329 build/trans_presets.java:528 -#: build/trans_presets.java:549 build/trans_presets.java:570 -#: build/trans_presets.java:591 build/trans_presets.java:612 -#: build/trans_presets.java:633 build/trans_presets.java:646 -#: build/trans_presets.java:873 build/trans_presets.java:888 -#: build/trans_presets.java:910 build/trans_presets.java:947 -#: build/trans_presets.java:960 build/trans_presets.java:972 -#: build/trans_presets.java:984 build/trans_presets.java:996 -#: build/trans_presets.java:1036 +#: build/trans_presets.java:330 build/trans_presets.java:531 +#: build/trans_presets.java:552 build/trans_presets.java:573 +#: build/trans_presets.java:594 build/trans_presets.java:615 +#: build/trans_presets.java:636 build/trans_presets.java:654 +#: build/trans_presets.java:878 build/trans_presets.java:893 +#: build/trans_presets.java:915 build/trans_presets.java:952 +#: build/trans_presets.java:965 build/trans_presets.java:977 +#: build/trans_presets.java:989 build/trans_presets.java:1001 +#: build/trans_presets.java:1041 msgid "Motorcar" msgstr "Voitures" -#: build/trans_presets.java:330 +#: build/trans_presets.java:331 msgid "Public Service Vehicles (psv)" msgstr "Véhicules de service public" -#: build/trans_presets.java:331 +#: build/trans_presets.java:332 msgid "Motorboat" msgstr "Bateaux à moteur" -#: build/trans_presets.java:332 +#: build/trans_presets.java:333 msgid "Boat" msgstr "Bateaux" #. item "Streets/Road Restrictions" text "Max. speed (km/h)" -#: build/trans_presets.java:334 +#: build/trans_presets.java:335 msgid "Min. speed (km/h)" msgstr "Vitesse min (km/h)" @@ -13990,25 +15157,25 @@ #. item "Streets/Road Restrictions" text "Min. speed (km/h)" #. item "Streets/Bridge" text "Max. speed (km/h)" -#: build/trans_presets.java:335 build/trans_presets.java:373 +#: build/trans_presets.java:336 build/trans_presets.java:374 msgid "Max. weight (tonnes)" msgstr "Poids max (tonnes)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" -#: build/trans_presets.java:336 +#: build/trans_presets.java:337 msgid "Max. Height (meters)" msgstr "Hauteur max. (mètres)" #. item "Streets/Road Restrictions" text "Max. Height (meters)" -#: build/trans_presets.java:337 +#: build/trans_presets.java:338 msgid "Max. Width (meters)" msgstr "Largeur max. (mètres)" #. item "Streets/Road Restrictions" text "Max. Width (meters)" -#: build/trans_presets.java:338 +#: build/trans_presets.java:339 msgid "Max. Length (meters)" msgstr "Longueur max. (mètres)" #. item "Streets/Road Restrictions" text "Max. Length (meters)" -#: build/trans_presets.java:340 +#: build/trans_presets.java:341 msgid "Roundabout" msgstr "Rond-point" @@ -14019,5 +15186,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout" #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" /> -#: build/trans_presets.java:345 +#: build/trans_presets.java:346 msgid "Edit Junction" msgstr "Éditer une jonction" @@ -14033,5 +15200,5 @@ #. #. item "Water/Wetland" text "Name" -#. item "Car/Parking" text "Capacity" +#. item "Car/Parking" text "Reference number" #. item "Man Made/Power Generator" label "Edit Power Generator" #. @@ -14039,9 +15206,9 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: build/trans_presets.java:348 build/trans_presets.java:645 -#: build/trans_presets.java:783 build/trans_presets.java:1130 -#: build/trans_presets.java:1386 build/trans_presets.java:2284 -#: build/trans_presets.java:2770 build/trans_presets.java:2780 -#: build/trans_presets.java:2789 +#: build/trans_presets.java:349 build/trans_presets.java:648 +#: build/trans_presets.java:788 build/trans_presets.java:1135 +#: build/trans_presets.java:1392 build/trans_presets.java:2353 +#: build/trans_presets.java:2898 build/trans_presets.java:2908 +#: build/trans_presets.java:2917 msgid "Type" msgstr "Type" @@ -14061,10 +15228,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:547 +#: build/trans_presets.java:349 build/trans_style.java:547 #: build/trans_style.java:555 msgid "motorway" msgstr "motorway" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "motorway_link" msgstr "motorway_link" @@ -14086,10 +15253,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:563 +#: build/trans_presets.java:349 build/trans_style.java:563 #: build/trans_style.java:571 msgid "trunk" msgstr "voie rapide" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "trunk_link" msgstr "trunk_link" @@ -14111,10 +15278,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:579 +#: build/trans_presets.java:349 build/trans_style.java:579 #: build/trans_style.java:587 msgid "primary" msgstr "primary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "primary_link" msgstr "primary_link" @@ -14136,5 +15303,5 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:595 +#: build/trans_presets.java:349 build/trans_style.java:595 #: build/trans_style.java:603 msgid "secondary" @@ -14149,9 +15316,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:611 +#: build/trans_presets.java:349 build/trans_style.java:611 msgid "tertiary" msgstr "tertiary" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "unclassified" msgstr "unclassified" @@ -14165,9 +15332,9 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:3192 +#: build/trans_presets.java:349 build/trans_style.java:3143 msgid "residential" msgstr "residential" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "living_street" msgstr "living_street" @@ -14197,10 +15364,10 @@ #. #. -#: build/trans_presets.java:348 build/trans_style.java:667 -#: build/trans_style.java:4285 +#: build/trans_presets.java:349 build/trans_style.java:667 +#: build/trans_style.java:4244 msgid "service" msgstr "service" -#: build/trans_presets.java:348 +#: build/trans_presets.java:349 msgid "bus_guideway" msgstr "bus_guideway" @@ -14230,6 +15397,6 @@ #. #. color construction -#: build/trans_presets.java:348 build/trans_style.java:877 -#: build/trans_style.java:3257 build/trans_style.java:3258 +#: build/trans_presets.java:349 build/trans_style.java:877 +#: build/trans_style.java:3208 build/trans_style.java:3209 msgid "construction" msgstr "construction" @@ -14240,10 +15407,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" /> -#: build/trans_presets.java:366 +#: build/trans_presets.java:367 msgid "Edit Bridge" msgstr "Éditer un pont" #. item -#: build/trans_presets.java:378 +#: build/trans_presets.java:379 msgid "Edit Tunnel" msgstr "Modifier un tunnel" @@ -14251,19 +15418,19 @@ #. item "Streets/Tunnel" text "Width (meters)" #. -#: build/trans_presets.java:392 +#: build/trans_presets.java:393 msgid "Ways" msgstr "Chemins" #. group "Ways" -#: build/trans_presets.java:393 +#: build/trans_presets.java:394 msgid "Construction" msgstr "Construction" #. item -#: build/trans_presets.java:394 +#: build/trans_presets.java:395 msgid "Edit Highway Under Construction" msgstr "Éditer une route en construction" -#: build/trans_presets.java:410 +#: build/trans_presets.java:411 msgid "Junction" msgstr "Jonction" @@ -14279,5 +15446,5 @@ #. #. -#: build/trans_presets.java:410 build/trans_style.java:895 +#: build/trans_presets.java:411 build/trans_style.java:895 msgid "roundabout" msgstr "roundabout" @@ -14286,5 +15453,5 @@ #. #. -#: build/trans_presets.java:416 +#: build/trans_presets.java:417 msgid "Bridleway" msgstr "Chemin équestre" @@ -14292,5 +15459,5 @@ #. item #. -#: build/trans_presets.java:418 +#: build/trans_presets.java:419 msgid "Edit Bridleway" msgstr "Éditer un chemin équestre" @@ -14298,5 +15465,5 @@ #. item "Ways/Bridleway" text "Width (meters)" #. -#: build/trans_presets.java:434 +#: build/trans_presets.java:435 msgid "Cycleway" msgstr "Voie cyclable" @@ -14306,11 +15473,17 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" /> -#: build/trans_presets.java:438 +#: build/trans_presets.java:439 msgid "Edit Cycleway" msgstr "Éditer une voie cyclable" +#. item "Ways/Cycleway" check "Embankment" +#: build/trans_presets.java:449 +#, fuzzy +msgid "Pedestrians" +msgstr "Rue Piétonne" + #. item "Ways/Cycleway" text "Width (meters)" #. -#: build/trans_presets.java:454 +#: build/trans_presets.java:456 msgid "Footway" msgstr "Voie piétonnière" @@ -14319,11 +15492,17 @@ #. -#: build/trans_presets.java:457 +#: build/trans_presets.java:459 msgid "Edit Footway" msgstr "Éditer un chemin pour piétons" +#. item "Ways/Footway" check "Embankment" +#: build/trans_presets.java:469 +#, fuzzy +msgid "Bikes" +msgstr "Pointes" + #. item "Ways/Footway" text "Width (meters)" #. -#: build/trans_presets.java:473 +#: build/trans_presets.java:476 msgid "Pedestrian" msgstr "Rue Piétonne" @@ -14332,5 +15511,5 @@ #. -#: build/trans_presets.java:476 +#: build/trans_presets.java:479 msgid "Edit Pedestrian Street" msgstr "Éditer une rue piétonne" @@ -14338,5 +15517,5 @@ #. item "Ways/Pedestrian" text "Width (meters)" #. -#: build/trans_presets.java:491 +#: build/trans_presets.java:494 msgid "Steps" msgstr "Escaliers" @@ -14346,5 +15525,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" /> -#: build/trans_presets.java:495 +#: build/trans_presets.java:498 msgid "Edit Flight of Steps" msgstr "Éditer des escaliers" @@ -14353,5 +15532,5 @@ #. #. -#: build/trans_presets.java:512 +#: build/trans_presets.java:515 msgid "Track" msgstr "Piste" @@ -14360,39 +15539,11 @@ #. -#: build/trans_presets.java:515 +#: build/trans_presets.java:518 msgid "Edit Track" msgstr "Éditer une route carrossable sans revêtement" -#: build/trans_presets.java:524 build/trans_presets.java:545 -msgid "concrete" -msgstr "béton" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 -msgid "gravel" -msgstr "gravier" - -#. item "Ways/Track Grade 4" combo "Surface" -#. item "Ways/Track Grade 5" combo "Surface" -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "ground" -msgstr "terre" - -#: build/trans_presets.java:524 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "grass" -msgstr "herbe" - -#: build/trans_presets.java:524 build/trans_presets.java:566 -#: build/trans_presets.java:587 build/trans_presets.java:608 -#: build/trans_presets.java:629 -msgid "sand" -msgstr "sable" - #. item "Ways/Track" text "Width (meters)" #. -#: build/trans_presets.java:532 +#: build/trans_presets.java:535 msgid "Track Grade 1" msgstr "Piste grade 1" @@ -14401,5 +15552,5 @@ #. -#: build/trans_presets.java:535 +#: build/trans_presets.java:538 msgid "Edit Track of grade 1" msgstr "Éditer une piste grade 1" @@ -14407,5 +15558,5 @@ #. item "Ways/Track Grade 1" text "Width (meters)" #. -#: build/trans_presets.java:553 +#: build/trans_presets.java:556 msgid "Track Grade 2" msgstr "Piste grade 2" @@ -14414,5 +15565,5 @@ #. -#: build/trans_presets.java:556 +#: build/trans_presets.java:559 msgid "Edit Track of grade 2" msgstr "Éditer une piste grade 2" @@ -14420,5 +15571,5 @@ #. item "Ways/Track Grade 2" text "Width (meters)" #. -#: build/trans_presets.java:574 +#: build/trans_presets.java:577 msgid "Track Grade 3" msgstr "Piste grade 3" @@ -14427,5 +15578,5 @@ #. -#: build/trans_presets.java:577 +#: build/trans_presets.java:580 msgid "Edit Track of grade 3" msgstr "Éditer une piste grade 3" @@ -14433,5 +15584,5 @@ #. item "Ways/Track Grade 3" text "Width (meters)" #. -#: build/trans_presets.java:595 +#: build/trans_presets.java:598 msgid "Track Grade 4" msgstr "Piste grade 4" @@ -14440,5 +15591,5 @@ #. -#: build/trans_presets.java:598 +#: build/trans_presets.java:601 msgid "Edit Track of grade 4" msgstr "Éditer une piste grade 4" @@ -14446,5 +15597,5 @@ #. item "Ways/Track Grade 4" text "Width (meters)" #. -#: build/trans_presets.java:616 +#: build/trans_presets.java:619 msgid "Track Grade 5" msgstr "Piste grade 5" @@ -14453,5 +15604,5 @@ #. -#: build/trans_presets.java:619 +#: build/trans_presets.java:622 msgid "Edit Track of grade 5" msgstr "Éditer une piste grade 5" @@ -14460,5 +15611,5 @@ #. #. -#: build/trans_presets.java:638 +#: build/trans_presets.java:641 msgid "Path" msgstr "Chemin partagé" @@ -14467,19 +15618,22 @@ #. -#: build/trans_presets.java:641 +#: build/trans_presets.java:644 msgid "Edit Path" msgstr "Editer le chemin" -#: build/trans_presets.java:647 +#: build/trans_presets.java:652 +msgid "Ski" +msgstr "Ski" + +#: build/trans_presets.java:653 msgid "Snowmobile" msgstr "Motoneige" -#: build/trans_presets.java:650 -msgid "Ski" -msgstr "Ski" - #. item "Ways/Path" text "Width (meters)" #. -#: build/trans_presets.java:665 +#. item "Tourism/Map" label "Routes shown for:" +#. item "Tourism/Guidepost" label "Routes shown for:" +#: build/trans_presets.java:670 build/trans_presets.java:1725 +#: build/trans_presets.java:1748 msgid "Hiking" msgstr "Chemin de randonnée" @@ -14489,5 +15643,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:669 +#: build/trans_presets.java:674 msgid "Edit Hiking" msgstr "Éditer un chemin de randonnée" @@ -14495,5 +15649,5 @@ #. item "Ways/Hiking" text "Width (meters)" #. -#: build/trans_presets.java:678 +#: build/trans_presets.java:683 msgid "Mountain Hiking" msgstr "Chemin de randonnée en montagne" @@ -14503,5 +15657,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:682 +#: build/trans_presets.java:687 msgid "Edit Mountain Hiking" msgstr "Éditer un chemin de randonnée en montagne" @@ -14509,5 +15663,5 @@ #. item "Ways/Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:691 +#: build/trans_presets.java:696 msgid "Demanding Mountain Hiking" msgstr "Chemin de randonnée en montagne exigeant" @@ -14517,5 +15671,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:695 +#: build/trans_presets.java:700 msgid "Edit Demanding Mountain Hiking" msgstr "Éditer un chemin de randonnée en montagne exigeant" @@ -14523,5 +15677,5 @@ #. item "Ways/Demanding Mountain Hiking" text "Width (meters)" #. -#: build/trans_presets.java:704 +#: build/trans_presets.java:709 msgid "Alpine Hiking" msgstr "Chemin de randonnée alpin" @@ -14531,5 +15685,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:708 +#: build/trans_presets.java:713 msgid "Edit Alpine Hiking" msgstr "Éditer un chemin de randonnée alpin" @@ -14537,5 +15691,5 @@ #. item "Ways/Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:717 +#: build/trans_presets.java:722 msgid "Demanding Alpine Hiking" msgstr "Chemin de randonnée alpin exigeant" @@ -14545,5 +15699,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:721 +#: build/trans_presets.java:726 msgid "Edit Demanding Alpine Hiking" msgstr "Éditer un chemin de randonnée alpin exigeant" @@ -14551,5 +15705,5 @@ #. item "Ways/Demanding Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:730 +#: build/trans_presets.java:735 msgid "Difficult Alpine Hiking" msgstr "Chemin de randonnée alpin difficile" @@ -14559,5 +15713,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" /> -#: build/trans_presets.java:734 +#: build/trans_presets.java:739 msgid "Edit Difficult Alpine Hiking" msgstr "Éditer un chemin de randonnée alpin difficile" @@ -14565,10 +15719,10 @@ #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" #. -#: build/trans_presets.java:744 +#: build/trans_presets.java:749 msgid "Waypoints" msgstr "Balises" #. group "Waypoints" -#: build/trans_presets.java:745 +#: build/trans_presets.java:750 msgid "Motorway Junction" msgstr "Jonction autoroutière" @@ -14576,15 +15730,15 @@ #. item #. -#: build/trans_presets.java:747 +#: build/trans_presets.java:752 msgid "Edit Motorway Junction" msgstr "Éditer une jonction autoroutière" #. item "Waypoints/Motorway Junction" text "Name" -#: build/trans_presets.java:751 +#: build/trans_presets.java:756 msgid "Number" msgstr "Numéro" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:753 +#: build/trans_presets.java:758 msgid "Services" msgstr "Aire de repos" @@ -14592,5 +15746,5 @@ #. item #. -#: build/trans_presets.java:755 +#: build/trans_presets.java:760 msgid "Edit Service Station" msgstr "Éditer une aire de repos" @@ -14604,4 +15758,6 @@ #. item "Car/Rental" text "Name" #. item "Car/Sharing" text "Name" +#. item "Tourism/Information Terminal" text "Closer description" +#. item "Tourism/Audioguide" text "Closer description" #. item "Man Made/Power Station" label "Edit Power Station" #. @@ -14621,18 +15777,20 @@ #. item "Amenities/Baby Hatch" label "Edit Baby Hatch" #. +#. item "Cash/Bank" text "Name" #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine" #. #. item "Health/Emergency Access Point" text "Point Name" #. item "Relations/Route" text "Network" -#: build/trans_presets.java:760 build/trans_presets.java:897 -#: build/trans_presets.java:1377 build/trans_presets.java:1394 -#: build/trans_presets.java:1401 build/trans_presets.java:1407 -#: build/trans_presets.java:1415 build/trans_presets.java:1422 -#: build/trans_presets.java:2292 build/trans_presets.java:2299 -#: build/trans_presets.java:2315 build/trans_presets.java:2326 -#: build/trans_presets.java:2334 build/trans_presets.java:2341 -#: build/trans_presets.java:2391 build/trans_presets.java:2418 -#: build/trans_presets.java:2573 build/trans_presets.java:2609 -#: build/trans_presets.java:3020 +#: build/trans_presets.java:765 build/trans_presets.java:902 +#: build/trans_presets.java:1382 build/trans_presets.java:1406 +#: build/trans_presets.java:1413 build/trans_presets.java:1419 +#: build/trans_presets.java:1427 build/trans_presets.java:1434 +#: build/trans_presets.java:1761 build/trans_presets.java:1771 +#: build/trans_presets.java:2361 build/trans_presets.java:2368 +#: build/trans_presets.java:2384 build/trans_presets.java:2395 +#: build/trans_presets.java:2403 build/trans_presets.java:2410 +#: build/trans_presets.java:2461 build/trans_presets.java:2509 +#: build/trans_presets.java:2675 build/trans_presets.java:2690 +#: build/trans_presets.java:2729 build/trans_presets.java:3148 msgid "Operator" msgstr "Compagnie" @@ -14641,5 +15799,5 @@ #. #. -#: build/trans_presets.java:764 +#: build/trans_presets.java:769 msgid "Traffic Signal" msgstr "Feux tricolores" @@ -14649,5 +15807,5 @@ #. #. -#: build/trans_presets.java:768 +#: build/trans_presets.java:773 msgid "Pedestrian crossing type" msgstr "Passage piéton" @@ -14656,27 +15814,27 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" #. item "Railway/Crossing" combo "Crossing type" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "uncontrolled" msgstr "non contrôlé" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "traffic_signals" msgstr "feux tricolores" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "island" msgstr "île" -#: build/trans_presets.java:768 build/trans_presets.java:783 -#: build/trans_presets.java:1325 +#: build/trans_presets.java:773 build/trans_presets.java:788 +#: build/trans_presets.java:1330 msgid "unmarked" msgstr "unmarked" #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle" -#: build/trans_presets.java:769 build/trans_presets.java:785 -#: build/trans_presets.java:1326 +#: build/trans_presets.java:774 build/trans_presets.java:790 +#: build/trans_presets.java:1331 msgid "Cross on horseback" msgstr "Traversée à cheval" @@ -14684,6 +15842,6 @@ #. item "Waypoints/Traffic Signal" check "Cross on horseback" #. item "Railway/Crossing" check "Cross on horseback" -#: build/trans_presets.java:770 build/trans_presets.java:784 -#: build/trans_presets.java:1327 +#: build/trans_presets.java:775 build/trans_presets.java:789 +#: build/trans_presets.java:1332 msgid "Cross by bicycle" msgstr "Traversée à vélo" @@ -14692,11 +15850,11 @@ #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback" #. item "Railway/Crossing" check "Cross by bicycle" -#: build/trans_presets.java:771 build/trans_presets.java:786 -#: build/trans_presets.java:1328 +#: build/trans_presets.java:776 build/trans_presets.java:791 +#: build/trans_presets.java:1333 msgid "Crossing attendant" msgstr "Aide à la traversée (personne)" #. item "Waypoints/Traffic Signal" check "Crossing attendant" -#: build/trans_presets.java:772 +#: build/trans_presets.java:777 msgid "Crossing type name (UK)" msgstr "Nom du tpe de passage (UK)" @@ -14704,30 +15862,30 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "zebra" msgstr "zebra" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pelican" msgstr "pélican" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "toucan" msgstr "toucan" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "puffin" msgstr "puffin" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "pegasus" msgstr "pégase" -#: build/trans_presets.java:772 build/trans_presets.java:787 +#: build/trans_presets.java:777 build/trans_presets.java:792 msgid "tiger" msgstr "tigre" #. -#: build/trans_presets.java:775 +#: build/trans_presets.java:780 msgid "Stop" msgstr "Stop" @@ -14735,5 +15893,5 @@ #. item #. -#: build/trans_presets.java:778 +#: build/trans_presets.java:783 msgid "Pedestrian Crossing" msgstr "Passage piéton" @@ -14742,14 +15900,14 @@ #. -#: build/trans_presets.java:781 +#: build/trans_presets.java:786 msgid "Edit Crossing" msgstr "Modifier passage piéton sur voie ferrée" #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" -#: build/trans_presets.java:787 +#: build/trans_presets.java:792 msgid "Type name (UK)" msgstr "Type de nom (UK)" -#: build/trans_presets.java:789 +#: build/trans_presets.java:794 msgid "Mini-roundabout" msgstr "Mini-rond-point" @@ -14760,14 +15918,14 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" /> #. -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "Direction" msgstr "Direction" #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:794 +#: build/trans_presets.java:799 msgid "clockwise" msgstr "sens horaire" -#: build/trans_presets.java:796 +#: build/trans_presets.java:801 msgid "Turning Circle" msgstr "Petit élargissement pour demi-tour" @@ -14777,20 +15935,20 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" /> #. -#: build/trans_presets.java:801 +#: build/trans_presets.java:806 msgid "City Limit" msgstr "Limite de ville" #. item -#: build/trans_presets.java:802 +#: build/trans_presets.java:807 msgid "Edit City Limit Sign" msgstr "Éditer un signe de limite de ville" #. item "Waypoints/City Limit" text "Name" -#: build/trans_presets.java:807 +#: build/trans_presets.java:812 msgid "Second Name" msgstr "Nom secondaire" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:809 +#: build/trans_presets.java:814 msgid "Speed Camera" msgstr "Radar automatique" @@ -14798,5 +15956,5 @@ #. item #. -#: build/trans_presets.java:812 +#: build/trans_presets.java:817 msgid "Emergency Phone" msgstr "Téléphone d'urgence" @@ -14804,5 +15962,5 @@ #. item #. -#: build/trans_presets.java:815 +#: build/trans_presets.java:820 msgid "Incline" msgstr "Descente dangereuse" @@ -14810,5 +15968,5 @@ #. item #. -#: build/trans_presets.java:818 +#: build/trans_presets.java:823 msgid "Incline Steep" msgstr "Descente très dangereuse" @@ -14817,10 +15975,10 @@ #. #. -#: build/trans_presets.java:822 +#: build/trans_presets.java:827 msgid "Ford" msgstr "Gué" #. item -#: build/trans_presets.java:823 +#: build/trans_presets.java:828 msgid "Edit Ford" msgstr "Modifier un gué" @@ -14828,5 +15986,5 @@ #. item "Waypoints/Ford" text "Name" #. -#: build/trans_presets.java:830 +#: build/trans_presets.java:835 msgid "Mountain Pass" msgstr "Col de montagne" @@ -14834,5 +15992,5 @@ #. item #. -#: build/trans_presets.java:832 +#: build/trans_presets.java:837 msgid "Edit Mountain Pass" msgstr "Éditer un col de montagne" @@ -14840,11 +15998,11 @@ #. item "Waypoints/Mountain Pass" text "Name" #. item "Accomodation/Alpine Hut" text "Name" -#. item "Tourism/Guidepost (Hiking)" text "Name" +#. item "Tourism/Guidepost" text "Name" #. item "Places/Peak" text "Name" #. item "Places/Glacier" text "Name" #. item "Places/Volcano" text "Name" -#: build/trans_presets.java:837 build/trans_presets.java:1588 -#: build/trans_presets.java:1713 build/trans_presets.java:2714 -#: build/trans_presets.java:2721 build/trans_presets.java:2728 +#: build/trans_presets.java:842 build/trans_presets.java:1600 +#: build/trans_presets.java:1745 build/trans_presets.java:2842 +#: build/trans_presets.java:2849 build/trans_presets.java:2856 msgid "Elevation" msgstr "Altitude" @@ -14852,5 +16010,5 @@ #. item "Waypoints/Mountain Pass" text "Elevation" #. -#: build/trans_presets.java:841 +#: build/trans_presets.java:846 msgid "Barriers" msgstr "Barrières" @@ -14858,5 +16016,5 @@ #. group "Barriers" #. -#: build/trans_presets.java:844 +#: build/trans_presets.java:849 msgid "Bollard" msgstr "Plot" @@ -14864,5 +16022,5 @@ #. item #. -#: build/trans_presets.java:846 +#: build/trans_presets.java:851 msgid "Edit Bollard" msgstr "Modifier une bitte d'amarrage" @@ -14907,16 +16065,16 @@ #. #. -#: build/trans_presets.java:849 build/trans_presets.java:868 -#: build/trans_presets.java:882 build/trans_presets.java:904 -#: build/trans_presets.java:941 build/trans_presets.java:954 -#: build/trans_presets.java:966 build/trans_presets.java:978 -#: build/trans_presets.java:990 build/trans_presets.java:1002 -#: build/trans_presets.java:1012 build/trans_presets.java:1021 -#: build/trans_presets.java:1030 +#: build/trans_presets.java:854 build/trans_presets.java:873 +#: build/trans_presets.java:887 build/trans_presets.java:909 +#: build/trans_presets.java:946 build/trans_presets.java:959 +#: build/trans_presets.java:971 build/trans_presets.java:983 +#: build/trans_presets.java:995 build/trans_presets.java:1007 +#: build/trans_presets.java:1017 build/trans_presets.java:1026 +#: build/trans_presets.java:1035 msgid "Allowed traffic:" msgstr "Trafic autorisé:" #. item "Barriers/Bollard" check "Motorcycle" -#: build/trans_presets.java:856 +#: build/trans_presets.java:861 msgid "Cycle Barrier" msgstr "Barrière pour cycles" @@ -14925,5 +16083,5 @@ #. #. -#: build/trans_presets.java:860 +#: build/trans_presets.java:865 msgid "Block" msgstr "Ruines" @@ -14931,5 +16089,5 @@ #. item #. -#: build/trans_presets.java:863 +#: build/trans_presets.java:868 msgid "Cattle Grid" msgstr "Grille dans le sol" @@ -14937,10 +16095,10 @@ #. item #. -#: build/trans_presets.java:865 +#: build/trans_presets.java:870 msgid "Edit Cattle Grid" msgstr "Modifier une grille dans le sol" #. item "Barriers/Cattle Grid" check "Motorcar" -#: build/trans_presets.java:875 +#: build/trans_presets.java:880 msgid "Bus Trap" msgstr "Entrée de voie de bus (Allemagne)" @@ -14948,15 +16106,15 @@ #. item #. -#: build/trans_presets.java:878 +#: build/trans_presets.java:883 msgid "Spikes" msgstr "Pointes" #. item -#: build/trans_presets.java:879 +#: build/trans_presets.java:884 msgid "Edit Spikes" msgstr "Modifier pointes" #. item "Barriers/Spikes" check "Motorcar" -#: build/trans_presets.java:890 +#: build/trans_presets.java:895 msgid "Toll Booth" msgstr "Péage" @@ -14964,5 +16122,5 @@ #. item #. -#: build/trans_presets.java:892 +#: build/trans_presets.java:897 msgid "Edit Toll Booth" msgstr "Éditer un péage" @@ -14970,10 +16128,10 @@ #. item "Barriers/Toll Booth" text "Operator" #. -#: build/trans_presets.java:900 +#: build/trans_presets.java:905 msgid "Border Control" msgstr "Douane" #. item -#: build/trans_presets.java:901 +#: build/trans_presets.java:906 msgid "Edit Border Control" msgstr "Modifier douane" @@ -14983,5 +16141,5 @@ #. #. -#: build/trans_presets.java:915 +#: build/trans_presets.java:920 msgid "Hedge" msgstr "Haie" @@ -14990,5 +16148,5 @@ #. #. -#: build/trans_presets.java:919 +#: build/trans_presets.java:924 msgid "Fence" msgstr "Barrière" @@ -14997,5 +16155,5 @@ #. #. -#: build/trans_presets.java:923 +#: build/trans_presets.java:928 msgid "Wall" msgstr "Mur" @@ -15003,5 +16161,5 @@ #. item #. -#: build/trans_presets.java:926 +#: build/trans_presets.java:931 msgid "City Wall" msgstr "Rempart" @@ -15010,5 +16168,5 @@ #. #. -#: build/trans_presets.java:930 +#: build/trans_presets.java:935 msgid "Retaining Wall" msgstr "Mur de soutènement" @@ -15020,15 +16178,15 @@ #. #. -#: build/trans_presets.java:937 +#: build/trans_presets.java:942 msgid "Entrance" msgstr "Entrée" #. item -#: build/trans_presets.java:938 +#: build/trans_presets.java:943 msgid "Edit Entrance" msgstr "Editez une entrée" #. item "Barriers/Entrance" check "Motorcar" -#: build/trans_presets.java:949 +#: build/trans_presets.java:954 msgid "Gate" msgstr "Porte" @@ -15036,50 +16194,50 @@ #. item #. -#: build/trans_presets.java:951 +#: build/trans_presets.java:956 msgid "Edit Gate" msgstr "Editer une porte" #. item "Barriers/Gate" check "Motorcar" -#: build/trans_presets.java:962 +#: build/trans_presets.java:967 msgid "Lift Gate" msgstr "Barrière" #. item -#: build/trans_presets.java:963 +#: build/trans_presets.java:968 msgid "Edit Lift Gate" msgstr "Modifier une barrière" #. item "Barriers/Lift Gate" check "Motorcar" -#: build/trans_presets.java:974 +#: build/trans_presets.java:979 msgid "Hampshire Gate" msgstr "Porte de clôture" #. item -#: build/trans_presets.java:975 +#: build/trans_presets.java:980 msgid "Edit Hampshire Gate" msgstr "Modifier une Porte de clôture" #. item "Barriers/Hampshire Gate" check "Motorcar" -#: build/trans_presets.java:986 +#: build/trans_presets.java:991 msgid "Bump Gate" msgstr "Barrière mobile" #. item -#: build/trans_presets.java:987 +#: build/trans_presets.java:992 msgid "Edit Bump Gate" msgstr "Modifier une barrière mobile" #. item "Barriers/Bump Gate" check "Motorcar" -#: build/trans_presets.java:998 +#: build/trans_presets.java:1003 msgid "Kissing Gate" msgstr "Portillon à chicane" #. item -#: build/trans_presets.java:999 +#: build/trans_presets.java:1004 msgid "Edit Kissing Gate" msgstr "Modifier un Portillon à chicane" #. item "Barriers/Kissing Gate" check "Bicycle" -#: build/trans_presets.java:1007 +#: build/trans_presets.java:1012 msgid "Stile" msgstr "Échalier" @@ -15087,25 +16245,25 @@ #. item #. -#: build/trans_presets.java:1009 +#: build/trans_presets.java:1014 msgid "Edit Stile" msgstr "Modifier un échalier" #. item "Barriers/Stile" check "Bicycle" -#: build/trans_presets.java:1017 +#: build/trans_presets.java:1022 msgid "Turnstile" msgstr "" #. item -#: build/trans_presets.java:1018 +#: build/trans_presets.java:1023 msgid "Edit Turnstile" msgstr "" #. item "Barriers/Turnstile" check "Bicycle" -#: build/trans_presets.java:1026 +#: build/trans_presets.java:1031 msgid "Sally Port" msgstr "Écluse" #. item -#: build/trans_presets.java:1027 +#: build/trans_presets.java:1032 msgid "Edit Sally Port" msgstr "Modifier une écluse" @@ -15116,10 +16274,10 @@ #. item "Water/River" combo "Layer" #. -#: build/trans_presets.java:1041 build/trans_presets.java:1084 +#: build/trans_presets.java:1046 build/trans_presets.java:1089 msgid "Water" msgstr "Eau" #. group "Water" -#: build/trans_presets.java:1042 +#: build/trans_presets.java:1047 msgid "Spring" msgstr "Source" @@ -15127,5 +16285,5 @@ #. item #. -#: build/trans_presets.java:1044 +#: build/trans_presets.java:1049 msgid "Edit Spring" msgstr "Éditer une source" @@ -15133,5 +16291,5 @@ #. item "Water/Spring" text "Name" #. -#: build/trans_presets.java:1049 +#: build/trans_presets.java:1054 msgid "Drain" msgstr "Canal d’évacuation" @@ -15139,10 +16297,10 @@ #. item #. -#: build/trans_presets.java:1051 +#: build/trans_presets.java:1056 msgid "Edit Drain" msgstr "Éditer un canal d’évacuation" #. item "Water/Drain" combo "Layer" -#: build/trans_presets.java:1057 +#: build/trans_presets.java:1062 msgid "Stream" msgstr "Ruisseau" @@ -15150,10 +16308,10 @@ #. item #. -#: build/trans_presets.java:1059 +#: build/trans_presets.java:1064 msgid "Edit Stream" msgstr "Éditer un ruisseau" #. item "Water/Stream" combo "Layer" -#: build/trans_presets.java:1065 +#: build/trans_presets.java:1070 msgid "Canal" msgstr "Canal" @@ -15161,10 +16319,10 @@ #. item #. -#: build/trans_presets.java:1067 +#: build/trans_presets.java:1072 msgid "Edit Canal" msgstr "Éditer un canal" #. item "Water/Canal" combo "Layer" -#: build/trans_presets.java:1073 +#: build/trans_presets.java:1078 msgid "River" msgstr "Rivière" @@ -15174,5 +16332,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" /> -#: build/trans_presets.java:1077 +#: build/trans_presets.java:1082 msgid "Edit River" msgstr "Éditer une rivière" @@ -15180,15 +16338,15 @@ #. item #. -#: build/trans_presets.java:1086 +#: build/trans_presets.java:1091 msgid "Edit Water" msgstr "Éditer de l’eau" #. item "Water/Water" text "Name" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1095 msgid "Land" msgstr "Terre" #. item -#: build/trans_presets.java:1091 +#: build/trans_presets.java:1096 msgid "Edit Land" msgstr "Editez un terrain" @@ -15196,15 +16354,15 @@ #. item "Water/Land" text "Name" #. -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1101 msgid "Basin" msgstr "Bassin" #. item -#: build/trans_presets.java:1097 +#: build/trans_presets.java:1102 msgid "Edit Basin Landuse" msgstr "Éditer un bassin" #. item "Water/Basin" text "Name" -#: build/trans_presets.java:1102 +#: build/trans_presets.java:1107 msgid "Reservoir" msgstr "Bassin de retenue" @@ -15212,15 +16370,15 @@ #. item #. -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1109 msgid "Edit Reservoir Landuse" msgstr "Éditer un bassin de retenue" #. item "Water/Reservoir" text "Name" -#: build/trans_presets.java:1109 +#: build/trans_presets.java:1114 msgid "Covered Reservoir" msgstr "Réservoir couvert" #. item -#: build/trans_presets.java:1110 +#: build/trans_presets.java:1115 msgid "Edit Covered Reservoir" msgstr "Éditer un réservoir couvert" @@ -15228,5 +16386,5 @@ #. item "Water/Covered Reservoir" text "Name" #. -#: build/trans_presets.java:1115 +#: build/trans_presets.java:1120 msgid "Riverbank" msgstr "Lit de rivière" @@ -15235,10 +16393,10 @@ #. -#: build/trans_presets.java:1118 +#: build/trans_presets.java:1123 msgid "Edit Riverbank" msgstr "Modifier lit de rivière" #. item "Water/Riverbank" text "Name" -#: build/trans_presets.java:1122 +#: build/trans_presets.java:1127 msgid "Wetland" msgstr "Zone inondable" @@ -15249,14 +16407,14 @@ #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland" #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" /> -#: build/trans_presets.java:1127 +#: build/trans_presets.java:1132 msgid "Edit Wetland" msgstr "Modifier zone inondable" #. item "Water/Wetland" combo "Type" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "swamp" msgstr "marécages" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "bog" msgstr "tourbière" @@ -15270,35 +16428,35 @@ #. #. -#: build/trans_presets.java:1130 build/trans_style.java:3433 +#: build/trans_presets.java:1135 build/trans_style.java:3384 msgid "marsh" msgstr "marais" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "reedbed" msgstr "roselière" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "saltmarsh" msgstr "marais salant" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "tidalflat" msgstr "étendue vaseuse" -#: build/trans_presets.java:1130 +#: build/trans_presets.java:1135 msgid "mangrove" msgstr "mangrove" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1137 msgid "Mud" msgstr "Terrain boueux/vase" #. item -#: build/trans_presets.java:1133 +#: build/trans_presets.java:1138 msgid "Edit Mud" msgstr "Éditer un terrain boueux" #. item "Water/Mud" text "Name" -#: build/trans_presets.java:1137 +#: build/trans_presets.java:1142 msgid "Beach" msgstr "Plage" @@ -15306,20 +16464,20 @@ #. item #. -#: build/trans_presets.java:1139 +#: build/trans_presets.java:1144 msgid "Edit Beach" msgstr "Éditer une plage" #. item "Water/Beach" text "Name" -#: build/trans_presets.java:1143 +#: build/trans_presets.java:1148 msgid "Bay" msgstr "Baie" #. item -#: build/trans_presets.java:1144 +#: build/trans_presets.java:1149 msgid "Edit Bay" msgstr "Éditer une baie" #. item "Water/Bay" text "Name" -#: build/trans_presets.java:1148 +#: build/trans_presets.java:1153 msgid "Cliff" msgstr "Falaise" @@ -15327,10 +16485,10 @@ #. item #. -#: build/trans_presets.java:1150 +#: build/trans_presets.java:1155 msgid "Edit Cliff" msgstr "Éditer une falaise" #. item "Water/Cliff" text "Name" -#: build/trans_presets.java:1154 +#: build/trans_presets.java:1159 msgid "Coastline" msgstr "Ligne côtière" @@ -15338,5 +16496,5 @@ #. item #. -#: build/trans_presets.java:1156 +#: build/trans_presets.java:1161 msgid "Edit Coastline" msgstr "Éditer une ligne côtière" @@ -15344,5 +16502,5 @@ #. item "Water/Coastline" text "Name" #. -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1166 msgid "Ferry Route" msgstr "Itinéraire de ferry" @@ -15350,5 +16508,5 @@ #. item #. -#: build/trans_presets.java:1163 +#: build/trans_presets.java:1168 msgid "Edit Ferry" msgstr "Éditer un itinéraire de ferry" @@ -15357,5 +16515,5 @@ #. #. -#: build/trans_presets.java:1171 +#: build/trans_presets.java:1176 msgid "Boatyard" msgstr "Chantier naval" @@ -15363,10 +16521,10 @@ #. item #. -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1178 msgid "Edit Boatyard" msgstr "Éditer un chantier naval" #. item "Water/Boatyard" text "Name" -#: build/trans_presets.java:1178 +#: build/trans_presets.java:1183 msgid "Dock" msgstr "Dock" @@ -15374,5 +16532,5 @@ #. item #. -#: build/trans_presets.java:1180 +#: build/trans_presets.java:1185 msgid "Edit Dock" msgstr "Éditer un dock" @@ -15380,5 +16538,5 @@ #. item "Water/Dock" text "Name" #. -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1191 msgid "Dam" msgstr "Barrage" @@ -15386,15 +16544,15 @@ #. item #. -#: build/trans_presets.java:1188 +#: build/trans_presets.java:1193 msgid "Edit Dam" msgstr "Éditer un barrage" #. item "Water/Dam" text "Name" -#: build/trans_presets.java:1194 +#: build/trans_presets.java:1199 msgid "Waterway Point" msgstr "Voie navigable" #. group "Waterway Point" -#: build/trans_presets.java:1195 +#: build/trans_presets.java:1200 msgid "Lock Gate" msgstr "Écluse" @@ -15403,5 +16561,5 @@ #. #. -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1204 msgid "Weir" msgstr "Petit barrage" @@ -15409,20 +16567,20 @@ #. item #. -#: build/trans_presets.java:1201 +#: build/trans_presets.java:1206 msgid "Edit Weir" msgstr "Éditer une écluse" #. item "Waterway Point/Weir" text "Name" -#: build/trans_presets.java:1206 +#: build/trans_presets.java:1211 msgid "Waterfall" msgstr "Cascade" #. item -#: build/trans_presets.java:1207 +#: build/trans_presets.java:1212 msgid "Edit Waterfall" msgstr "Éditer une cascade" #. item "Waterway Point/Waterfall" text "Name" -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1217 msgid "Turning Point" msgstr "Point de retournement" @@ -15431,15 +16589,15 @@ #. #. -#: build/trans_presets.java:1216 +#: build/trans_presets.java:1221 msgid "Marina" msgstr "Marina" #. item -#: build/trans_presets.java:1217 +#: build/trans_presets.java:1222 msgid "Edit Marina" msgstr "Éditer une marina" #. item "Waterway Point/Marina" text "Name" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1226 msgid "Pier" msgstr "Jetée/Ponton" @@ -15447,10 +16605,10 @@ #. item #. -#: build/trans_presets.java:1223 +#: build/trans_presets.java:1228 msgid "Edit Pier" msgstr "Modifier jetée/ponton" #. item "Waterway Point/Pier" text "Name" -#: build/trans_presets.java:1227 +#: build/trans_presets.java:1232 msgid "Ferry Terminal" msgstr "Terminal de Ferry" @@ -15458,10 +16616,10 @@ #. item #. -#: build/trans_presets.java:1229 +#: build/trans_presets.java:1234 msgid "Edit Ferry Terminal" msgstr "Editer un terminal de Ferry" #. item "Waterway Point/Ferry Terminal" text "Name" -#: build/trans_presets.java:1233 +#: build/trans_presets.java:1238 msgid "Slipway" msgstr "Slipway" @@ -15471,5 +16629,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" /> -#: build/trans_presets.java:1237 +#: build/trans_presets.java:1242 msgid "Edit Slipway" msgstr "Éditer un plan incliné" @@ -15477,10 +16635,10 @@ #. item "Waterway Point/Slipway" text "Name" #. -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1248 msgid "Railway" msgstr "Voie ferrée" #. group "Railway" -#: build/trans_presets.java:1244 +#: build/trans_presets.java:1249 msgid "Rail" msgstr "Rail" @@ -15488,5 +16646,5 @@ #. item #. -#: build/trans_presets.java:1246 +#: build/trans_presets.java:1251 msgid "Edit Rail" msgstr "Éditer des rails" @@ -15516,8 +16674,8 @@ #. #. -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "Optional Types" msgstr "Types optionels" @@ -15531,35 +16689,35 @@ #. item "Railway/Tram" combo "Optional Types" #. item "Railway/Disused Rail" combo "Optional Types" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "yard" msgstr "triage" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "siding" msgstr "voie de garage" -#: build/trans_presets.java:1249 build/trans_presets.java:1255 -#: build/trans_presets.java:1262 build/trans_presets.java:1268 -#: build/trans_presets.java:1274 build/trans_presets.java:1280 -#: build/trans_presets.java:1286 build/trans_presets.java:1311 +#: build/trans_presets.java:1254 build/trans_presets.java:1260 +#: build/trans_presets.java:1267 build/trans_presets.java:1273 +#: build/trans_presets.java:1279 build/trans_presets.java:1285 +#: build/trans_presets.java:1291 build/trans_presets.java:1316 msgid "spur" msgstr "embranchement" -#: build/trans_presets.java:1251 +#: build/trans_presets.java:1256 msgid "Narrow Gauge Rail" msgstr "Voie ferrée étroite" #. item -#: build/trans_presets.java:1252 +#: build/trans_presets.java:1257 msgid "Edit Narrow Gauge Rail" msgstr "Éditer une voie ferrée étroite" -#: build/trans_presets.java:1257 +#: build/trans_presets.java:1262 msgid "Monorail" msgstr "Monorail" @@ -15567,45 +16725,45 @@ #. item #. -#: build/trans_presets.java:1259 +#: build/trans_presets.java:1264 msgid "Edit Monorail" msgstr "Éditer un monorail" -#: build/trans_presets.java:1264 +#: build/trans_presets.java:1269 msgid "Preserved" msgstr "Préservé" #. item -#: build/trans_presets.java:1265 +#: build/trans_presets.java:1270 msgid "Edit Preserved Railway" msgstr "Éditer une voie ferrée touristique" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1275 msgid "Light Rail" msgstr "Rails légers" #. item -#: build/trans_presets.java:1271 +#: build/trans_presets.java:1276 msgid "Edit Light Rail" msgstr "Éditer des rails légers" -#: build/trans_presets.java:1276 +#: build/trans_presets.java:1281 msgid "Subway" msgstr "Voie souterraine" #. item -#: build/trans_presets.java:1277 +#: build/trans_presets.java:1282 msgid "Edit Subway" msgstr "Éditer un métro" -#: build/trans_presets.java:1282 +#: build/trans_presets.java:1287 msgid "Tram" msgstr "Tram" #. item -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1288 msgid "Edit Tram" msgstr "Éditer un tram" -#: build/trans_presets.java:1288 +#: build/trans_presets.java:1293 msgid "Bus Guideway" msgstr "Voie de guidage de bus" @@ -15613,5 +16771,5 @@ #. item #. -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1295 msgid "Edit Bus Guideway" msgstr "Éditer une voie de guidage de bus" @@ -15620,14 +16778,14 @@ #. #. -#: build/trans_presets.java:1307 +#: build/trans_presets.java:1312 msgid "Disused Rail" msgstr "Voie désaffectée" #. item -#: build/trans_presets.java:1308 +#: build/trans_presets.java:1313 msgid "Edit Disused Railway" msgstr "Éditer une voie désaffectée" -#: build/trans_presets.java:1313 +#: build/trans_presets.java:1318 msgid "Abandoned Rail" msgstr "Voie abandonnée" @@ -15636,5 +16794,5 @@ #. #. -#: build/trans_presets.java:1317 +#: build/trans_presets.java:1322 msgid "Level Crossing" msgstr "Passage à niveau" @@ -15643,5 +16801,5 @@ #. #. -#: build/trans_presets.java:1321 +#: build/trans_presets.java:1326 msgid "Crossing" msgstr "Passage piéton sur voie ferrée" @@ -15651,5 +16809,5 @@ #. #. -#: build/trans_presets.java:1325 +#: build/trans_presets.java:1330 msgid "Crossing type" msgstr "Type de passage" @@ -15657,5 +16815,5 @@ #. item "Railway/Crossing" check "Crossing attendant" #. -#: build/trans_presets.java:1331 +#: build/trans_presets.java:1336 msgid "Turntable" msgstr "Plaque tournante" @@ -15664,10 +16822,10 @@ #. #. -#: build/trans_presets.java:1336 +#: build/trans_presets.java:1341 msgid "Aerialway" msgstr "Transports aériens par câble" #. group "Aerialway" -#: build/trans_presets.java:1337 +#: build/trans_presets.java:1342 msgid "Chair Lift" msgstr "Télésiège" @@ -15675,10 +16833,10 @@ #. item #. -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1344 msgid "Edit Chair Lift" msgstr "Éditer un télésiège" #. item "Aerialway/Chair Lift" text "Name" -#: build/trans_presets.java:1343 +#: build/trans_presets.java:1348 msgid "Drag Lift" msgstr "Téléski" @@ -15686,10 +16844,10 @@ #. item #. -#: build/trans_presets.java:1345 +#: build/trans_presets.java:1350 msgid "Edit Drag Lift" msgstr "Éditer un téléski" #. item "Aerialway/Drag Lift" text "Name" -#: build/trans_presets.java:1349 +#: build/trans_presets.java:1354 msgid "Cable Car" msgstr "Télécabine" @@ -15697,10 +16855,10 @@ #. item #. -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1356 msgid "Edit Cable Car" msgstr "Éditer un télécabine" #. item "Aerialway/Cable Car" text "Name" -#: build/trans_presets.java:1355 +#: build/trans_presets.java:1360 msgid "Gondola" msgstr "Oeufs" @@ -15708,5 +16866,5 @@ #. item #. -#: build/trans_presets.java:1357 +#: build/trans_presets.java:1362 msgid "Edit Gondola" msgstr "Modifier Oeufs" @@ -15714,5 +16872,5 @@ #. item "Aerialway/Gondola" text "Name" #. group "Public Transport" -#: build/trans_presets.java:1361 build/trans_presets.java:1449 +#: build/trans_presets.java:1366 build/trans_presets.java:1461 msgid "Station" msgstr "Station" @@ -15723,10 +16881,10 @@ #. -#: build/trans_presets.java:1363 build/trans_presets.java:1452 +#: build/trans_presets.java:1368 build/trans_presets.java:1464 msgid "Edit Station" msgstr "Éditer la station" #. group "Car" -#: build/trans_presets.java:1370 +#: build/trans_presets.java:1375 msgid "Fuel" msgstr "Station service" @@ -15736,9 +16894,238 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" /> -#: build/trans_presets.java:1374 +#: build/trans_presets.java:1379 msgid "Edit Fuel" msgstr "Modifier station essence" #. item "Car/Fuel" text "Operator" +#. item "Food+Drinks/Cafe" text "Name" +#. item "Food+Drinks/Pub" text "Name" +#. item "Food+Drinks/Biergarten" text "Name" +#. item "Food+Drinks/Bar" text "Name" +#. item "Food+Drinks/Nightclub" text "Name" +#. item "Tourism/Attraction" text "Name" +#. item "Tourism/Museum" text "Name" +#. item "Tourism/Zoo" text "Name" +#. item "Tourism/Theme Park" text "Name" +#. item "Tourism/Information Office" text "Name" +#. item "Historic Places/Ruins" text "Name" +#. item "Historic Places/Archaeological Site" text "Name" +#. item "Sport Facilities/Golf Course" text "Name" +#. item "Sport Facilities/Miniature Golf" text "Name" +#. item "Buildings/Library" text "Name" +#. item +#. +#. +#. item "Amenities/Baby Hatch" text "Operator" +#. item "Shops/Supermarket" text "Name" +#. item "Shops/Chemist" text "Name" +#. item "Shops/Convenience Store" text "Name" +#. item "Shops/Kiosk" text "Name" +#. item "Shops/Book Store" text "Name" +#. item "Shops/Travel Agency" text "Name" +#. item "Shops/Butcher" text "Name" +#. item "Shops/Baker" text "Name" +#. item "Shops/Florist" text "Name" +#. item "Shops/Organic" text "Name" +#. item "Shops/Alcohol" text "Name" +#. item "Shops/Beverages" text "Name" +#. item "Shops/Computer" text "Name" +#. item "Shops/Electronics" text "Name" +#. item "Shops/Hifi" text "Name" +#. item "Shops/Furniture" text "Name" +#. item "Shops/Garden Centre" text "Name" +#. item "Shops/Hardware" text "Name" +#. item "Shops/Do-it-yourself-store" text "Name" +#. item "Shops/Stationery" text "Name" +#. item "Shops/Hairdresser" text "Name" +#. item "Shops/Shoes" text "Name" +#. item "Shops/Toys" text "Name" +#. item "Shops/Video" text "Name" +#. item "Shops/Dry Cleaning" text "Name" +#. item "Shops/Laundry" text "Name" +#. item "Shops/Outdoor" text "Name" +#. item "Shops/Sports" text "Name" +#. item "Shops/Optician" text "Name" +#. item "Cash/Bank" text "Operator" +#. item "Cash/Money Exchange" text "Name" +#. item "Health/Doctors" text "Name" +#. item "Health/Dentist" text "Name" +#. item "Health/Pharmacy" text "Name" +#. item "Health/Veterinary" text "Name" +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1671 build/trans_presets.java:1678 +#: build/trans_presets.java:1686 build/trans_presets.java:1699 +#: build/trans_presets.java:1713 build/trans_presets.java:1810 +#: build/trans_presets.java:1818 build/trans_presets.java:1909 +#: build/trans_presets.java:1915 build/trans_presets.java:2226 +#: build/trans_presets.java:2250 build/trans_presets.java:2433 +#: build/trans_presets.java:2462 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Opening Hours" +msgstr "Horaires d’ouverture" + +#. item "Car/Fuel" combo "Opening Hours" +#. item "Food+Drinks/Restaurant" combo "Opening Hours" +#. item "Food+Drinks/Fast Food" combo "Opening Hours" +#. item "Food+Drinks/Cafe" combo "Opening Hours" +#. item "Food+Drinks/Pub" combo "Opening Hours" +#. item "Food+Drinks/Biergarten" combo "Opening Hours" +#. item "Food+Drinks/Bar" combo "Opening Hours" +#. item "Food+Drinks/Nightclub" combo "Opening Hours" +#. item "Tourism/Museum" combo "Opening Hours" +#. item "Tourism/Zoo" combo "Opening Hours" +#. item "Tourism/Theme Park" combo "Opening Hours" +#. item "Tourism/Information Office" combo "Opening Hours" +#. item "Historic Places/Ruins" combo "Opening Hours" +#. item "Historic Places/Archaeological Site" combo "Opening Hours" +#. item "Sport Facilities/Golf Course" combo "Opening Hours" +#. item "Sport Facilities/Miniature Golf" combo "Opening Hours" +#. item "Buildings/Library" combo "Opening Hours" +#. item "Buildings/Place of Worship" combo "Opening Hours" +#. item "Amenities/Bench" combo "Opening Hours" +#. item "Shops/Supermarket" combo "Opening Hours" +#. item "Shops/Chemist" combo "Opening Hours" +#. item "Shops/Convenience Store" combo "Opening Hours" +#. item "Shops/Kiosk" combo "Opening Hours" +#. item "Shops/Book Store" combo "Opening Hours" +#. item "Shops/Travel Agency" combo "Opening Hours" +#. item "Shops/Butcher" combo "Opening Hours" +#. item "Shops/Baker" combo "Opening Hours" +#. item "Shops/Florist" combo "Opening Hours" +#. item "Shops/Organic" combo "Opening Hours" +#. item "Shops/Alcohol" combo "Opening Hours" +#. item "Shops/Beverages" combo "Opening Hours" +#. item "Shops/Computer" combo "Opening Hours" +#. item "Shops/Electronics" combo "Opening Hours" +#. item "Shops/Hifi" combo "Opening Hours" +#. item "Shops/Furniture" combo "Opening Hours" +#. item "Shops/Garden Centre" combo "Opening Hours" +#. item "Shops/Hardware" combo "Opening Hours" +#. item "Shops/Do-it-yourself-store" combo "Opening Hours" +#. item "Shops/Stationery" combo "Opening Hours" +#. item "Shops/Hairdresser" combo "Opening Hours" +#. item "Shops/Shoes" combo "Opening Hours" +#. item "Shops/Toys" combo "Opening Hours" +#. item "Shops/Video" combo "Opening Hours" +#. item "Shops/Dry Cleaning" combo "Opening Hours" +#. item "Shops/Laundry" combo "Opening Hours" +#. item "Shops/Outdoor" combo "Opening Hours" +#. item "Shops/Sports" combo "Opening Hours" +#. item "Shops/Optician" combo "Opening Hours" +#. item "Cash/Bank" combo "Opening Hours" +#. item "Cash/Money Exchange" combo "Opening Hours" +#. item "Health/Doctors" combo "Opening Hours" +#. item "Health/Dentist" combo "Opening Hours" +#. item "Health/Pharmacy" combo "Opening Hours" +#. item "Health/Veterinary" combo "Opening Hours" +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "24/7" +msgstr "" + +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Mo-Fr 08:30-20:00" +msgstr "" + +#: build/trans_presets.java:1383 build/trans_presets.java:1621 +#: build/trans_presets.java:1629 build/trans_presets.java:1636 +#: build/trans_presets.java:1643 build/trans_presets.java:1649 +#: build/trans_presets.java:1656 build/trans_presets.java:1663 +#: build/trans_presets.java:1678 build/trans_presets.java:1686 +#: build/trans_presets.java:1699 build/trans_presets.java:1713 +#: build/trans_presets.java:1810 build/trans_presets.java:1818 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:2226 build/trans_presets.java:2250 +#: build/trans_presets.java:2433 build/trans_presets.java:2470 +#: build/trans_presets.java:2476 build/trans_presets.java:2483 +#: build/trans_presets.java:2490 build/trans_presets.java:2496 +#: build/trans_presets.java:2502 build/trans_presets.java:2524 +#: build/trans_presets.java:2531 build/trans_presets.java:2538 +#: build/trans_presets.java:2544 build/trans_presets.java:2551 +#: build/trans_presets.java:2557 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2581 build/trans_presets.java:2588 +#: build/trans_presets.java:2595 build/trans_presets.java:2602 +#: build/trans_presets.java:2608 build/trans_presets.java:2614 +#: build/trans_presets.java:2620 build/trans_presets.java:2626 +#: build/trans_presets.java:2632 build/trans_presets.java:2639 +#: build/trans_presets.java:2646 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2676 build/trans_presets.java:2684 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2713 build/trans_presets.java:2740 +msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" +msgstr "" + #. group "Bicycle" #. -#: build/trans_presets.java:1379 build/trans_presets.java:1426 +#: build/trans_presets.java:1385 build/trans_presets.java:1438 #: build/trans_surveyor.java:24 msgid "Parking" @@ -15758,106 +17145,141 @@ #. -#: build/trans_presets.java:1382 +#: build/trans_presets.java:1388 msgid "Edit Parking" msgstr "Éditer un parking" #. item "Car/Parking" text "Name" +#. item "Tourism/Information Terminal" text "Operator" +#. item "Tourism/Audioguide" text "Operator" +#. item "Amenities/Toilets" text "Operator" +#. item "Shops/Vending machine" text "Operator" +#: build/trans_presets.java:1391 build/trans_presets.java:1762 +#: build/trans_presets.java:1772 build/trans_presets.java:2396 +#: build/trans_presets.java:2510 +msgid "Reference number" +msgstr "Numéro de référence" + +#. item "Car/Parking" combo "Type" +#: build/trans_presets.java:1392 +msgid "multi-storey" +msgstr "parking (bâtiment)" + +#: build/trans_presets.java:1392 +msgid "surface" +msgstr "surface" + +#: build/trans_presets.java:1392 +msgid "underground" +msgstr "souterrain" + +#: build/trans_presets.java:1393 +#, fuzzy +msgid "Park and Ride" +msgstr "Automobiles en libre service" + +#. item "Tourism/Information Terminal" text "Reference number" +#. item "Tourism/Audioguide" text "Reference number" +#. item "Amenities/Toilets" text "Reference number" +#: build/trans_presets.java:1394 build/trans_presets.java:1763 +#: build/trans_presets.java:1773 build/trans_presets.java:2397 +msgid "Fee" +msgstr "Péage/Forfait" + +#. +#: build/trans_presets.java:1396 +#, fuzzy +msgid "Capacity (overall)" +msgstr "Capacité" + +#. item "Car/Parking" text "Capacity (overall)" +#: build/trans_presets.java:1397 +msgid "Spaces for Disabled" +msgstr "Espaces pour handicapés" + +#: build/trans_presets.java:1398 +#, fuzzy +msgid "Spaces for Women" +msgstr "Espaces pour handicapés" + +#: build/trans_presets.java:1399 +#, fuzzy +msgid "Spaces for Parents" +msgstr "Espaces pour handicapés" + +#: build/trans_presets.java:1400 +msgid "See the Wiki for other capacity:[types]=*." +msgstr "" + +#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*." +#: build/trans_presets.java:1402 +msgid "Wash" +msgstr "Lavage" + +#. item +#: build/trans_presets.java:1403 +msgid "Edit Car Wash" +msgstr "Editez un espace de lavage de voitures" + +#. item "Car/Wash" text "Operator" +#. item "Bicycle/Rental" text "Name" +#: build/trans_presets.java:1408 build/trans_presets.java:1452 +msgid "Shop" +msgstr "Concession/Réparation" + +#. item +#. +#: build/trans_presets.java:1410 +msgid "Edit Car Shop" +msgstr "Éditer une concession/réparation" + +#. item "Car/Shop" text "Operator" +#: build/trans_presets.java:1415 +msgid "Repair" +msgstr "Réparer" + +#. item +#: build/trans_presets.java:1416 +msgid "Edit Car Repair" +msgstr "Editez un garagiste" + +#. item "Car/Repair" text "Operator" +#. item "Bicycle/Parking" text "Capacity" +#: build/trans_presets.java:1421 build/trans_presets.java:1445 +msgid "Rental" +msgstr "Location" + +#. item +#. +#: build/trans_presets.java:1424 +msgid "Edit Car Rental" +msgstr "Éditer une location de voiture" + +#. item "Car/Rental" text "Operator" +#: build/trans_presets.java:1429 +msgid "Sharing" +msgstr "Partage" + +#. item +#. +#: build/trans_presets.java:1431 +msgid "Edit Car Sharing" +msgstr "Éditer un covoiturage" + +#. item +#. +#: build/trans_presets.java:1440 +msgid "Edit Bicycle Parking" +msgstr "Éditer un parking à vélo" + #. item "Bicycle/Parking" text "Name" -#: build/trans_presets.java:1385 build/trans_presets.java:1431 +#: build/trans_presets.java:1443 msgid "Capacity" msgstr "Capacité" -#. item "Car/Parking" combo "Type" -#: build/trans_presets.java:1386 -msgid "surface" -msgstr "surface" - -#: build/trans_presets.java:1386 -msgid "multi-storey" -msgstr "parking (bâtiment)" - -#: build/trans_presets.java:1386 -msgid "underground" -msgstr "souterrain" - -#: build/trans_presets.java:1386 -msgid "park_and_ride" -msgstr "Automobiles en libre service" - -#: build/trans_presets.java:1387 -msgid "Spaces for Disabled" -msgstr "Espaces pour handicapés" - -#. item "Amenities/Toilets" text "Reference number" -#: build/trans_presets.java:1388 build/trans_presets.java:2328 -msgid "Fee" -msgstr "Péage/Forfait" - -#. item "Car/Parking" check "Fee" -#: build/trans_presets.java:1390 -msgid "Wash" -msgstr "Lavage" - -#. item -#: build/trans_presets.java:1391 -msgid "Edit Car Wash" -msgstr "Editez un espace de lavage de voitures" - -#. item "Car/Wash" text "Operator" -#. item "Bicycle/Rental" text "Name" -#: build/trans_presets.java:1396 build/trans_presets.java:1440 -msgid "Shop" -msgstr "Concession/Réparation" - -#. item -#. -#: build/trans_presets.java:1398 -msgid "Edit Car Shop" -msgstr "Éditer une concession/réparation" - -#. item "Car/Shop" text "Operator" -#: build/trans_presets.java:1403 -msgid "Repair" -msgstr "Réparer" - -#. item -#: build/trans_presets.java:1404 -msgid "Edit Car Repair" -msgstr "Editez un garagiste" - -#. item "Car/Repair" text "Operator" -#. item "Bicycle/Parking" text "Capacity" -#: build/trans_presets.java:1409 build/trans_presets.java:1433 -msgid "Rental" -msgstr "Location" - -#. item -#. -#: build/trans_presets.java:1412 -msgid "Edit Car Rental" -msgstr "Éditer une location de voiture" - -#. item "Car/Rental" text "Operator" -#: build/trans_presets.java:1417 -msgid "Sharing" -msgstr "Partage" - -#. item -#. -#: build/trans_presets.java:1419 -msgid "Edit Car Sharing" -msgstr "Éditer un covoiturage" - -#. item -#. -#: build/trans_presets.java:1428 -msgid "Edit Bicycle Parking" -msgstr "Éditer un parking à vélo" - #. item #. -#: build/trans_presets.java:1436 +#: build/trans_presets.java:1448 msgid "Edit Bicycle Rental" msgstr "Éditer une location de vélos" @@ -15866,15 +17288,15 @@ #. -#: build/trans_presets.java:1443 +#: build/trans_presets.java:1455 msgid "Edit Bicycle Shop" msgstr "Éditer un magasin de vélo" #. item "Bicycle/Shop" text "Name" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1460 msgid "Public Transport" msgstr "Transport public" #. item "Public Transport/Station" text "Name" -#: build/trans_presets.java:1457 +#: build/trans_presets.java:1469 msgid "UIC-Reference" msgstr "Référence UIC" @@ -15882,5 +17304,5 @@ #. item "Public Transport/Station" text "UIC-Reference" #. -#: build/trans_presets.java:1460 +#: build/trans_presets.java:1472 msgid "Railway Halt" msgstr "Halte ferroviaire" @@ -15888,5 +17310,5 @@ #. item #. -#: build/trans_presets.java:1462 +#: build/trans_presets.java:1474 msgid "Edit Halt" msgstr "Editez un arrêt" @@ -15894,5 +17316,5 @@ #. item "Public Transport/Railway Halt" text "Name" #. -#: build/trans_presets.java:1469 +#: build/trans_presets.java:1481 msgid "Tram Stop" msgstr "Arrêt de tram" @@ -15901,5 +17323,5 @@ #. -#: build/trans_presets.java:1472 +#: build/trans_presets.java:1484 msgid "Edit Tram Stop" msgstr "Éditer un arrêt de tram" @@ -15907,5 +17329,5 @@ #. item "Public Transport/Tram Stop" text "Name" #. -#: build/trans_presets.java:1479 +#: build/trans_presets.java:1491 msgid "Railway Platform" msgstr "Quai" @@ -15914,5 +17336,5 @@ #. -#: build/trans_presets.java:1482 +#: build/trans_presets.java:1494 msgid "Edit Railway Platform" msgstr "Éditer un quai" @@ -15924,5 +17346,5 @@ #. #. -#: build/trans_presets.java:1485 build/trans_presets.java:1527 +#: build/trans_presets.java:1497 build/trans_presets.java:1539 msgid "Reference (track number)" msgstr "Référence (numéro de voie)" @@ -15930,10 +17352,10 @@ #. item "Public Transport/Railway Platform" text "Width (meters)" #. item "Public Transport/Bus Platform" text "Width (meters)" -#: build/trans_presets.java:1487 build/trans_presets.java:1529 +#: build/trans_presets.java:1499 build/trans_presets.java:1541 msgid "Area" msgstr "Surface" #. item "Public Transport/Railway Platform" check "Area" -#: build/trans_presets.java:1489 +#: build/trans_presets.java:1501 msgid "Subway Entrance" msgstr "Bouche de métro" @@ -15942,10 +17364,10 @@ #. -#: build/trans_presets.java:1492 +#: 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:1497 +#: build/trans_presets.java:1509 msgid "Wheelchair" msgstr "Chaise roulante" @@ -15954,5 +17376,5 @@ #. #. -#: build/trans_presets.java:1502 +#: build/trans_presets.java:1514 msgid "Bus Station" msgstr "Gare routière" @@ -15961,5 +17383,5 @@ #. -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1517 msgid "Edit Bus Station" msgstr "Éditer une gare routière" @@ -15967,5 +17389,5 @@ #. item "Public Transport/Bus Station" text "Name" #. -#: build/trans_presets.java:1511 +#: build/trans_presets.java:1523 msgid "Bus Stop" msgstr "Arrêt de bus" @@ -15975,5 +17397,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:1515 +#: build/trans_presets.java:1527 msgid "Edit Bus Stop" msgstr "Éditer un arrêt de bus" @@ -15982,8 +17404,6 @@ #. item "Tourism/Other Information Points" text "Closer Description" #. -#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" -#. -#: build/trans_presets.java:1520 build/trans_presets.java:1722 -#: build/trans_presets.java:2368 +#: build/trans_presets.java:1532 build/trans_presets.java:1785 +#: build/trans_presets.java:2439 msgid "Shelter" msgstr "Abri" @@ -15991,10 +17411,10 @@ #. item "Public Transport/Bus Stop" check "Shelter" #. -#: build/trans_presets.java:1523 +#: build/trans_presets.java:1535 msgid "Bus Platform" msgstr "Plateforme de bus" #. item -#: build/trans_presets.java:1524 +#: build/trans_presets.java:1536 msgid "Edit Bus Platform" msgstr "Éditer une plateforme de bus" @@ -16002,5 +17422,5 @@ #. item "Public Transport/Bus Platform" check "Area" #. -#: build/trans_presets.java:1532 +#: build/trans_presets.java:1544 msgid "Taxi" msgstr "Taxi" @@ -16008,5 +17428,5 @@ #. item #. -#: build/trans_presets.java:1534 +#: build/trans_presets.java:1546 msgid "Edit Taxi station" msgstr "Editez une station de taxi" @@ -16014,5 +17434,5 @@ #. item "Public Transport/Taxi" text "Name" #. -#: build/trans_presets.java:1539 +#: build/trans_presets.java:1551 msgid "Airport" msgstr "Aéroport" @@ -16020,15 +17440,15 @@ #. item #. -#: build/trans_presets.java:1541 +#: build/trans_presets.java:1553 msgid "Edit Airport" msgstr "Modifier aéroport" #. item "Public Transport/Airport" text "Reference" -#: build/trans_presets.java:1546 +#: build/trans_presets.java:1558 msgid "IATA" msgstr "IATA" #. item "Public Transport/Airport" text "IATA" -#: build/trans_presets.java:1547 +#: build/trans_presets.java:1559 msgid "ICAO" msgstr "ICAO" @@ -16037,5 +17457,5 @@ #. #. -#: build/trans_presets.java:1552 +#: build/trans_presets.java:1564 msgid "Accomodation" msgstr "Hôtel" @@ -16047,5 +17467,5 @@ #. #. -#: build/trans_presets.java:1553 build/trans_surveyor.java:43 +#: build/trans_presets.java:1565 build/trans_surveyor.java:43 msgid "Hotel" msgstr "Hôtel" @@ -16054,15 +17474,15 @@ #. -#: build/trans_presets.java:1556 +#: build/trans_presets.java:1568 msgid "Edit Hotel" msgstr "Éditer un hôtel" #. item "Accomodation/Hotel" text "Name" -#: build/trans_presets.java:1559 +#: build/trans_presets.java:1571 msgid "Stars" msgstr "Étoiles" #. item "Accomodation/Hotel" combo "Stars" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1573 msgid "Motel" msgstr "Môtel" @@ -16070,20 +17490,20 @@ #. item #. -#: build/trans_presets.java:1563 +#: build/trans_presets.java:1575 msgid "Edit Motel" msgstr "Éditer un motel" #. item "Accomodation/Motel" text "Name" -#: build/trans_presets.java:1567 +#: build/trans_presets.java:1579 msgid "Guest House" msgstr "Chambre d’hôte" #. item -#: build/trans_presets.java:1568 +#: build/trans_presets.java:1580 msgid "Edit Guest House" msgstr "Éditer une chambre d’hôte" #. item "Accomodation/Guest House" text "Name" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1584 msgid "Chalet" msgstr "Châlet" @@ -16091,10 +17511,10 @@ #. item #. -#: build/trans_presets.java:1574 +#: build/trans_presets.java:1586 msgid "Edit Chalet" msgstr "Editez un châlet" #. item "Accomodation/Chalet" text "Name" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1590 msgid "Hostel" msgstr "Hôtel" @@ -16102,30 +17522,30 @@ #. item #. -#: build/trans_presets.java:1580 +#: build/trans_presets.java:1592 msgid "Edit Hostel" msgstr "Éditer une auberge de jeunesse" #. item "Accomodation/Hostel" text "Name" -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1596 msgid "Alpine Hut" msgstr "Chalet" #. item -#: build/trans_presets.java:1585 +#: build/trans_presets.java:1597 msgid "Edit Alpine Hut" msgstr "Modifier chalet" #. item "Accomodation/Alpine Hut" text "Elevation" -#: build/trans_presets.java:1590 +#: build/trans_presets.java:1602 msgid "Caravan Site" msgstr "Site pour caravane" #. item -#: build/trans_presets.java:1591 +#: build/trans_presets.java:1603 msgid "Edit Caravan Site" msgstr "Éditer un site pour caravane" #. item "Accomodation/Caravan Site" text "Name" -#: build/trans_presets.java:1595 +#: build/trans_presets.java:1607 msgid "Camping Site" msgstr "Camping" @@ -16133,10 +17553,10 @@ #. item #. -#: build/trans_presets.java:1597 +#: build/trans_presets.java:1609 msgid "Edit Camping Site" msgstr "Éditer un camping" #. item "Accomodation/Camping Site" text "Name" -#: build/trans_presets.java:1602 +#: build/trans_presets.java:1614 msgid "Food+Drinks" msgstr "Nourriture & boissons" @@ -16147,5 +17567,5 @@ #. #. -#: build/trans_presets.java:1603 build/trans_surveyor.java:47 +#: build/trans_presets.java:1615 build/trans_surveyor.java:47 msgid "Restaurant" msgstr "Restaurant" @@ -16153,5 +17573,5 @@ #. item #. -#: build/trans_presets.java:1605 +#: build/trans_presets.java:1617 msgid "Edit Restaurant" msgstr "Éditer un restaurant" @@ -16159,5 +17579,5 @@ #. item "Food+Drinks/Restaurant" text "Name" #. item "Food+Drinks/Fast Food" text "Name" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "Cuisine" msgstr "Cuisine" @@ -16165,61 +17585,61 @@ #. item "Food+Drinks/Restaurant" combo "Cuisine" #. item "Food+Drinks/Fast Food" combo "Cuisine" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "italian" msgstr "italien" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "chinese" msgstr "chinois" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "pizza" msgstr "pizza" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "burger" msgstr "hamburger" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "greek" msgstr "greque" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "german" msgstr "allemand" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "indian" msgstr "indien" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "regional" msgstr "régional" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "kebab" msgstr "kebab" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "turkish" msgstr "turque" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "asian" msgstr "asiatique" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "thai" msgstr "thaïlandais" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "mexican" msgstr "mexicain" -#: build/trans_presets.java:1608 build/trans_presets.java:1615 +#: build/trans_presets.java:1620 build/trans_presets.java:1628 msgid "japanese" msgstr "japonais" -#: build/trans_presets.java:1610 +#: build/trans_presets.java:1623 msgid "Fast Food" msgstr "Fast Food" @@ -16227,9 +17647,9 @@ #. item #. -#: build/trans_presets.java:1612 +#: build/trans_presets.java:1625 msgid "Edit Fast Food Restaurant" msgstr "Éditer un fast food" -#: build/trans_presets.java:1617 +#: build/trans_presets.java:1631 msgid "Cafe" msgstr "Café" @@ -16237,10 +17657,9 @@ #. item #. -#: build/trans_presets.java:1619 +#: build/trans_presets.java:1633 msgid "Edit Cafe" msgstr "Editez un café" -#. item "Food+Drinks/Cafe" text "Name" -#: build/trans_presets.java:1623 +#: build/trans_presets.java:1638 msgid "Pub" msgstr "Bar" @@ -16248,20 +17667,18 @@ #. item #. -#: build/trans_presets.java:1625 +#: build/trans_presets.java:1640 msgid "Edit Pub" msgstr "Pub" -#. item "Food+Drinks/Pub" text "Name" -#: build/trans_presets.java:1629 +#: build/trans_presets.java:1645 msgid "Biergarten" msgstr "Biergarten" #. item -#: build/trans_presets.java:1630 +#: build/trans_presets.java:1646 msgid "Edit Biergarten" msgstr "Éditer un biergarten" -#. item "Food+Drinks/Biergarten" text "Name" -#: build/trans_presets.java:1634 +#: build/trans_presets.java:1651 msgid "Bar" msgstr "Bar" @@ -16269,10 +17686,9 @@ #. item #. -#: build/trans_presets.java:1636 +#: build/trans_presets.java:1653 msgid "Edit Bar" msgstr "Modifier Bar" -#. item "Food+Drinks/Bar" text "Name" -#: build/trans_presets.java:1640 +#: build/trans_presets.java:1658 msgid "Nightclub" msgstr "Boîte de nuit" @@ -16280,33 +17696,24 @@ #. item #. -#: build/trans_presets.java:1642 +#: build/trans_presets.java:1660 msgid "Edit Nightclub" msgstr "Éditer une boîte de nuit" -#. item "Food+Drinks/Nightclub" text "Name" -#: build/trans_presets.java:1647 +#: build/trans_presets.java:1666 msgid "Tourism" msgstr "Tourisme" #. group "Tourism" -#: build/trans_presets.java:1648 +#: build/trans_presets.java:1667 msgid "Attraction" msgstr "Attraction" #. item -#: build/trans_presets.java:1649 +#: build/trans_presets.java:1668 msgid "Edit Attraction" msgstr "Editez une attraction" -#. item "Tourism/Attraction" text "Name" -#. item "Tourism/Information Office" text "Name" -#. item "Amenities/Baby Hatch" text "Operator" -#: build/trans_presets.java:1652 build/trans_presets.java:1692 -#: build/trans_presets.java:2392 -msgid "Opening Hours" -msgstr "Horaires d’ouverture" - #. item "Tourism/Attraction" text "Opening Hours" -#: build/trans_presets.java:1654 +#: build/trans_presets.java:1673 msgid "Museum" msgstr "Musée" @@ -16314,10 +17721,9 @@ #. item #. -#: build/trans_presets.java:1656 +#: build/trans_presets.java:1675 msgid "Edit Museum" msgstr "Éditer un musée" -#. item "Tourism/Museum" text "Name" -#: build/trans_presets.java:1660 +#: build/trans_presets.java:1680 msgid "Zoo" msgstr "Zoo" @@ -16326,10 +17732,9 @@ #. -#: build/trans_presets.java:1663 +#: build/trans_presets.java:1683 msgid "Edit Zoo" msgstr "Editez un Zoo" -#. item "Tourism/Zoo" text "Name" -#: build/trans_presets.java:1667 +#: build/trans_presets.java:1688 msgid "Viewpoint" msgstr "Point de vue" @@ -16337,25 +17742,24 @@ #. item #. -#: build/trans_presets.java:1669 +#: build/trans_presets.java:1690 msgid "Edit Viewpoint" msgstr "Éditer un point de vue" #. item "Tourism/Viewpoint" text "Name" -#: build/trans_presets.java:1672 +#: build/trans_presets.java:1693 msgid "Look-Out Tower" msgstr "Tour de surveillance" #. item "Tourism/Viewpoint" check "Look-Out Tower" -#: build/trans_presets.java:1674 +#: build/trans_presets.java:1695 msgid "Theme Park" msgstr "Parc d’attraction" #. item -#: build/trans_presets.java:1675 +#: build/trans_presets.java:1696 msgid "Edit Theme Park" msgstr "Éditer un parc d’attraction" -#. item "Tourism/Theme Park" text "Name" -#: build/trans_presets.java:1679 +#: build/trans_presets.java:1701 msgid "Artwork" msgstr "Oeuvre d’art" @@ -16363,5 +17767,5 @@ #. item #. -#: build/trans_presets.java:1681 +#: build/trans_presets.java:1703 msgid "Edit Artwork" msgstr "Éditer une oeuvre d’art" @@ -16369,86 +17773,211 @@ #. item "Tourism/Artwork" text "Name" #. -#: build/trans_presets.java:1686 +#: build/trans_presets.java:1708 msgid "Information Office" msgstr "Office du Tourisme" -#. item -#. -#: build/trans_presets.java:1688 -msgid "Edit Information Office" -msgstr "Modifier Office du Tourisme" - -#. item "Tourism/Information Office" text "Opening Hours" -#: build/trans_presets.java:1694 +#: build/trans_presets.java:1715 msgid "Map" msgstr "Carte" #. item "Tourism/Map" text "Name" -#: build/trans_presets.java:1698 -msgid "Map Type" -msgstr "Type de carte" - -#. item "Tourism/Map" combo "Map Type" -#: build/trans_presets.java:1698 -msgid "map" -msgstr "carte" - -#: build/trans_presets.java:1698 -msgid "citymap" -msgstr "carte de la ville" - -#: build/trans_presets.java:1698 -msgid "hikingmap" -msgstr "carte de randonnée" - -#: build/trans_presets.java:1698 -msgid "bicyclemap" -msgstr "carte de randonnée cycliste" +#: build/trans_presets.java:1720 +msgid "Detail Grade" +msgstr "" + +#. item "Tourism/Map" combo "Detail Grade" +#: build/trans_presets.java:1720 +#, fuzzy +msgid "topo" +msgstr "Stop" + +#. color tertiary +#. +#. 1 +#. 30000 +#. +#. +#. +#. +#. color deprecated +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#. color highway_track +#. +#. 1 +#. 20000 +#. +#. +#. +#. +#. color street +#. +#. 1 +#. 40000 +#. +#. +#. +#. +#: build/trans_presets.java:1720 build/trans_style.java:619 +#: build/trans_style.java:635 build/trans_style.java:651 +#: build/trans_style.java:659 +msgid "street" +msgstr "rue" + +#: build/trans_presets.java:1720 +#, fuzzy +msgid "scheme" +msgstr "chinois" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "Shown Area" +msgstr "Télécharger zone" + +#. item "Tourism/Map" combo "Shown Area" +#: build/trans_presets.java:1721 +#, fuzzy +msgid "site" +msgstr "Coller" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "city" +msgstr "Ville de plus de 100 000 habitants" + +#: build/trans_presets.java:1721 +#, fuzzy +msgid "region" +msgstr "régional" #. item "Tourism/Other Information Points" text "Name" -#: build/trans_presets.java:1699 build/trans_presets.java:1706 -#: build/trans_presets.java:1719 +#: build/trans_presets.java:1722 build/trans_presets.java:1738 +#: build/trans_presets.java:1782 msgid "Closer Description" msgstr "Description détaillée" #. item "Tourism/Map" text "Closer Description" -#: build/trans_presets.java:1701 +#. +#. item "Tourism/Guidepost" text "Elevation" +#. +#: build/trans_presets.java:1724 build/trans_presets.java:1747 +msgid "Routes shown for:" +msgstr "" + +#. item "Tourism/Map" check "Hiking" +#. item "Tourism/Guidepost" check "Hiking" +#: build/trans_presets.java:1726 build/trans_presets.java:1749 +#: build/trans_presets.java:1955 +msgid "Cycling" +msgstr "Cyclisme" + +#. item "Tourism/Map" check "Cycling" +#. item "Tourism/Guidepost" check "Cycling" +#: build/trans_presets.java:1727 build/trans_presets.java:1750 +#, fuzzy +msgid "Mountainbiking" +msgstr "Chemin de randonnée en montagne" + +#. item "Tourism/Map" check "Mountainbiking" +#. item "Tourism/Guidepost" check "Mountainbiking" +#: build/trans_presets.java:1728 build/trans_presets.java:1751 +#: build/trans_presets.java:2009 +msgid "Skiing" +msgstr "Ski" + +#. item "Tourism/Map" check "Skiing" +#. item "Tourism/Guidepost" check "Skiing" +#: build/trans_presets.java:1729 build/trans_presets.java:1752 +#, fuzzy +msgid "Riding" +msgstr "voie de garage" + +#. item "Tourism/Map" check "Riding" +#. item "Tourism/Guidepost" check "Riding" +#: build/trans_presets.java:1730 build/trans_presets.java:1753 +msgid "... other transportation modes possible" +msgstr "" + +#. item "Tourism/Map" label "... other transportation modes possible" +#: build/trans_presets.java:1732 msgid "Information Board" msgstr "Bureau d'informations" #. item "Tourism/Information Board" text "Name" -#: build/trans_presets.java:1705 -msgid "Board Type" -msgstr "Type de bureau" - -#. item "Tourism/Information Board" combo "Board Type" -#: build/trans_presets.java:1705 -msgid "board" -msgstr "tableau" - -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 +#, fuzzy +msgid "Board Content" +msgstr "Douane" + +#. item "Tourism/Information Board" combo "Board Content" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "notice" +msgstr "verte" + +#: build/trans_presets.java:1737 msgid "history" msgstr "histoire" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "nature" msgstr "nature" -#: build/trans_presets.java:1705 +#: build/trans_presets.java:1737 msgid "wildlife" msgstr "faune" +#: build/trans_presets.java:1737 +#, fuzzy +msgid "plants" +msgstr "utilisation du terrain" + #. item "Tourism/Information Board" text "Closer Description" -#: build/trans_presets.java:1708 -msgid "Guidepost (Hiking)" +#: build/trans_presets.java:1740 +#, fuzzy +msgid "Guidepost" msgstr "Panneau de direction (randonnée)" -#. item "Tourism/Guidepost (Hiking)" text "Elevation" -#: build/trans_presets.java:1715 +#. item "Tourism/Guidepost" label "... other transportation modes possible" +#: build/trans_presets.java:1755 +#, fuzzy +msgid "Information Terminal" +msgstr "Information" + +#. item "Tourism/Information Terminal" text "Name" +#. item "Tourism/Audioguide" text "Name" +#: build/trans_presets.java:1760 build/trans_presets.java:1770 +#, fuzzy +msgid "Closer description" +msgstr "Description détaillée" + +#: build/trans_presets.java:1765 +#, fuzzy +msgid "Audioguide" +msgstr "Audio" + +#. +#: build/trans_presets.java:1775 +msgid "Audioguide via mobile phone?" +msgstr "" + +#. item "Tourism/Audioguide" label "Audioguide via mobile phone?" +#: build/trans_presets.java:1776 +#, fuzzy +msgid "Phone number" +msgstr "Numéro de téléphone" + +#. item "Tourism/Audioguide" text "Phone number" +#: build/trans_presets.java:1778 msgid "Other Information Points" msgstr "Autre points d'information" #. item -#: build/trans_presets.java:1723 +#: build/trans_presets.java:1786 msgid "Edit Shelter" msgstr "Éditer un abri" @@ -16456,25 +17985,25 @@ #. item "Tourism/Shelter" text "Name" #. item "Tourism/Picnic Site" text "Name" -#: build/trans_presets.java:1726 build/trans_presets.java:1732 +#: build/trans_presets.java:1789 build/trans_presets.java:1795 msgid "Fireplace" msgstr "Âtre" #. item "Tourism/Shelter" check "Fireplace" -#: build/trans_presets.java:1728 +#: build/trans_presets.java:1791 msgid "Picnic Site" msgstr "Site de pique-nique" #. item -#: build/trans_presets.java:1729 +#: build/trans_presets.java:1792 msgid "Edit Picnic Site" msgstr "Éditer un site de pique-nique" #. item "Tourism/Picnic Site" check "Fireplace" -#: build/trans_presets.java:1735 +#: build/trans_presets.java:1798 msgid "Historic Places" msgstr "Patrimoine" #. group "Historic Places" -#: build/trans_presets.java:1736 +#: build/trans_presets.java:1799 msgid "Castle" msgstr "Château" @@ -16483,20 +18012,19 @@ #. -#: build/trans_presets.java:1739 +#: build/trans_presets.java:1802 msgid "Edit Castle" msgstr "Éditer un château" #. item "Historic Places/Castle" text "Name" -#: build/trans_presets.java:1743 +#: build/trans_presets.java:1806 msgid "Ruins" msgstr "Ruines" #. item -#: build/trans_presets.java:1744 +#: build/trans_presets.java:1807 msgid "Edit Ruins" msgstr "Éditer des ruines" -#. item "Historic Places/Ruins" text "Name" -#: build/trans_presets.java:1748 +#: build/trans_presets.java:1812 msgid "Archaeological Site" msgstr "Site archéologique" @@ -16505,10 +18033,9 @@ #. -#: build/trans_presets.java:1751 +#: build/trans_presets.java:1815 msgid "Edit Archaeological Site" msgstr "Éditer un site archéologique" -#. item "Historic Places/Archaeological Site" text "Name" -#: build/trans_presets.java:1755 +#: build/trans_presets.java:1820 msgid "Battlefield" msgstr "Lieu de bataille" @@ -16516,5 +18043,5 @@ #. item #. -#: build/trans_presets.java:1757 +#: build/trans_presets.java:1822 msgid "Edit Battlefield" msgstr "Éditer un lieu de bataille" @@ -16522,15 +18049,15 @@ #. item "Historic Places/Battlefield" text "Name" #. -#: build/trans_presets.java:1762 +#: build/trans_presets.java:1827 msgid "Monument" msgstr "Monument commémoratif" #. item -#: build/trans_presets.java:1763 +#: build/trans_presets.java:1828 msgid "Edit Monument" msgstr "Editez un monument" #. item "Historic Places/Monument" text "Name" -#: build/trans_presets.java:1767 +#: build/trans_presets.java:1832 msgid "Memorial" msgstr "Mémorial" @@ -16538,45 +18065,45 @@ #. item #. -#: build/trans_presets.java:1769 +#: build/trans_presets.java:1834 msgid "Edit Memorial" msgstr "Éditer un mémorial" #. item "Historic Places/Memorial" text "Name" -#: build/trans_presets.java:1773 +#: build/trans_presets.java:1838 msgid "Wayside Cross" msgstr "Croix" #. item -#: build/trans_presets.java:1774 +#: build/trans_presets.java:1839 msgid "Edit Wayside Cross" msgstr "Éditer une croix" #. item "Historic Places/Wayside Cross" text "Name" -#: build/trans_presets.java:1778 +#: build/trans_presets.java:1843 msgid "Wayside Shrine" msgstr "Chapelle" #. item -#: build/trans_presets.java:1779 +#: build/trans_presets.java:1844 msgid "Edit Wayside Shrine" msgstr "Éditer une Chapelle" #. item "Historic Places/Wayside Shrine" text "Name" -#: build/trans_presets.java:1784 +#: build/trans_presets.java:1849 msgid "Leisure" msgstr "Loisir" #. group "Leisure" -#: build/trans_presets.java:1785 +#: build/trans_presets.java:1850 msgid "Water Park" msgstr "Parc aquatique" #. item -#: build/trans_presets.java:1786 +#: build/trans_presets.java:1851 msgid "Edit Water Park" msgstr "Éditer un parc aquatique" #. item "Leisure/Water Park" text "Name" -#: build/trans_presets.java:1790 +#: build/trans_presets.java:1855 msgid "Playground" msgstr "Aire de jeux" @@ -16584,15 +18111,15 @@ #. item #. -#: build/trans_presets.java:1792 +#: build/trans_presets.java:1857 msgid "Edit Playground" msgstr "Éditer une zone de jeu" #. item "Leisure/Playground" text "Name" -#: build/trans_presets.java:1796 +#: build/trans_presets.java:1861 msgid "Fishing" msgstr "Pêche" #. item -#: build/trans_presets.java:1797 +#: build/trans_presets.java:1862 msgid "Edit Fishing" msgstr "Éditer un lieu de pêche" @@ -16600,15 +18127,15 @@ #. item "Leisure/Fishing" text "Name" #. -#: build/trans_presets.java:1803 +#: build/trans_presets.java:1868 msgid "Sport Facilities" msgstr "Sport" #. group "Sport Facilities" -#: build/trans_presets.java:1804 +#: build/trans_presets.java:1869 msgid "Stadium" msgstr "Stade" #. item -#: build/trans_presets.java:1805 +#: build/trans_presets.java:1870 msgid "Edit Stadium" msgstr "Éditer un stade" @@ -16622,6 +18149,6 @@ #. item "Sport Facilities/Racetrack" text "Name" #. -#: build/trans_presets.java:1809 build/trans_presets.java:1818 -#: build/trans_presets.java:1827 build/trans_presets.java:1836 +#: build/trans_presets.java:1874 build/trans_presets.java:1883 +#: build/trans_presets.java:1892 build/trans_presets.java:1901 msgid "select sport:" msgstr "Selectionner un sport:" @@ -17013,30 +18540,30 @@ #. #. -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 build/trans_style.java:3653 -#: build/trans_style.java:3661 build/trans_style.java:3669 -#: build/trans_style.java:3677 build/trans_style.java:3685 -#: build/trans_style.java:3693 build/trans_style.java:3701 -#: build/trans_style.java:3709 build/trans_style.java:3717 -#: build/trans_style.java:3725 build/trans_style.java:3733 -#: build/trans_style.java:3741 build/trans_style.java:3749 -#: build/trans_style.java:3757 build/trans_style.java:3765 -#: build/trans_style.java:3773 build/trans_style.java:3781 -#: build/trans_style.java:3789 build/trans_style.java:3797 -#: build/trans_style.java:3805 build/trans_style.java:3813 -#: build/trans_style.java:3821 build/trans_style.java:3829 -#: build/trans_style.java:3837 build/trans_style.java:3845 -#: build/trans_style.java:3853 build/trans_style.java:3861 -#: build/trans_style.java:3869 build/trans_style.java:3877 -#: build/trans_style.java:3885 build/trans_style.java:3893 -#: build/trans_style.java:3901 build/trans_style.java:3909 -#: build/trans_style.java:3917 build/trans_style.java:3925 -#: build/trans_style.java:3933 build/trans_style.java:3941 -#: build/trans_style.java:3949 build/trans_style.java:3957 -#: build/trans_style.java:3965 build/trans_style.java:3973 -#: build/trans_style.java:3981 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: 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 msgid "sport" msgstr "sport" @@ -17046,227 +18573,225 @@ #. item "Sport Facilities/Pitch" combo "sport" #. item "Sport Facilities/Racetrack" combo "sport" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "multi" msgstr "multi" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "archery" msgstr "tir à l'arc" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "athletics" msgstr "athletics" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "australian_football" msgstr "australian_football" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "baseball" msgstr "baseball" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "basketball" msgstr "basketball" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "boules" msgstr "boules" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "bowls" msgstr "boules" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "canoe" msgstr "canoë" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "climbing" msgstr "climbing" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cricket" msgstr "cricket" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cricket_nets" msgstr "cricket_nets" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "croquet" msgstr "croquet" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "cycling" msgstr "cycling" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "dog_racing" msgstr "dog_racing" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "equestrian" msgstr "équitation" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "football" msgstr "football" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "golf" msgstr "golf" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "gymnastics" msgstr "gymnastics" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "hockey" msgstr "hockey" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "horse_racing" msgstr "horse_racing" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "motor" msgstr "moteur" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "pelota" msgstr "pelote" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "racquet" msgstr "racquet" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "rugby" msgstr "rugby" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "shooting" msgstr "chasse" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skateboard" msgstr "skateboard" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skating" msgstr "skate" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "skiing" msgstr "ski" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "soccer" msgstr "football" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "swimming" msgstr "swimming" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "table_tennis" msgstr "table_tennis" -#: build/trans_presets.java:1811 build/trans_presets.java:1820 -#: build/trans_presets.java:1829 build/trans_presets.java:1838 +#: build/trans_presets.java:1876 build/trans_presets.java:1885 +#: build/trans_presets.java:1894 build/trans_presets.java:1903 msgid "tennis" msgstr "tennis" -#: build/trans_presets.java:1813 +#: build/trans_presets.java:1878 msgid "Sports Centre" msgstr "Centre sportif" #. item -#: build/trans_presets.java:1814 +#: build/trans_presets.java:1879 msgid "Edit Sports Centre" msgstr "Éditer un centre sportif" -#: build/trans_presets.java:1822 +#: build/trans_presets.java:1887 msgid "Pitch" msgstr "Terrain de sport" #. item -#: build/trans_presets.java:1823 +#: build/trans_presets.java:1888 msgid "Edit Pitch" msgstr "Éditer un terrain de sport" -#: build/trans_presets.java:1831 +#: build/trans_presets.java:1896 msgid "Racetrack" msgstr "Circuit" #. item -#: build/trans_presets.java:1832 +#: build/trans_presets.java:1897 msgid "Edit Racetrack" msgstr "Éditer un circuit" -#: build/trans_presets.java:1840 +#: build/trans_presets.java:1905 msgid "Golf Course" msgstr "Parcours de Golf" #. item -#: build/trans_presets.java:1841 +#: build/trans_presets.java:1906 msgid "Edit Golf Course" msgstr "Éditer un terrain de golf" -#. item "Sport Facilities/Golf Course" text "Name" -#: build/trans_presets.java:1845 +#: build/trans_presets.java:1911 msgid "Miniature Golf" msgstr "Minigolf" #. item -#: build/trans_presets.java:1846 +#: build/trans_presets.java:1912 msgid "Edit Miniature Golf" msgstr "Éditer un minigolf" -#. item "Sport Facilities/Miniature Golf" text "Name" -#: build/trans_presets.java:1851 +#: build/trans_presets.java:1918 msgid "Sport" msgstr "Sport" #. group "Sport" -#: build/trans_presets.java:1852 +#: build/trans_presets.java:1919 msgid "Multi" msgstr "Multi" #. item -#: build/trans_presets.java:1853 +#: build/trans_presets.java:1920 msgid "Edit Multi" msgstr "Editer Multi" @@ -17305,248 +18830,240 @@ #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "pitch" msgstr "Terrain" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "sports_centre" msgstr "sports_centre" -#: build/trans_presets.java:1856 build/trans_presets.java:1862 -#: build/trans_presets.java:1868 build/trans_presets.java:1874 -#: build/trans_presets.java:1880 build/trans_presets.java:1886 -#: build/trans_presets.java:1892 build/trans_presets.java:1898 -#: build/trans_presets.java:1904 build/trans_presets.java:1910 -#: build/trans_presets.java:1916 build/trans_presets.java:1922 -#: build/trans_presets.java:1928 build/trans_presets.java:1934 -#: build/trans_presets.java:1940 build/trans_presets.java:1949 -#: build/trans_presets.java:1956 build/trans_presets.java:1964 -#: build/trans_presets.java:1970 build/trans_presets.java:1976 -#: build/trans_presets.java:1982 build/trans_presets.java:1988 -#: build/trans_presets.java:1994 build/trans_presets.java:2000 -#: build/trans_presets.java:2006 build/trans_presets.java:2012 -#: build/trans_presets.java:2018 build/trans_presets.java:2024 -#: build/trans_presets.java:2030 build/trans_presets.java:2036 -#: build/trans_presets.java:2042 build/trans_presets.java:2048 -#: build/trans_presets.java:2054 build/trans_presets.java:2060 +#: build/trans_presets.java:1923 build/trans_presets.java:1929 +#: build/trans_presets.java:1935 build/trans_presets.java:1941 +#: build/trans_presets.java:1947 build/trans_presets.java:1953 +#: build/trans_presets.java:1959 build/trans_presets.java:1965 +#: build/trans_presets.java:1971 build/trans_presets.java:1977 +#: build/trans_presets.java:1983 build/trans_presets.java:1989 +#: build/trans_presets.java:1995 build/trans_presets.java:2001 +#: build/trans_presets.java:2007 build/trans_presets.java:2016 +#: build/trans_presets.java:2023 build/trans_presets.java:2031 +#: build/trans_presets.java:2037 build/trans_presets.java:2043 +#: build/trans_presets.java:2049 build/trans_presets.java:2055 +#: build/trans_presets.java:2061 build/trans_presets.java:2067 +#: build/trans_presets.java:2073 build/trans_presets.java:2079 +#: build/trans_presets.java:2085 build/trans_presets.java:2091 +#: build/trans_presets.java:2097 build/trans_presets.java:2103 +#: build/trans_presets.java:2109 build/trans_presets.java:2115 +#: build/trans_presets.java:2121 build/trans_presets.java:2127 msgid "stadium" msgstr "stadium" -#: build/trans_presets.java:1858 +#: build/trans_presets.java:1925 msgid "10pin" msgstr "Bowling" #. item -#: build/trans_presets.java:1859 +#: build/trans_presets.java:1926 msgid "Edit 10pin" msgstr "Éditer un Bowling" -#: build/trans_presets.java:1864 +#: build/trans_presets.java:1931 msgid "Athletics" msgstr "Athlétisme" #. item -#: build/trans_presets.java:1865 +#: build/trans_presets.java:1932 msgid "Edit Athletics" msgstr "Éditer athlétisme" -#: build/trans_presets.java:1870 +#: build/trans_presets.java:1937 msgid "Archery" msgstr "Tir à l’arc" #. item -#: build/trans_presets.java:1871 +#: build/trans_presets.java:1938 msgid "Edit Archery" msgstr "Éditer tir à l’arc" -#: build/trans_presets.java:1876 +#: build/trans_presets.java:1943 msgid "Climbing" msgstr "Escalade" #. item -#: build/trans_presets.java:1877 +#: build/trans_presets.java:1944 msgid "Edit Climbing" msgstr "Éditer escalade" -#: build/trans_presets.java:1882 +#: build/trans_presets.java:1949 msgid "Canoeing" msgstr "Canoë" #. item -#: build/trans_presets.java:1883 +#: build/trans_presets.java:1950 msgid "Edit Canoeing" msgstr "Éditer canoë" -#: build/trans_presets.java:1888 -msgid "Cycling" -msgstr "Cyclisme" - -#. item -#: build/trans_presets.java:1889 +#. item +#: build/trans_presets.java:1956 msgid "Edit Cycling" msgstr "Éditer cyclisme" -#: build/trans_presets.java:1894 +#: build/trans_presets.java:1961 msgid "Dog Racing" msgstr "Course de chiens" #. item -#: build/trans_presets.java:1895 +#: build/trans_presets.java:1962 msgid "Edit Dog Racing" msgstr "Éditer course de chiens" -#: build/trans_presets.java:1900 +#: build/trans_presets.java:1967 msgid "Equestrian" msgstr "Equitation" #. item -#: build/trans_presets.java:1901 +#: build/trans_presets.java:1968 msgid "Edit Equestrian" msgstr "Éditer sports équestres" -#: build/trans_presets.java:1906 +#: build/trans_presets.java:1973 msgid "Horse Racing" msgstr "Course de chevaux" #. item -#: build/trans_presets.java:1907 +#: build/trans_presets.java:1974 msgid "Edit Horse Racing" msgstr "Éditer course de chevaux" -#: build/trans_presets.java:1912 +#: build/trans_presets.java:1979 msgid "Gymnastics" msgstr "Gymnastique" #. item -#: build/trans_presets.java:1913 +#: build/trans_presets.java:1980 msgid "Edit Gymnastics" msgstr "Éditer gymnastique" -#: build/trans_presets.java:1918 +#: build/trans_presets.java:1985 msgid "Motor Sports" msgstr "Sports mécaniques" #. item -#: build/trans_presets.java:1919 +#: build/trans_presets.java:1986 msgid "Edit Motor Sports" msgstr "Éditer sports mécaniques" -#: build/trans_presets.java:1924 +#: build/trans_presets.java:1991 msgid "Skating" msgstr "Skate" #. item -#: build/trans_presets.java:1925 +#: build/trans_presets.java:1992 msgid "Edit Skating" msgstr "Éditer patin à roulettes" -#: build/trans_presets.java:1930 +#: build/trans_presets.java:1997 msgid "Skateboard" msgstr "Skateboard" #. item -#: build/trans_presets.java:1931 +#: build/trans_presets.java:1998 msgid "Edit Skateboard" msgstr "Éditer skateboard" -#: build/trans_presets.java:1936 +#: build/trans_presets.java:2003 msgid "Swimming" msgstr "Natation" #. item -#: build/trans_presets.java:1937 +#: build/trans_presets.java:2004 msgid "Edit Swimming" msgstr "Éditer natation" -#: build/trans_presets.java:1942 -msgid "Skiing" -msgstr "Ski" - #. item #. -#: build/trans_presets.java:1944 +#: build/trans_presets.java:2011 msgid "Edit Skiing" msgstr "ski" #. item "Sport/Skiing" text "Name" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "Piste type" msgstr "Type de piste" #. item "Sport/Skiing" combo "Piste type" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "downhill" msgstr "de descente" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "nordic" msgstr "nordique" -#: build/trans_presets.java:1947 +#: build/trans_presets.java:2014 msgid "snow_park" msgstr "snow park" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "Difficulty" msgstr "Difficulté" #. item "Sport/Skiing" combo "Difficulty" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "novice" msgstr "verte" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "easy" msgstr "bleue" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "intermediate" msgstr "intermédiaire" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "advanced" msgstr "avancé" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "expert" msgstr "expert" -#: build/trans_presets.java:1948 +#: build/trans_presets.java:2015 msgid "freeride" msgstr "jaune" -#: build/trans_presets.java:1951 +#: build/trans_presets.java:2018 msgid "Shooting" msgstr "Tirer" @@ -17554,178 +19071,178 @@ #. item #. -#: build/trans_presets.java:1953 +#: build/trans_presets.java:2020 msgid "Edit Shooting" msgstr "Éditer tir sportif" -#: build/trans_presets.java:1959 +#: build/trans_presets.java:2026 msgid "Sport (Ball)" msgstr "Sport de balle" #. group "Sport (Ball)" -#: build/trans_presets.java:1960 +#: build/trans_presets.java:2027 msgid "Soccer" msgstr "Football" #. item -#: build/trans_presets.java:1961 +#: build/trans_presets.java:2028 msgid "Edit Soccer" msgstr "Éditer football" -#: build/trans_presets.java:1966 +#: build/trans_presets.java:2033 msgid "Football" msgstr "Football" #. item -#: build/trans_presets.java:1967 +#: build/trans_presets.java:2034 msgid "Edit Football" msgstr "Éditer football" -#: build/trans_presets.java:1972 +#: build/trans_presets.java:2039 msgid "Australian Football" msgstr "Football australien" #. item -#: build/trans_presets.java:1973 +#: build/trans_presets.java:2040 msgid "Edit Australian Football" msgstr "Éditer football australien" -#: build/trans_presets.java:1978 +#: build/trans_presets.java:2045 msgid "Baseball" msgstr "Baseball" #. item -#: build/trans_presets.java:1979 +#: build/trans_presets.java:2046 msgid "Edit Baseball" msgstr "Éditer baseball" -#: build/trans_presets.java:1984 +#: build/trans_presets.java:2051 msgid "Basketball" msgstr "Basketball" #. item -#: build/trans_presets.java:1985 +#: build/trans_presets.java:2052 msgid "Edit Basketball" msgstr "Éditer basketball" -#: build/trans_presets.java:1990 +#: build/trans_presets.java:2057 msgid "Golf" msgstr "Golf" #. item -#: build/trans_presets.java:1991 +#: build/trans_presets.java:2058 msgid "Edit Golf" msgstr "Editer un Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:1994 +#: build/trans_presets.java:2061 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:1996 +#: build/trans_presets.java:2063 msgid "Boule" msgstr "Boules" #. item -#: build/trans_presets.java:1997 +#: build/trans_presets.java:2064 msgid "Edit Boule" msgstr "Éditer boules" -#: build/trans_presets.java:2002 +#: build/trans_presets.java:2069 msgid "Bowls" msgstr "Boules" #. item -#: build/trans_presets.java:2003 +#: build/trans_presets.java:2070 msgid "Edit Bowls" msgstr "Éditer bowls" -#: build/trans_presets.java:2008 +#: build/trans_presets.java:2075 msgid "Cricket" msgstr "Cricket" #. item -#: build/trans_presets.java:2009 +#: build/trans_presets.java:2076 msgid "Edit Cricket" msgstr "Éditer cricket" -#: build/trans_presets.java:2014 +#: build/trans_presets.java:2081 msgid "Cricket Nets" msgstr "Filets de cricket" #. item -#: build/trans_presets.java:2015 +#: build/trans_presets.java:2082 msgid "Edit Cricket Nets" msgstr "Éditer filets de cricket" -#: build/trans_presets.java:2020 +#: build/trans_presets.java:2087 msgid "Croquet" msgstr "Croquet" #. item -#: build/trans_presets.java:2021 +#: build/trans_presets.java:2088 msgid "Edit Croquet" msgstr "Éditer croquet" -#: build/trans_presets.java:2026 +#: build/trans_presets.java:2093 msgid "Hockey" msgstr "Hockey" #. item -#: build/trans_presets.java:2027 +#: build/trans_presets.java:2094 msgid "Edit Hockey" msgstr "Éditer hockey" -#: build/trans_presets.java:2032 +#: build/trans_presets.java:2099 msgid "Pelota" msgstr "Pelote" #. item -#: build/trans_presets.java:2033 +#: build/trans_presets.java:2100 msgid "Edit Pelota" msgstr "Éditer pelote basque" -#: build/trans_presets.java:2038 +#: build/trans_presets.java:2105 msgid "Racquet" msgstr "Sports de raquette" #. item -#: build/trans_presets.java:2039 +#: build/trans_presets.java:2106 msgid "Edit Racquet" msgstr "Éditer sports de raquette" -#: build/trans_presets.java:2044 +#: build/trans_presets.java:2111 msgid "Rugby" msgstr "Rugby" #. item -#: build/trans_presets.java:2045 +#: build/trans_presets.java:2112 msgid "Edit Rugby" msgstr "Éditer rugby" -#: build/trans_presets.java:2050 +#: build/trans_presets.java:2117 msgid "Table Tennis" msgstr "Tennis de table" #. item -#: build/trans_presets.java:2051 +#: build/trans_presets.java:2118 msgid "Edit Table Tennis" msgstr "Éditer tennis de table" -#: build/trans_presets.java:2056 +#: build/trans_presets.java:2123 msgid "Tennis" msgstr "Tennis" #. item -#: build/trans_presets.java:2057 +#: build/trans_presets.java:2124 msgid "Edit Tennis" msgstr "Éditer tennis" #. -#: build/trans_presets.java:2064 +#: build/trans_presets.java:2131 msgid "Buildings" msgstr "Bâtiments" #. group "Buildings" -#: build/trans_presets.java:2065 +#: build/trans_presets.java:2132 msgid "Building" msgstr "Bâtiment" @@ -17733,5 +19250,5 @@ #. item #. -#: build/trans_presets.java:2068 +#: build/trans_presets.java:2135 msgid "Public Building" msgstr "Bâtiment officiel" @@ -17739,10 +19256,10 @@ #. item #. -#: build/trans_presets.java:2070 +#: build/trans_presets.java:2137 msgid "Edit Public Building" msgstr "Éditer un bâtiment officiel" #. item "Buildings/Public Building" text "Name" -#: build/trans_presets.java:2074 +#: build/trans_presets.java:2141 msgid "Town hall" msgstr "Mairie" @@ -17750,10 +19267,10 @@ #. item #. -#: build/trans_presets.java:2076 +#: build/trans_presets.java:2143 msgid "Edit Town hall" msgstr "Éditer une mairie" #. item "Buildings/Town hall" text "Name" -#: build/trans_presets.java:2080 +#: build/trans_presets.java:2147 msgid "Embassy" msgstr "Ambassade" @@ -17761,10 +19278,10 @@ #. item #. -#: build/trans_presets.java:2082 +#: build/trans_presets.java:2149 msgid "Edit Embassy" msgstr "Editer une ambassade" #. item "Buildings/Embassy" text "Name" -#: build/trans_presets.java:2086 +#: build/trans_presets.java:2153 msgid "Courthouse" msgstr "Palais de justice" @@ -17773,10 +19290,10 @@ #. -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2156 msgid "Edit Courthouse" msgstr "Éditer un palais de justice" #. item "Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2093 +#: build/trans_presets.java:2160 msgid "Prison" msgstr "Prison" @@ -17785,10 +19302,10 @@ #. -#: build/trans_presets.java:2096 +#: build/trans_presets.java:2163 msgid "Edit Prison" msgstr "Éditer une prison" #. item "Buildings/Prison" text "Name" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2167 msgid "Police" msgstr "Poste de police" @@ -17798,10 +19315,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:2104 +#: build/trans_presets.java:2171 msgid "Edit Police" msgstr "Éditer un poste de police" #. item "Buildings/Police" text "Name" -#: build/trans_presets.java:2108 +#: build/trans_presets.java:2175 msgid "Fire Station" msgstr "Caserne de pompiers" @@ -17810,10 +19327,10 @@ #. -#: build/trans_presets.java:2111 +#: build/trans_presets.java:2178 msgid "Edit Fire Station" msgstr "Éditer une caserne de pompiers" #. item "Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2115 +#: build/trans_presets.java:2182 msgid "Post Office" msgstr "Bureau de poste" @@ -17821,5 +19338,5 @@ #. item #. -#: build/trans_presets.java:2117 +#: build/trans_presets.java:2184 msgid "Edit Post Office" msgstr "Éditer un bureau de poste" @@ -17827,15 +19344,15 @@ #. item "Buildings/Post Office" text "Name" #. -#: build/trans_presets.java:2122 +#: build/trans_presets.java:2189 msgid "Kindergarten" msgstr "Jardin d’enfants" #. item -#: build/trans_presets.java:2123 +#: build/trans_presets.java:2190 msgid "Edit Kindergarten" msgstr "Éditer un jardin d’enfants" #. item "Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2127 +#: build/trans_presets.java:2194 msgid "School" msgstr "École" @@ -17843,10 +19360,10 @@ #. item #. -#: build/trans_presets.java:2129 +#: build/trans_presets.java:2196 msgid "Edit School" msgstr "Éditer une école" #. item "Buildings/School" text "Name" -#: build/trans_presets.java:2133 +#: build/trans_presets.java:2200 msgid "University" msgstr "Université" @@ -17854,10 +19371,10 @@ #. item #. -#: build/trans_presets.java:2135 +#: build/trans_presets.java:2202 msgid "Edit University" msgstr "Éditer une université" #. item "Buildings/University" text "Name" -#: build/trans_presets.java:2139 +#: build/trans_presets.java:2206 msgid "College" msgstr "Établissement d’enseignement supérieur" @@ -17865,5 +19382,5 @@ #. item #. -#: build/trans_presets.java:2141 +#: build/trans_presets.java:2208 msgid "Edit College" msgstr "Éditer un établissement d’enseignement supérieur" @@ -17871,5 +19388,5 @@ #. item "Buildings/College" text "Name" #. -#: build/trans_presets.java:2146 +#: build/trans_presets.java:2213 msgid "Cinema" msgstr "Cinema" @@ -17878,10 +19395,10 @@ #. -#: build/trans_presets.java:2149 +#: build/trans_presets.java:2216 msgid "Edit Cinema" msgstr "Éditer un cinéma" #. item "Buildings/Cinema" text "Name" -#: build/trans_presets.java:2153 +#: build/trans_presets.java:2220 msgid "Library" msgstr "Bibliothèque" @@ -17890,10 +19407,9 @@ #. -#: build/trans_presets.java:2156 +#: build/trans_presets.java:2223 msgid "Edit Library" msgstr "Éditer une bibliothèque" -#. item "Buildings/Library" text "Name" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2228 msgid "Arts Centre" msgstr "Centre artistique" @@ -17901,10 +19417,10 @@ #. item #. -#: build/trans_presets.java:2162 +#: build/trans_presets.java:2230 msgid "Edit Arts Centre" msgstr "Éditer un centre artistique" #. item "Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2166 +#: build/trans_presets.java:2234 msgid "Theatre" msgstr "Théâtre" @@ -17913,10 +19429,10 @@ #. -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2237 msgid "Edit Theatre" msgstr "Éditer un théatre" #. item "Buildings/Theatre" text "Name" -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2241 msgid "Place of Worship" msgstr "Lieu de culte" @@ -17926,5 +19442,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:2177 +#: build/trans_presets.java:2245 msgid "Edit Place of Worship" msgstr "Éditer un lieu de culte" @@ -17933,6 +19449,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "Religion" msgstr "Religion" @@ -17941,66 +19457,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "unitarian" msgstr "unitarisme" -#: build/trans_presets.java:2180 build/trans_presets.java:2901 -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2248 build/trans_presets.java:3029 +#: build/trans_presets.java:3038 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "Denomination" msgstr "Dénomination" @@ -18009,81 +19525,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "catholic" msgstr "catholique" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2181 build/trans_presets.java:2902 -#: build/trans_presets.java:2911 +#: build/trans_presets.java:2249 build/trans_presets.java:3030 +#: build/trans_presets.java:3039 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2184 +#: build/trans_presets.java:2253 msgid "Addresses" msgstr "Adresses" @@ -18092,5 +19608,5 @@ #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2256 msgid "Edit Address Information" msgstr "Editez l'adresse" @@ -18098,5 +19614,5 @@ #. item "Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2189 +#: build/trans_presets.java:2258 msgid "House number" msgstr "Numéro du bâtiment" @@ -18104,20 +19620,20 @@ #. item "Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2260 msgid "House name" msgstr "Nom de la maison" #. item "Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2193 +#: build/trans_presets.java:2262 msgid "City name" msgstr "Nom de la ville" #. item "Buildings/Addresses" text "City name" -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2263 msgid "Post code" msgstr "Code postal" #. item "Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2195 +#: build/trans_presets.java:2264 msgid "Country code" msgstr "Indicatif du pays" @@ -18125,5 +19641,5 @@ #. item "Buildings/Addresses" text "Country code" #. -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2267 msgid "Address Interpolation" msgstr "Interpolation d’adresse" @@ -18132,5 +19648,5 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2270 msgid "Edit Address Interpolation" msgstr "Éditer l’interpolation d’adresse" @@ -18138,71 +19654,67 @@ #. item "Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "Numbering scheme" msgstr "Schéma de numérotation" #. item "Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "odd" msgstr "pair" -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "even" msgstr "impair" -#: build/trans_presets.java:2203 -msgid "all" -msgstr "all" - -#: build/trans_presets.java:2203 +#: build/trans_presets.java:2272 msgid "alphabetic" msgstr "alphabétique" -#: build/trans_presets.java:2206 +#: build/trans_presets.java:2275 msgid "Man Made" msgstr "Édifices" #. group "Man Made" -#: build/trans_presets.java:2207 +#: build/trans_presets.java:2276 msgid "Works" msgstr "Usine" #. item -#: build/trans_presets.java:2208 +#: build/trans_presets.java:2277 msgid "Edit Works" msgstr "Éditer une usine" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2212 +#: build/trans_presets.java:2281 msgid "Tower" msgstr "Structure de hauteur" #. item -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2282 msgid "Edit Tower" msgstr "Éditer une structure de hauteur" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2217 +#: build/trans_presets.java:2286 msgid "Water Tower" msgstr "Château d’eau" #. item -#: build/trans_presets.java:2218 +#: build/trans_presets.java:2287 msgid "Edit Water Tower" msgstr "Éditer un château d’eau" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2291 msgid "Gasometer" msgstr "Gazomètre" #. item -#: build/trans_presets.java:2223 +#: build/trans_presets.java:2292 msgid "Edit Gasometer" msgstr "Éditer un gazomètre" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2227 +#: build/trans_presets.java:2296 msgid "Lighthouse" msgstr "Phare" @@ -18210,10 +19722,10 @@ #. item #. -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2298 msgid "Edit Lighthouse" msgstr "Éditer un phare" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2302 msgid "Windmill" msgstr "Moulin à vent" @@ -18221,10 +19733,10 @@ #. item #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2304 msgid "Edit Windmill" msgstr "Éditer un moulin à vent" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2308 msgid "Pipeline" msgstr "Pipeline" @@ -18232,10 +19744,10 @@ #. item #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2310 msgid "Edit Pipeline" msgstr "Éditer un pipeline" #. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2314 msgid "Wastewater Plant" msgstr "Station d’épuration" @@ -18245,10 +19757,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:2249 +#: build/trans_presets.java:2318 msgid "Edit Wastewater Plant" msgstr "Éditer une station d’épuration" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2253 +#: build/trans_presets.java:2322 msgid "Crane" msgstr "Grue" @@ -18256,10 +19768,10 @@ #. item #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2324 msgid "Edit Crane" msgstr "Éditer une grue permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2328 msgid "Beacon" msgstr "Balise signalétique" @@ -18267,10 +19779,10 @@ #. item #. -#: build/trans_presets.java:2261 +#: build/trans_presets.java:2330 msgid "Edit Beacon" msgstr "Editer balise signalétique" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2265 +#: build/trans_presets.java:2334 msgid "Survey Point" msgstr "Équipement de topographie" @@ -18278,10 +19790,10 @@ #. item #. -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2336 msgid "Edit Survey Point" msgstr "Éditer un équipement de topographie" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2271 +#: build/trans_presets.java:2340 msgid "Surveillance" msgstr "Surveillance" @@ -18289,5 +19801,5 @@ #. item #. -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2342 msgid "Edit Surveillance Camera" msgstr "Éditer une caméra de surveillance" @@ -18295,5 +19807,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2278 +#: build/trans_presets.java:2347 msgid "Power Generator" msgstr "Centrale électrique" @@ -18303,39 +19815,39 @@ #. 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:2282 +#: build/trans_presets.java:2351 msgid "Edit Power Generator" msgstr "Éditer une centrale électrique" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "coal" msgstr "charbon" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "photovoltaic" msgstr "photovoltaïque" -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2353 msgid "gas" msgstr "gaz" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2287 +#: build/trans_presets.java:2356 msgid "Power Station" msgstr "Station électrique" @@ -18344,10 +19856,10 @@ #. -#: build/trans_presets.java:2290 +#: build/trans_presets.java:2359 msgid "Edit Power Station" msgstr "Editez une station électrique" #. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2294 +#: build/trans_presets.java:2363 msgid "Power Sub Station" msgstr "Transformateur électrique" @@ -18356,5 +19868,5 @@ #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2366 msgid "Edit Power Sub Station" msgstr "Modifier transformateur électrique" @@ -18362,10 +19874,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2300 build/trans_presets.java:2316 +#: build/trans_presets.java:2369 build/trans_presets.java:2385 msgid "Line reference" msgstr "Champ de vision" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2371 msgid "Power Tower" msgstr "Pylône électrique" @@ -18376,5 +19888,5 @@ #. 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:2307 +#: build/trans_presets.java:2376 msgid "Edit Power Tower" msgstr "Éditer un pylône électrique" @@ -18382,5 +19894,5 @@ #. item "Man Made/Power Tower" label "Edit Power Tower" #. -#: build/trans_presets.java:2310 +#: build/trans_presets.java:2379 msgid "Power Line" msgstr "Ligne de courant" @@ -18389,46 +19901,40 @@ #. -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2382 msgid "Edit Power Line" msgstr "Editez une ligne de courant" #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2317 +#: build/trans_presets.java:2386 msgid "Voltage" msgstr "Tension" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2318 +#: build/trans_presets.java:2387 msgid "Amount of Wires" msgstr "Nombre de câbles" #. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2390 msgid "Amenities" msgstr "Équipements" #. group "Amenities" -#: build/trans_presets.java:2322 +#: build/trans_presets.java:2391 msgid "Toilets" msgstr "Toilettes" -#. item "Amenities/Toilets" text "Operator" -#. item "Shops/Vending machine" text "Operator" -#: build/trans_presets.java:2327 build/trans_presets.java:2419 -msgid "Reference number" -msgstr "Numéro de référence" - #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2329 build/trans_presets.java:2420 +#: build/trans_presets.java:2398 build/trans_presets.java:2511 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2400 msgid "Post Box" msgstr "Boîte aux lettres" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2405 msgid "Telephone" msgstr "Téléphone" @@ -18437,5 +19943,5 @@ #. -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2408 msgid "Edit Telephone" msgstr "Éditer un téléphone" @@ -18443,5 +19949,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2342 build/trans_presets.java:2421 +#: build/trans_presets.java:2411 build/trans_presets.java:2512 msgid "Coins" msgstr "Pièces" @@ -18449,5 +19955,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2343 build/trans_presets.java:2422 +#: build/trans_presets.java:2412 build/trans_presets.java:2513 msgid "Notes" msgstr "Billets" @@ -18455,5 +19961,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2344 build/trans_presets.java:2423 +#: build/trans_presets.java:2413 build/trans_presets.java:2514 msgid "Electronic purses and Charge cards" msgstr "Cartes de crédit temporaire" @@ -18461,5 +19967,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2345 build/trans_presets.java:2424 +#: build/trans_presets.java:2414 build/trans_presets.java:2515 msgid "Debit cards" msgstr "Cartes de débit" @@ -18467,15 +19973,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2346 build/trans_presets.java:2425 +#: build/trans_presets.java:2415 build/trans_presets.java:2516 msgid "Credit cards" msgstr "Cartes de crédits" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2416 msgid "Telephone cards" msgstr "Cartes téléphoniques" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2349 +#: build/trans_presets.java:2418 msgid "Recycling" msgstr "Recyclage" @@ -18484,5 +19990,5 @@ #. -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2421 msgid "Edit Recycling station" msgstr "Éditer un point de recylcage" @@ -18490,80 +19996,76 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2354 +#: build/trans_presets.java:2423 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2424 msgid "Cans" msgstr "Canettes" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2356 +#: build/trans_presets.java:2425 msgid "Clothes" msgstr "Vêtements" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2357 +#: build/trans_presets.java:2426 msgid "Glass" msgstr "Verre" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2427 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2428 msgid "Scrap Metal" msgstr "Ferrailleur" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2430 msgid "Bench" msgstr "Banc" -#. item -#. -#. -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2435 msgid "Hunting Stand" msgstr "Hutte de chasse" #. item -#: build/trans_presets.java:2366 +#: build/trans_presets.java:2436 msgid "Edit Hunting Stand" msgstr "Hutte de chasse" -#. item "Amenities/Hunting Stand" check "Shelter" -#: build/trans_presets.java:2369 +#. item "Amenities/Hunting Stand" label "Edit Hunting Stand" +#. +#. item "Land use/Tree" text "Type" +#: build/trans_presets.java:2438 build/trans_presets.java:2899 +msgid "Height" +msgstr "Hauteur" + +#. item "Amenities/Hunting Stand" combo "Height" +#: build/trans_presets.java:2438 +msgid "low" +msgstr "faible" + +#: build/trans_presets.java:2438 +msgid "half" +msgstr "à moitié" + +#: build/trans_presets.java:2438 +msgid "full" +msgstr "complet" + +#: build/trans_presets.java:2440 msgid "Hide" msgstr "Masquer" -#. item "Amenities/Hunting Stand" check "Hide" -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2441 msgid "Lock" msgstr "Verrouiller" -#. item "Amenities/Hunting Stand" check "Lock" -#. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2371 build/trans_presets.java:2771 -msgid "Height" -msgstr "Hauteur" - -#. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2371 -msgid "low" -msgstr "faible" - -#: build/trans_presets.java:2371 -msgid "half" -msgstr "à moitié" - -#: build/trans_presets.java:2371 -msgid "full" -msgstr "complet" - -#: build/trans_presets.java:2373 +#: build/trans_presets.java:2443 msgid "Fountain" msgstr "Fontaine" @@ -18572,10 +20074,10 @@ #. -#: build/trans_presets.java:2376 +#: build/trans_presets.java:2446 msgid "Edit Fountain" msgstr "Éditer une fontaine" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2380 +#: build/trans_presets.java:2450 msgid "Drinking Water" msgstr "Eau potable" @@ -18584,10 +20086,10 @@ #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2453 msgid "Edit Drinking Water" msgstr "Éditer un point d’eau potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2457 msgid "Baby Hatch" msgstr "Tour d’abandon (nouveau né)" @@ -18595,25 +20097,35 @@ #. item #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2459 msgid "Edit Baby Hatch" msgstr "Éditer un tour d’abandon" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2465 msgid "Shops" msgstr "Magasins" #. group "Shops" -#: build/trans_presets.java:2396 +#: build/trans_presets.java:2466 msgid "Supermarket" msgstr "Supermarché" #. item -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2467 msgid "Edit Supermarket" msgstr "Éditer un supermarché" -#. item "Shops/Supermarket" text "Name" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2472 +#, fuzzy +msgid "Chemist" +msgstr "Châlet" + +#. item +#: build/trans_presets.java:2473 +#, fuzzy +msgid "Edit Chemist" +msgstr "Editez un châlet" + +#: build/trans_presets.java:2478 msgid "Convenience Store" msgstr "Commerce de proximité" @@ -18621,10 +20133,9 @@ #. item #. -#: build/trans_presets.java:2403 +#: build/trans_presets.java:2480 msgid "Edit Convenience Store" msgstr "Éditer une épicerie" -#. item "Shops/Convenience Store" text "Name" -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2485 msgid "Kiosk" msgstr "Kiosque à journaux" @@ -18632,10 +20143,29 @@ #. item #. -#: build/trans_presets.java:2409 +#: build/trans_presets.java:2487 msgid "Edit Kiosk" msgstr "Éditer un kiosque à journaux" -#. item "Shops/Kiosk" text "Name" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2492 +msgid "Book Store" +msgstr "" + +#. item +#: build/trans_presets.java:2493 +#, fuzzy +msgid "Edit Book Store" +msgstr "Éditer un arrêt de bus" + +#: build/trans_presets.java:2498 +msgid "Travel Agency" +msgstr "" + +#. item +#: build/trans_presets.java:2499 +#, fuzzy +msgid "Edit Travel Agency" +msgstr "Éditer un arbre isolé" + +#: build/trans_presets.java:2504 msgid "Vending machine" msgstr "Distributeur automatique" @@ -18643,5 +20173,5 @@ #. item #. -#: build/trans_presets.java:2415 +#: build/trans_presets.java:2506 msgid "Edit Vending machine" msgstr "Éditer un distributeur automatique" @@ -18649,88 +20179,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "Vending products" msgstr "Produits vendus" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "food" msgstr "food" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "sweets" msgstr "bonbons" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "toys" msgstr "jouets" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2417 +#: build/trans_presets.java:2508 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2517 msgid "Account or loyalty cards" msgstr "Cartes de fidélité" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2519 msgid "Butcher" msgstr "Boucherie" @@ -18738,10 +20268,9 @@ #. item #. -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2521 msgid "Edit Butcher" msgstr "Éditer une boucherie" -#. item "Shops/Butcher" text "Name" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2526 msgid "Baker" msgstr "Boulanger" @@ -18749,10 +20278,9 @@ #. item #. -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2528 msgid "Edit Baker" msgstr "Éditer une boulangerie" -#. item "Shops/Baker" text "Name" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2533 msgid "Florist" msgstr "Fleuriste" @@ -18760,20 +20288,18 @@ #. item #. -#: build/trans_presets.java:2442 +#: build/trans_presets.java:2535 msgid "Edit Florist" msgstr "Modifier fleuriste" -#. item "Shops/Florist" text "Name" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2540 msgid "Organic" msgstr "Boutique bio" #. item -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2541 msgid "Edit Organic Shop" msgstr "Modifier boutique bio" -#. item "Shops/Organic" text "Name" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2546 msgid "Alcohol" msgstr "Alcool" @@ -18781,60 +20307,54 @@ #. item #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2548 msgid "Edit Alcohol Shop" msgstr "Modifier commerce d'acool" -#. item "Shops/Alcohol" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2553 msgid "Beverages" msgstr "Boissons" #. item -#: build/trans_presets.java:2458 +#: build/trans_presets.java:2554 msgid "Edit Beverages Shop" msgstr "Modifier débit de boissons" -#. item "Shops/Beverages" text "Name" -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2559 msgid "Computer" msgstr "Informatique" #. item -#: build/trans_presets.java:2463 +#: build/trans_presets.java:2560 msgid "Edit Computer Shop" msgstr "Modifier magasin informatique" -#. item "Shops/Computer" text "Name" -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2565 msgid "Electronics" msgstr "Électronique" #. item -#: build/trans_presets.java:2468 +#: build/trans_presets.java:2566 msgid "Edit Electronics Shop" msgstr "Modifier magasin d’électronique" -#. item "Shops/Electronics" text "Name" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2571 msgid "Hifi" msgstr "Hi-Fi" #. item -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2572 msgid "Edit Hifi Shop" msgstr "Modifier boutique Hi-Fi" -#. item "Shops/Hifi" text "Name" -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2577 msgid "Furniture" msgstr "Ameublement" #. item -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2578 msgid "Edit Furniture Shop" msgstr "Modifier magasin d’ameublement" -#. item "Shops/Furniture" text "Name" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2583 msgid "Garden Centre" msgstr "Jardinerie" @@ -18842,10 +20362,9 @@ #. item #. -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2585 msgid "Edit Garden Centre" msgstr "Modifier jardinerie" -#. item "Shops/Garden Centre" text "Name" -#: build/trans_presets.java:2488 +#: build/trans_presets.java:2590 msgid "Hardware" msgstr "Quincaillerie" @@ -18853,10 +20372,9 @@ #. item #. -#: build/trans_presets.java:2490 +#: build/trans_presets.java:2592 msgid "Edit Hardware Store" msgstr "Modifier quincaillerie" -#. item "Shops/Hardware" text "Name" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2597 msgid "Do-it-yourself-store" msgstr "Magasin de bricolage" @@ -18864,60 +20382,54 @@ #. item #. -#: build/trans_presets.java:2496 +#: build/trans_presets.java:2599 msgid "Edit Do-it-yourself-store" msgstr "Éditer un magasin de bricolage" -#. item "Shops/Do-it-yourself-store" text "Name" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2604 msgid "Stationery" msgstr "Papeterie" #. item -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2605 msgid "Edit Stationery Shop" msgstr "Modifier papeterie" -#. item "Shops/Stationery" text "Name" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2610 msgid "Hairdresser" msgstr "Coiffeur" #. item -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2611 msgid "Edit Hairdresser" msgstr "Editez un Coiffeur" -#. item "Shops/Hairdresser" text "Name" -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2616 msgid "Shoes" msgstr "Magasin de chaussures" #. item -#: build/trans_presets.java:2511 +#: build/trans_presets.java:2617 msgid "Edit Shoe Shop" msgstr "Modifier magasin de chaussures" -#. item "Shops/Shoes" text "Name" -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2622 msgid "Toys" msgstr "Jouets" #. item -#: build/trans_presets.java:2516 +#: build/trans_presets.java:2623 msgid "Edit Toy Shop" msgstr "Modifier magasin de jouets" -#. item "Shops/Toys" text "Name" -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2628 msgid "Video" msgstr "Vidéoclub" #. item -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2629 msgid "Edit Video Shop" msgstr "Modifier vidéoclub" -#. item "Shops/Video" text "Name" -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2634 msgid "Dry Cleaning" msgstr "Pressing" @@ -18925,10 +20437,9 @@ #. item #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2636 msgid "Edit Dry Cleaning" msgstr "Éditer un pressing" -#. item "Shops/Dry Cleaning" text "Name" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2641 msgid "Laundry" msgstr "Laverie libre-service" @@ -18936,10 +20447,9 @@ #. item #. -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2643 msgid "Edit Laundry" msgstr "Éditer une laverie" -#. item "Shops/Laundry" text "Name" -#: build/trans_presets.java:2537 +#: build/trans_presets.java:2648 msgid "Outdoor" msgstr "Magasin de sports d’extérieur" @@ -18947,35 +20457,32 @@ #. item #. -#: build/trans_presets.java:2539 +#: build/trans_presets.java:2650 msgid "Edit Outdoor Shop" msgstr "Éditer un magasin de sports d’extérieur" -#. item "Shops/Outdoor" text "Name" -#: build/trans_presets.java:2543 +#: build/trans_presets.java:2655 msgid "Sports" msgstr "Sports" #. item -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2656 msgid "Edit Sports Shop" msgstr "Modifier magasin de sport" -#. item "Shops/Sports" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2661 msgid "Optician" msgstr "Opticien" #. item -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2662 msgid "Edit Optician" msgstr "Modifier opticien" -#. item "Shops/Optician" text "Name" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2669 msgid "Cash" msgstr "Argent" #. group "Cash" -#: build/trans_presets.java:2556 +#: build/trans_presets.java:2670 msgid "Bank" msgstr "Banque" @@ -18983,16 +20490,14 @@ #. item #. -#: build/trans_presets.java:2558 +#: build/trans_presets.java:2672 msgid "Edit Bank" msgstr "Editez une banque" -#. item "Cash/Bank" text "Name" -#. item "Cash/Money Exchange" text "Name" -#: build/trans_presets.java:2561 build/trans_presets.java:2569 +#: build/trans_presets.java:2677 build/trans_presets.java:2686 msgid "Automated Teller Machine" msgstr "Distributeur automatique" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2563 +#: build/trans_presets.java:2679 msgid "Money Exchange" msgstr "Bureau de change" @@ -19000,5 +20505,5 @@ #. item #. -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2681 msgid "Edit Money Exchange" msgstr "Éditer un bureau de change" @@ -19006,15 +20511,15 @@ #. item #. -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2688 msgid "Edit Automated Teller Machine" msgstr "Éditer un distributeur automatique" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2576 +#: build/trans_presets.java:2693 msgid "Health" msgstr "Santé" #. group "Health" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2694 msgid "Doctors" msgstr "Médecin" @@ -19022,20 +20527,18 @@ #. item #. -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2696 msgid "Edit Doctors" msgstr "Modifier Médecin" -#. item "Health/Doctors" text "Name" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2701 msgid "Dentist" msgstr "Dentiste" #. item -#: build/trans_presets.java:2584 +#: build/trans_presets.java:2702 msgid "Edit Dentist" msgstr "Editez le Dentiste" -#. item "Health/Dentist" text "Name" -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2707 msgid "Pharmacy" msgstr "Pharmacie" @@ -19043,5 +20546,5 @@ #. item #. -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2709 msgid "Edit Pharmacy" msgstr "Éditer pharmacie" @@ -19049,10 +20552,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2711 msgid "Dispensing" msgstr "Dispensaire" -#. item "Health/Pharmacy" text "Name" -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2715 msgid "Hospital" msgstr "Hôpital" @@ -19060,10 +20562,10 @@ #. item #. -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2717 msgid "Edit Hospital" msgstr "Éditer hôpital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2601 +#: build/trans_presets.java:2721 msgid "Emergency Access Point" msgstr "Point d’accès d’urgence" @@ -19072,5 +20574,5 @@ #. -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2724 msgid "Edit Emergency Access Point" msgstr "Éditer point d’accès d’urgence" @@ -19079,20 +20581,20 @@ #. #. -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2727 msgid "Point Number" msgstr "Numéro du point" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2728 msgid "Point Name" msgstr "Nom du point" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2730 msgid "Phone Number" msgstr "Numéro de téléphone" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2731 msgid "(Use international code, like +12-345-67890)" msgstr "(Utiliser le code international, comme +12-345-67890" @@ -19100,5 +20602,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2614 +#: build/trans_presets.java:2734 msgid "Veterinary" msgstr "Vétérinaire" @@ -19107,55 +20609,55 @@ #. -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2737 msgid "Edit Veterinary" msgstr "Editez un Vétérinaire" #. group "Places" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2745 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2746 msgid "Edit Continent" msgstr "Éditer un continent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2751 msgid "Country" msgstr "Pays" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2752 msgid "Edit Country" msgstr "Éditer un pays" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2757 msgid "State" msgstr "Département" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2758 msgid "Edit State" msgstr "Éditer un état" #. item "Places/State" text "Name" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2763 msgid "Region" msgstr "Région" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2764 msgid "Edit Region" msgstr "Éditer une région" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2769 msgid "County" msgstr "Comté/Canton" #. item -#: build/trans_presets.java:2649 +#: build/trans_presets.java:2770 msgid "Edit County" msgstr "Éditer un comté/canton" @@ -19163,15 +20665,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2776 msgid "City" msgstr "Ville de plus de 100 000 habitants" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2777 msgid "Edit City" msgstr "Editez la ville" #. item "Places/City" text "Name" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2782 msgid "Town" msgstr "Ville 10 000 à 100 000 habitants" @@ -19179,10 +20681,10 @@ #. item #. -#: build/trans_presets.java:2663 +#: build/trans_presets.java:2784 msgid "Edit Town" msgstr "Editez la ville" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2668 +#: build/trans_presets.java:2789 msgid "Suburb" msgstr "Banlieue" @@ -19190,25 +20692,25 @@ #. item #. -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2791 msgid "Edit Suburb" msgstr "Éditer une banlieue" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2796 msgid "Village" msgstr "Village" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2797 msgid "Edit Village" msgstr "Éditer un village" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2802 msgid "Hamlet" msgstr "Hameau" #. item -#: build/trans_presets.java:2682 +#: build/trans_presets.java:2803 msgid "Edit Hamlet" msgstr "Éditer un hameau" @@ -19216,5 +20718,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2809 msgid "Locality" msgstr "Lieu-dit" @@ -19222,10 +20724,10 @@ #. item #. -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2811 msgid "Edit Locality" msgstr "Éditer un lieu-dit" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2816 msgid "Island" msgstr "île" @@ -19233,11 +20735,24 @@ #. item #. -#: build/trans_presets.java:2697 +#: build/trans_presets.java:2818 msgid "Edit Island" msgstr "Éditer une île" #. item "Places/Island" text "Name" +#: build/trans_presets.java:2823 +#, fuzzy +msgid "Islet" +msgstr "gauche" + +#. item +#. +#: build/trans_presets.java:2825 +#, fuzzy +msgid "Edit Islet" +msgstr "Editez un châlet" + +#. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2831 msgid "Cave Entrance" msgstr "Entrée de grotte" @@ -19245,10 +20760,10 @@ #. item #. -#: build/trans_presets.java:2705 +#: build/trans_presets.java:2833 msgid "Edit Cave Entrance" msgstr "Éditer une entrée de grotte" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2837 msgid "Peak" msgstr "Sommet" @@ -19256,10 +20771,10 @@ #. item #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2839 msgid "Edit Peak" msgstr "Modifier un pic" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2844 msgid "Glacier" msgstr "Glacier" @@ -19267,10 +20782,10 @@ #. item #. -#: build/trans_presets.java:2718 +#: build/trans_presets.java:2846 msgid "Edit Glacier" msgstr "Éditer un glacier" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2851 msgid "Volcano" msgstr "Volcan" @@ -19278,70 +20793,70 @@ #. item #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2853 msgid "Edit Volcano" msgstr "Éditer un volcan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2859 msgid "Boundaries" msgstr "Frontières" #. group "Boundaries" -#: build/trans_presets.java:2732 +#: build/trans_presets.java:2860 msgid "National" msgstr "Nationale" #. item -#: build/trans_presets.java:2733 +#: build/trans_presets.java:2861 msgid "Edit National Boundary" msgstr "Éditer une frontière nationale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2866 msgid "Administrative" msgstr "Administrative" #. item -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2867 msgid "Edit Administrative Boundary" msgstr "Éditer une frontière administrative" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2872 msgid "Civil" msgstr "Civile" #. item -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2873 msgid "Edit Civil Boundary" msgstr "Éditer une frontière civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2750 +#: build/trans_presets.java:2878 msgid "Political" msgstr "Politique" #. item -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2879 msgid "Edit Political Boundary" msgstr "Éditer une zone électorale" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2756 +#: build/trans_presets.java:2884 msgid "National park" msgstr "Parc national" #. item -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2885 msgid "Edit National Park Boundary" msgstr "Éditer les frontières d’un parc national" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2891 msgid "Land use" msgstr "Utilisation du terrain" #. group "Land use" -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2892 msgid "Tree" msgstr "Arbre" @@ -19350,15 +20865,15 @@ #. -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2895 msgid "Edit Tree" msgstr "Éditer un arbre isolé" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2900 msgid "Botanical Name" msgstr "Nom botanique" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2774 +#: build/trans_presets.java:2902 msgid "Wood" msgstr "Bois" @@ -19367,5 +20882,5 @@ #. -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2905 msgid "Edit Wood" msgstr "Éditer un bois" @@ -19373,17 +20888,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2780 build/trans_presets.java:2789 +#: build/trans_presets.java:2908 build/trans_presets.java:2917 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2910 msgid "Forest" msgstr "Forêt" @@ -19392,14 +20907,14 @@ #. -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2913 msgid "Edit Forest Landuse" msgstr "Éditer une forêt" -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2919 msgid "Nature Reserve" msgstr "Réserve naturelle" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2920 msgid "Edit Nature Reserve" msgstr "Éditer une réserve naturelle" @@ -19407,25 +20922,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2925 msgid "Scree" msgstr "Zone d’éboulements" #. item -#: build/trans_presets.java:2798 +#: build/trans_presets.java:2926 msgid "Edit Scree" msgstr "Éditer une zone d’éboulements" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2930 msgid "Scrub" msgstr "Broussailles" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2931 msgid "Edit Scrub" msgstr "Éditer des broussailles" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2807 +#: build/trans_presets.java:2935 msgid "Fell" msgstr "Talus" @@ -19433,10 +20948,10 @@ #. item #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2937 msgid "Edit Fell" msgstr "Éditer un talus" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2941 msgid "Heath" msgstr "Lande" @@ -19444,5 +20959,5 @@ #. item #. -#: build/trans_presets.java:2815 +#: build/trans_presets.java:2943 msgid "Edit Heath" msgstr "Éditer une lande" @@ -19450,5 +20965,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2820 +#: build/trans_presets.java:2948 msgid "Farmyard" msgstr "Bâtiments de ferme" @@ -19457,45 +20972,45 @@ #. -#: build/trans_presets.java:2823 +#: build/trans_presets.java:2951 msgid "Edit Farmyard Landuse" msgstr "Éditer des bâtiments de ferme" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2956 msgid "Farmland" msgstr "Terrains de ferme" #. item -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2957 msgid "Edit Farmland Landuse" msgstr "Éditer des terrains de ferme" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2962 msgid "Meadow" msgstr "Prairie" #. item -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2963 msgid "Edit Meadow Landuse" msgstr "Editer prairie" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2968 msgid "Vineyard" msgstr "Vigne" #. item -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2969 msgid "Edit Vineyard Landuse" msgstr "Éditer une vigne" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2974 msgid "Allotments" msgstr "Jardins familiaux" #. item -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2975 msgid "Edit Allotments Landuse" msgstr "Éditer des jardins familiaux" @@ -19503,25 +21018,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2981 msgid "Garden" msgstr "Jardin" #. item -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2982 msgid "Edit Garden" msgstr "Éditer un jardin" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2858 +#: build/trans_presets.java:2986 msgid "Grass" msgstr "Herbe" #. item -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2987 msgid "Edit Grass Landuse" msgstr "Éditer de l’herbe" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2864 +#: build/trans_presets.java:2992 msgid "Village Green" msgstr "Zone publique herborée" @@ -19529,10 +21044,10 @@ #. item #. -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2994 msgid "Edit Village Green Landuse" msgstr "Éditer une zone publique herborée" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2871 +#: build/trans_presets.java:2999 msgid "Common" msgstr "Espace commun" @@ -19540,20 +21055,20 @@ #. item #. -#: build/trans_presets.java:2873 +#: build/trans_presets.java:3001 msgid "Edit Common" msgstr "Éditer un espace commun" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:2877 +#: build/trans_presets.java:3005 msgid "Park" msgstr "Parc" #. item -#: build/trans_presets.java:2878 +#: build/trans_presets.java:3006 msgid "Edit Park" msgstr "Editez un Parc" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:2882 +#: build/trans_presets.java:3010 msgid "Recreation Ground" msgstr "Aire de jeux" @@ -19561,5 +21076,5 @@ #. item #. -#: build/trans_presets.java:2884 +#: build/trans_presets.java:3012 msgid "Edit Recreation Ground Landuse" msgstr "Éditer une aire de jeux" @@ -19567,15 +21082,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:2890 +#: build/trans_presets.java:3018 msgid "Residential area" msgstr "Zone résidentielle" #. item -#: build/trans_presets.java:2891 +#: build/trans_presets.java:3019 msgid "Edit Residential Landuse" msgstr "Éditer une zone résidentielle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:2896 +#: build/trans_presets.java:3024 msgid "Graveyard" msgstr "Petit cimetière" @@ -19583,9 +21098,9 @@ #. item #. -#: build/trans_presets.java:2898 +#: build/trans_presets.java:3026 msgid "Edit Graveyard" msgstr "Éditer un petit cimetière" -#: build/trans_presets.java:2904 +#: build/trans_presets.java:3032 msgid "Cemetery" msgstr "Cimetière" @@ -19593,39 +21108,39 @@ #. item #. -#: build/trans_presets.java:2906 +#: build/trans_presets.java:3034 msgid "Edit Cemetery Landuse" msgstr "Éditer un cimetière" -#: build/trans_presets.java:2913 +#: build/trans_presets.java:3041 msgid "Retail" msgstr "Zone commerciale" #. item -#: build/trans_presets.java:2914 +#: build/trans_presets.java:3042 msgid "Edit Retail Landuse" msgstr "Éditer une zone commerciale" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:3047 msgid "Commercial" msgstr "Bureaux" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:3048 msgid "Edit Commercial Landuse" msgstr "Éditer des bureaux" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:3053 msgid "Industrial" msgstr "Zone industrielle" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:3054 msgid "Edit Industrial Landuse" msgstr "Éditer une zone industrielle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:2931 +#: build/trans_presets.java:3059 msgid "Railway land" msgstr "Zone ferroviaire" @@ -19633,15 +21148,15 @@ #. item #. -#: build/trans_presets.java:2933 +#: build/trans_presets.java:3061 msgid "Edit Railway Landuse" msgstr "Éditer une zone ferroviaire" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:2938 +#: build/trans_presets.java:3066 msgid "Military" msgstr "Militaire" #. item -#: build/trans_presets.java:2939 +#: build/trans_presets.java:3067 msgid "Edit Military Landuse" msgstr "Éditer un terrain militaire" @@ -19649,55 +21164,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:2945 +#: build/trans_presets.java:3073 msgid "Construction area" msgstr "Zone de construction" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:3074 msgid "Edit Construction Landuse" msgstr "Éditer un chantier" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:2951 +#: build/trans_presets.java:3079 msgid "Brownfield" msgstr "Terrain en friche" #. item -#: build/trans_presets.java:2952 +#: build/trans_presets.java:3080 msgid "Edit Brownfield Landuse" msgstr "Éditer un terrain en friche" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:2957 +#: build/trans_presets.java:3085 msgid "Greenfield" msgstr "Espace vert" #. item -#: build/trans_presets.java:2958 +#: build/trans_presets.java:3086 msgid "Edit Greenfield Landuse" msgstr "Éditer une nouvelle zone de construction" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:2963 +#: build/trans_presets.java:3091 msgid "Landfill" msgstr "Décharge" #. item -#: build/trans_presets.java:2964 +#: build/trans_presets.java:3092 msgid "Edit Landfill Landuse" msgstr "Éditer une décharge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:2969 +#: build/trans_presets.java:3097 msgid "Quarry" msgstr "Carrière" #. item -#: build/trans_presets.java:2970 +#: build/trans_presets.java:3098 msgid "Edit Quarry Landuse" msgstr "Éditer une carrière" #. group "Relations" -#: build/trans_presets.java:2979 +#: build/trans_presets.java:3107 msgid "Multipolygon" msgstr "Multypoligone" @@ -19707,5 +21222,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:2983 +#: build/trans_presets.java:3111 msgid "Edit Multipolygon" msgstr "Modifier un multipolygone" @@ -19714,10 +21229,10 @@ #. #. -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3117 msgid "outer segment" msgstr "segment extérieur" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3118 msgid "inner segment" msgstr "segment intérieur" @@ -19725,5 +21240,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3121 msgid "Turn restriction" msgstr "Interdiction de tourner" @@ -19732,5 +21247,5 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3124 msgid "Edit Turn Restriction" msgstr "Modifier une interdiction de tourner" @@ -19738,34 +21253,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_left_turn" msgstr "Interdiction de tourner à gauche" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_right_turn" msgstr "Interdiction de tourner à droite" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_straight_on" msgstr "Interdiction d'aller tout droit" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "no_u_turn" msgstr "Interdiction de faire demi-tour" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_right_turn" msgstr "Obligation de tourner à droite" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_left_turn" msgstr "Obligation de tourner à gauche" -#: build/trans_presets.java:2998 +#: build/trans_presets.java:3126 msgid "only_straight_on" msgstr "Obligation d'aller tout droit" @@ -19774,15 +21289,15 @@ #. #. -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3131 msgid "from way" msgstr "chemin d'origine" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3004 +#: build/trans_presets.java:3132 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:3005 +#: build/trans_presets.java:3133 msgid "to way" msgstr "chemin destination" @@ -19790,5 +21305,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3136 msgid "Route" msgstr "Route" @@ -19797,5 +21312,5 @@ #. -#: build/trans_presets.java:3011 +#: build/trans_presets.java:3139 msgid "Edit Route" msgstr "Modifier une route" @@ -19803,5 +21318,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "Route type" msgstr "Type de route" @@ -19873,5 +21388,5 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:233 +#: build/trans_presets.java:3141 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 @@ -19880,17 +21395,17 @@ msgstr "vélo/bicyclette" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "road" msgstr "route" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "ski" msgstr "ski" @@ -19943,5 +21458,5 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:247 +#: build/trans_presets.java:3141 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 @@ -19950,13 +21465,13 @@ msgstr "piéton" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "hiking" msgstr "randonnée" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3141 msgid "detour" msgstr "détour" @@ -19970,10 +21485,10 @@ #. #. -#: build/trans_presets.java:3013 build/trans_style.java:1206 +#: build/trans_presets.java:3141 build/trans_style.java:1206 msgid "subway" msgstr "métro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3144 msgid "Symbol description" msgstr "Description du symbole" @@ -19981,31 +21496,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3147 msgid "Network" msgstr "Réseau" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "proposed" msgstr "proposé" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "alternate" msgstr "alternatif" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "temporary" msgstr "temporaire" -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3149 msgid "connection" msgstr "connexion" -#: build/trans_presets.java:3022 +#: build/trans_presets.java:3150 msgid "Color (hex)" msgstr "Couleur (hexa)" @@ -20014,30 +21529,30 @@ #. #. -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3153 msgid "route segment" msgstr "segment de route" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3154 msgid "forward segment" msgstr "segment suivant" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3155 msgid "backward segment" msgstr "segment précédent" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3028 +#: build/trans_presets.java:3156 msgid "halt point" msgstr "point d'arrêt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3029 +#: build/trans_presets.java:3157 msgid "forward halt point" msgstr "point d'arrêt suivant" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3030 +#: build/trans_presets.java:3158 msgid "backward halt point" msgstr "point d'arrêt précédent" @@ -20475,11 +21990,11 @@ #: build/trans_style.java:627 build/trans_style.java:824 #: build/trans_style.java:1156 build/trans_style.java:2472 -#: build/trans_style.java:3424 build/trans_style.java:3425 -#: build/trans_style.java:3995 build/trans_style.java:4295 -#: build/trans_style.java:4304 build/trans_style.java:4313 -#: build/trans_style.java:4322 build/trans_style.java:4331 -#: build/trans_style.java:4340 build/trans_style.java:4349 -#: build/trans_style.java:4350 build/trans_style.java:4359 -#: build/trans_style.java:4368 +#: build/trans_style.java:3375 build/trans_style.java:3376 +#: build/trans_style.java:3946 build/trans_style.java:4254 +#: build/trans_style.java:4263 build/trans_style.java:4272 +#: build/trans_style.java:4281 build/trans_style.java:4290 +#: build/trans_style.java:4299 build/trans_style.java:4308 +#: build/trans_style.java:4309 build/trans_style.java:4318 +#: build/trans_style.java:4327 msgid "deprecated" msgstr "déprécié" @@ -20805,41 +22320,4 @@ msgid "motorroad" msgstr "" - -#. color tertiary -#. -#. 1 -#. 30000 -#. -#. -#. -#. -#. color deprecated -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. color highway_track -#. -#. 1 -#. 20000 -#. -#. -#. -#. -#. color street -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#: build/trans_style.java:619 build/trans_style.java:635 -#: build/trans_style.java:651 build/trans_style.java:659 -msgid "street" -msgstr "rue" #. color street @@ -22540,5 +24018,5 @@ #. #: build/trans_style.java:2069 build/trans_style.java:2077 -#: build/trans_style.java:3343 +#: build/trans_style.java:3294 msgid "light_water" msgstr "eau (claire)" @@ -23137,55 +24615,6 @@ #. #. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. #. #. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. -#. 1 -#. 40000 -#. -#. -#. -#. -#. #. 1 #. 40000 @@ -23199,5 +24628,5 @@ #: 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:3029 +#: build/trans_style.java:2958 build/trans_style.java:2980 msgid "tourism" msgstr "tourisme" @@ -23269,8 +24698,8 @@ #. #. -#: build/trans_style.java:3039 build/trans_style.java:3047 -#: build/trans_style.java:3055 build/trans_style.java:3063 -#: build/trans_style.java:3071 build/trans_style.java:3079 -#: build/trans_style.java:3087 build/trans_style.java:3095 +#: 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 msgid "historic" msgstr "patrimoine" @@ -23341,8 +24770,8 @@ #. #. -#: build/trans_style.java:3104 build/trans_style.java:3112 -#: build/trans_style.java:3120 build/trans_style.java:3128 -#: build/trans_style.java:3176 build/trans_style.java:3184 -#: build/trans_style.java:3282 build/trans_style.java:3290 +#: build/trans_style.java:3055 build/trans_style.java:3063 +#: build/trans_style.java:3071 build/trans_style.java:3079 +#: build/trans_style.java:3127 build/trans_style.java:3135 +#: build/trans_style.java:3233 build/trans_style.java:3241 msgid "green" msgstr "espace vert" @@ -23356,5 +24785,5 @@ #. #. -#: build/trans_style.java:3136 +#: build/trans_style.java:3087 msgid "quarry" msgstr "carrière" @@ -23368,5 +24797,5 @@ #. #. -#: build/trans_style.java:3144 +#: build/trans_style.java:3095 msgid "landfill" msgstr "décharge" @@ -23388,5 +24817,5 @@ #. #. -#: build/trans_style.java:3152 build/trans_style.java:3160 +#: build/trans_style.java:3103 build/trans_style.java:3111 msgid "basin" msgstr "bassin" @@ -23400,5 +24829,5 @@ #. #. -#: build/trans_style.java:3168 +#: build/trans_style.java:3119 msgid "forest" msgstr "forêt" @@ -23412,5 +24841,5 @@ #. #. -#: build/trans_style.java:3200 +#: build/trans_style.java:3151 msgid "farmyard" msgstr "bâtiments de ferme" @@ -23433,5 +24862,5 @@ #. #. -#: build/trans_style.java:3209 build/trans_style.java:3217 +#: build/trans_style.java:3160 build/trans_style.java:3168 msgid "retail" msgstr "commerce de proximité" @@ -23445,5 +24874,5 @@ #. #. -#: build/trans_style.java:3225 +#: build/trans_style.java:3176 msgid "industrial" msgstr "zone industrielle" @@ -23457,5 +24886,5 @@ #. #. -#: build/trans_style.java:3233 +#: build/trans_style.java:3184 msgid "brownfield" msgstr "terrain en friche" @@ -23469,5 +24898,5 @@ #. #. -#: build/trans_style.java:3241 +#: build/trans_style.java:3192 msgid "greenfield" msgstr "espace vert" @@ -23481,5 +24910,5 @@ #. #. -#: build/trans_style.java:3249 +#: build/trans_style.java:3200 msgid "railland" msgstr "zone ferroviaire" @@ -23536,7 +24965,7 @@ #. #. -#: build/trans_style.java:3266 build/trans_style.java:3301 -#: build/trans_style.java:3309 build/trans_style.java:3317 -#: build/trans_style.java:3325 build/trans_style.java:3333 +#: build/trans_style.java:3217 build/trans_style.java:3252 +#: build/trans_style.java:3260 build/trans_style.java:3268 +#: build/trans_style.java:3276 build/trans_style.java:3284 msgid "military" msgstr "zone militaire" @@ -23550,5 +24979,5 @@ #. #. -#: build/trans_style.java:3274 +#: build/trans_style.java:3225 msgid "cemetery" msgstr "cimetière" @@ -23561,5 +24990,5 @@ #. #. -#: build/trans_style.java:3350 +#: build/trans_style.java:3301 msgid "peak" msgstr "sommet" @@ -23574,5 +25003,5 @@ #. #. -#: build/trans_style.java:3359 +#: build/trans_style.java:3310 msgid "glacier" msgstr "glacier" @@ -23586,5 +25015,5 @@ #. #. -#: build/trans_style.java:3367 +#: build/trans_style.java:3318 msgid "volcano" msgstr "volcan" @@ -23639,8 +25068,8 @@ #. #. -#: build/trans_style.java:3375 build/trans_style.java:3376 -#: build/trans_style.java:3384 build/trans_style.java:3400 -#: build/trans_style.java:3473 build/trans_style.java:3481 -#: build/trans_style.java:3489 +#: build/trans_style.java:3326 build/trans_style.java:3327 +#: build/trans_style.java:3335 build/trans_style.java:3351 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 msgid "natural" msgstr "nature" @@ -23654,5 +25083,5 @@ #. #. -#: build/trans_style.java:3392 +#: build/trans_style.java:3343 msgid "scrub" msgstr "broussailles" @@ -23666,20 +25095,8 @@ #. #. -#: build/trans_style.java:3408 +#: build/trans_style.java:3359 msgid "heath" msgstr "lande/bruyère" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#: build/trans_style.java:3416 -msgid "wood" -msgstr "bois" - #. color water #. 1 @@ -23690,5 +25107,5 @@ #. #. -#: build/trans_style.java:3457 +#: build/trans_style.java:3408 msgid "mud" msgstr "terrain boueux/vase" @@ -23702,5 +25119,5 @@ #. #. -#: build/trans_style.java:3465 +#: build/trans_style.java:3416 msgid "beach" msgstr "plage" @@ -23778,8 +25195,8 @@ #. #. -#: build/trans_style.java:3505 build/trans_style.java:3513 -#: build/trans_style.java:3521 build/trans_style.java:3529 -#: build/trans_style.java:3537 build/trans_style.java:3545 -#: build/trans_style.java:3553 build/trans_style.java:3561 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: 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 msgid "route" msgstr "route" @@ -23827,7 +25244,7 @@ #. #. -#: build/trans_style.java:3571 build/trans_style.java:3579 -#: build/trans_style.java:3587 build/trans_style.java:3595 -#: build/trans_style.java:3603 +#: build/trans_style.java:3522 build/trans_style.java:3530 +#: build/trans_style.java:3538 build/trans_style.java:3546 +#: build/trans_style.java:3554 msgid "boundary" msgstr "frontière" @@ -23969,10 +25386,19 @@ #. #. -#: build/trans_style.java:4043 build/trans_style.java:4051 -#: build/trans_style.java:4059 build/trans_style.java:4067 -#: build/trans_style.java:4075 build/trans_style.java:4083 -#: build/trans_style.java:4091 build/trans_style.java:4099 -#: build/trans_style.java:4107 build/trans_style.java:4115 -#: build/trans_style.java:4123 build/trans_style.java:4131 +#. color place +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: 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 msgid "place" msgstr "lieu" @@ -24020,6 +25446,6 @@ #. #. -#: build/trans_style.java:4248 build/trans_style.java:4255 -#: build/trans_style.java:4262 build/trans_style.java:4269 +#: build/trans_style.java:4207 build/trans_style.java:4214 +#: build/trans_style.java:4221 build/trans_style.java:4228 msgid "address" msgstr "adresse" @@ -24169,5 +25595,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Chemin non-classifié non nommé." #. way : W : highway == unclassified && name != * @@ -24280,5 +25706,5 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? @@ -24316,9 +25742,110 @@ msgstr "Terraserver Urbain" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Sélectionner le tableau d'assemblage" - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)" +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Indication : Certains changements viennent de l’envoi de nouvelles " +#~ "données sur le serveur." + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "" +#~ "Veuillez sélectionner des chemins avec des angles droits afin de les " +#~ "orthogonaliser." + +#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +#~ msgstr "" +#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier " +#~ "plan. L'exception était : {0}" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. " +#~ "Merci de signaler ceci comme une erreur." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Aucun document ouvert donc rien à sauvegarder." + +#~ msgid "Change {0} {1}" +#~ msgstr "Changer {0} {1}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Supprimer {1} {0}" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "supprimer le membre de la relation {0} {1}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}" + +#~ msgid "nodes" +#~ msgstr "nœuds" + +#~ msgid "ways" +#~ msgstr "chemins" + +#~ msgid "relations" +#~ msgstr "relations" + +#~ msgid "changesets" +#~ msgstr "jeux de données" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "" +#~ "Impossible de charger l’historique depuis le serveur. Détails :
" +#~ "{0}" + +#~ msgid "Delete Layer" +#~ msgstr "Supprimer le calque" + +#~ msgid "Do you really want to delete layer ''{0}''?" +#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?" + +#~ msgid "Delete all" +#~ msgstr "Tout supprimer" + +#~ msgid "Authors: {0}" +#~ msgstr "Auteurs : {0}" + +#~ msgid "Public" +#~ msgstr "Public" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de " +#~ "charger." + +#~ msgid "Continue anyway" +#~ msgstr "Continuer tout de même" + +#~ msgid "Copy Default" +#~ msgstr "Copier défaut" + +#~ msgid "Edit Information Office" +#~ msgstr "Modifier Office du Tourisme" + +#~ msgid "Map Type" +#~ msgstr "Type de carte" + +#~ msgid "map" +#~ msgstr "carte" + +#~ msgid "citymap" +#~ msgstr "carte de la ville" + +#~ msgid "hikingmap" +#~ msgstr "carte de randonnée" + +#~ msgid "bicyclemap" +#~ msgstr "carte de randonnée cycliste" + +#~ msgid "Board Type" +#~ msgstr "Type de bureau" + +#~ msgid "board" +#~ msgstr "tableau" #~ msgid "Move" @@ -24327,7 +25854,4 @@ #~ msgid "Data Layer" #~ msgstr "Calque de données" - -#~ msgid "Not implemented yet." -#~ msgstr "Pas encore implémenté." #~ msgid "Unknown file extension." @@ -24605,4 +26129,7 @@ #~ msgstr "Magasin de sport" +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Sélectionner le tableau d'assemblage" + #~ msgid "" #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -24886,4 +26413,7 @@ #~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données" +#~ msgid "Adjust the position of the WMS layer (raster images only)" +#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)" + #~ msgid "" #~ "No data to update found. Have you already opened or downloaded a data " @@ -24899,7 +26429,4 @@ #~ msgstr "Échec d’initialisation de l’API" -#~ msgid "image loading..." -#~ msgstr "chargement de l’image..." - #~ msgid "No data" #~ msgstr "Aucune donnée"