Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 16493) +++ applications/editors/josm/i18n/po/gl.po (revision 16827) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" "PO-Revision-Date: 2009-06-27 15:34+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Creando Interface (GUI) principal" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../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:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Axuda" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../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/GpxExportAction.java:236 +#: ../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:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../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:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../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/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../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/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:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../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:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Erro" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Consello: Algúns cambios veñen de subir novos datos ó servidor." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Cambios non gardados" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Hai cambios sen gardar. Descartar os cambios e continuar?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Gardar e Sair" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Descartar e Sair" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../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:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../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/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../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:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../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:101 +#: ../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:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../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:357 +#: ../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:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../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 +#: ../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:130 +msgid "Warning" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de ficheiro mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "DESCOÑECIDO" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Acerca de" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Amosar a pantalla de \"Acerca de\"." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../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:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Versión {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Último cambio en {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Versión Java {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Páxina de incio" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Informes de Erro" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Información" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Leeme" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revisión" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Colaboración" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../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 msgid "Plugins" msgstr "Engadidos" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Acerca de JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "O ficheiro non puido ser atopado" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -211,16 +355,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -229,7 +366,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Por favor seleccione a fila a borrar." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Seleccionar ou ben:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Acoplar Nodos" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Engadir Nodo..." @@ -241,14 +406,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../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/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -256,57 +423,57 @@ msgstr "Editar: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Introducir as coordenadas para o novo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Usar grados decimais." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos indican que é o hemisferio Oeste/Sur." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Lonxitude" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../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:217 msgid "Align Nodes in Circle" msgstr "Alinear os nodos en círculo" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Mover os nodos seleccionados a un círculo." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../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:32 #: ../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:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../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:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -322,25 +489,58 @@ msgstr "Ferramenta: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Por favor, selecciona polo menos catro nodos." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../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/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../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 +msgid "Information" +msgstr "Información" + #. 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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Alinear os nodos en fila" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Mover os nodos seleccionados a unha liña." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Por favor, selecciona polo menos tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -349,18 +549,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -369,5 +561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -376,46 +568,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "datos" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "capa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selección" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflito" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "descargar" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Facer zoom a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Facer zoom na vista a {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +617,30 @@ msgstr "Vista: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Non se seleccionou nada sobre o que facer zoom." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "Non hai conflitos sobre os que facer zoom" +#: ../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 "Combinar vía" -#: ../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 "Combinar varias vías en unha." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona polo menos dúas vías para combinar." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -456,13 +648,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Combinar de todas formas" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Cambiar direccións?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -472,10 +664,10 @@ "invertir algunhas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Invertir e Combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -483,20 +675,20 @@ msgstr "Introducir valores para todos os conflitos." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Resolver Conflitos" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Todas as vías están vacías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -515,23 +707,24 @@ msgstr "Copiar os obxectos seleccionados ó buffer de pegado." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Por favor, selecciona algo para copiar" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Crear Círculo" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Crear un círculo a partir de tres nodos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Eses nodos non estan en un círculo" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -539,88 +732,123 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../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:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../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 #: ../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:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Borrar" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Borrar obxectos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Sobrescribir" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "O ficheiro existe. Sobrescribir?" #. 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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Distribuir Nodos" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" "Distribuir os nodos seleccionados de xeito equidistante ao longo dunha liña." -#: ../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 "Descargar de OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Descargar datos do mapa do servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../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:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Ficheiro: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Descargar" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Por favor, selecciona polo menos unha tarefa para descargar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../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:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Erros durante a descarga" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../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/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplicar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicar selección copiando e pegando inmediatamente." @@ -640,5 +868,5 @@ msgstr "Sair da aplicación," -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -648,58 +876,73 @@ "GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exportar a GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exportar os datos a un ficheiro GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nada que exportar. Adquire antes algún dato." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "descripción de trazado gps" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Engadir información do autor" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Nome real" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Predefinido" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Ano do Copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Palabras clave" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Opcións de exportacińo" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exportar e Gardar" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -710,25 +953,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Erro" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Escoller unha licencia predefinida" @@ -738,46 +961,49 @@ msgstr "Axuda en liña de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Abrir nun navegador" -#: ../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:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../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:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../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 #: ../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:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Edición" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Recargar" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Erro durante a carga da páxina {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Páxina de axuda perdida. Créea en inglés." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -815,30 +1041,40 @@ msgstr "Unir un nodo ós segmentos de vía máis próximos" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Unir Nodo e Liña" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Sen Atallo" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Acoplar de todas formas" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada." + +#: ../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 "Acoplar Nodos" -#: ../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 "Acoplar nodos no máis antigo" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "Por favor, selecciona polo menos dous nodos a acoplar." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -846,9 +1082,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Acoplar de todas formas" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -856,60 +1092,71 @@ "uso." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Acoplar {0} nodos" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selección" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor" + +#: ../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:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Reflexar" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Reflexar os nodos e vías seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Por favor, seleccione como mínimo un nodo ou vía." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "arriba" -#: ../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 +#: ../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 #, java-format msgid "Move objects {0}" msgstr "Mover obxectos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "abaixo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "esquerda" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "dereita" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Mover {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Move Obxectos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Non se poden mover objectos fora do mundo." @@ -917,5 +1164,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:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nova" @@ -925,26 +1172,17 @@ msgstr "Crear un novo mapa." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "sen nome" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Abrir un ficheiro." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../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:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Non se puido ler \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -973,35 +1211,36 @@ msgstr "Descargar URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Ortogonalizar Forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "So se permiten dous nodos" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "A selección debe estar formada só por vías." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Por favor, selecciona vías con ángulos case rectos para ortogonalizar." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Estas a usar a proxección EPSG:4326 que pode conducir
a resultados " @@ -1009,9 +1248,9 @@ "desfacerte desta advertencia.
Queres continuar?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Só hai un nodo seleccionado" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Ortogonalizar" @@ -1027,11 +1266,11 @@ msgstr "Pegar contidos ó buffer de pegado." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../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:78 msgid "Paste Tags" msgstr "Pegar Etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1061,16 +1300,21 @@ msgstr "Refacer a última acción desfeita." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Renomear capa" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Renomear tamén o ficheiro" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../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 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Non se puido renomear o ficheiro \"{0}\"" @@ -1084,9 +1328,9 @@ msgstr "Invertir a dirección de todas as vías seleccionadas." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Por favor, selecciona polo menos unha vía." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Invertir vías" @@ -1094,17 +1338,19 @@ #: ../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 msgid "Save" msgstr "Gardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Gardar os datos actuais." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "O arquivo {0} existe. Sobreescribir?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1114,25 +1360,25 @@ "favor, informa disto como un erro." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Non hai documentos abertos, polo que non hai nada que gardar." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Documento valeiro" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "O documento non contén datos." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Gardar de todas formas" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflitos" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1142,55 +1388,77 @@ "como se os rexeitases todos. Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Rexeitar Conflitos e Gardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Gardar ficheiro OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Gardar ficheiro GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Gardar Capa" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Non se puido facer copia de seguridade do ficheiro." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Extensión de ficheiro descoñecida: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Ocurriu un erro mentres se gardaba." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" +"Produciuse un erro mentras se restauraba o ficheiro de copia de seguridade." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Extensión de ficheiro descoñecida." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Ocurriu un erro mentres se gardaba." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "" "Produciuse un erro mentras se restauraba o ficheiro de copia de seguridade." -#: ../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 msgid "Save As..." msgstr "Gardar como..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Gardar os datos actuais nun novo ficheiro." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Seleccionar Todo" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1225,16 +1493,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../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 msgid "Close" msgstr "Pechar" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Separar Vía" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Separar unha vía no nodo seleccionado." @@ -1244,5 +1512,5 @@ msgstr "A selección actual non pode ser usada para a separación." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 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." @@ -1250,5 +1518,5 @@ msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1264,9 +1532,9 @@ "selecciona tamén a vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Os nodos seleccionados non comparten a mesma vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1274,10 +1542,10 @@ msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Debes seleccionar dous ou máis nodos para separar unha vía circular." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1287,17 +1555,17 @@ "nodos no medio da vía.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1318,47 +1586,47 @@ msgstr "Cambia a configuración global \"{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 "Despegar Vías" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Duplicar nodos que son usados por múltiples vías." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "Este nodo non está pegado a outra cousa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Ningún destes nodos estan pegados a outra cousa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "Ningún dos nodos desta vía están pegados a outra cousa." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "A selección actual non pode ser usada para despegar." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Seleccionar ou ben:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo que está sendo usado por máis dunha vía, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../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" @@ -1367,5 +1635,5 @@ "vía, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../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." @@ -1374,5 +1642,5 @@ "vía." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1385,9 +1653,9 @@ "obterán as súas propias copias e todos os nodos serán seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Despegar Nodo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1395,5 +1663,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1409,142 +1677,91 @@ msgstr "Desfacer a última acción." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Deseleccionar Todo" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Deseleccionar todos os obxectos." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Deseleccionar Todo (Enfocar)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Deseleccionar Todo (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Actualizar Datos" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" "Actualiza a capa de datos actual dende o servidor (descarga de novo os datos)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Non se atoparon datos para actualizar. Abriches ou descargaches xa unha capa " -"de datos?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Fallou ao actualizar as primitivas seleccionadas." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Actualización fallida" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Non se puido atopar a primitiva coa id {0} no paquete de datos actual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Primitiva desaparecida" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Actualizar Selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Non hai primitivas seleccionadas para actualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selección valeira" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "SIbir todos os cambios ó servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Obxectos para engadir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Obxectos para modificar:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Obxectos para borrar:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Proporciona un breve comentario para os cambios que vas a subir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "Subir estes cambios?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Subir Cambios" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algún dato antes." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Hai conflitos sen resolver. Debes resolver estes antes." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Non hai cambios que subir." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Actualizando" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Actualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sincronizar só {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Sincronizar o paquete de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1566,17 +1783,17 @@ "continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Detectado un conflito" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "valor retornado non esperado. Obtívose {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1592,5 +1809,5 @@ "editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1599,57 +1816,60 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Actualizando primitiva" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "SIbir todos os cambios ó servidor OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"A subida ao servidor fallou porque o teu
paquete " -"de datos actual viola a condición previa.
A mensaxe de erro é:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Violación de condición previa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"A subida fallou porque a primitiva que intentou " -"borrar
no servidor xa está borrada.

A mensaxe de erro é:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "A primitiva xa foi borrada" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Fallo ao iniciar comunicación co servidor OSM {0}.\n" -"Comproba o URL do servidor nas preferencias e a túa conexión a internet." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Obxectos para engadir:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Obxectos para modificar:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +msgid "Objects to delete:" +msgstr "Obxectos para borrar:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "Proporciona un breve comentario para os cambios que vas a subir:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 +msgid "Upload these changes?" +msgstr "Subir estes cambios?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +msgid "Upload Changes" +msgstr "Subir Cambios" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 +msgid "Uploading" +msgstr "Actualizando" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1737,42 +1957,54 @@ msgstr "Avance máis lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Datos GPX Descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Datos GPS en bruto" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Descargando datos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Non se importaron datos." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Datos OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Descarga {0} de {1} ({2} restantes)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Subindo datos" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Ocurriron os seguintes erros durante a descarga masiva:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Erros durante a descarga" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1784,21 +2016,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Primitivas borradas ou movidas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Borrar Modo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Borrar nodos ou vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../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/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1806,5 +2038,5 @@ msgstr "Modo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1814,769 +2046,23 @@ "nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Debuxar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Debuxar nodos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Foco do Debuxo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "Non se pode engadir un nodo fora do mundo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "Engadir nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Engadir nodo na vía" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Conectar via existente a nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "Engadir un novo nodo a unha via existente" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -msgid "Add node into way and connect" -msgstr "Engadir nodo a vía e conectar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Crear novo nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Seleccionar nodo baixo o cursor." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Insertar novo nodo na vía." -msgstr[1] "Insertar novo nodo en {0} vías." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Comezar nova vía a partir do último nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Continuar vía a partir do último nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Rematar debuxo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Extrudir" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Crear áreas" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Extrudir Vía" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Soltar o botón do rato para deter a rotación." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Arrastrar un segmento de vía para crear un rectángulo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o " -"audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Seleccionar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Seleccionar, mover e rotar obxectos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Engadir e mover un novo nodo virtual a unha vía." -msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Soltar o botón do rato para parar de mover. Ctrl para acoplar co nodo máis " -"próximo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Mover obxectos arrastrando; Maiúsculas para engadir á selección (Ctrl para " -"cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar selección" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Facer zoom e mover mapa" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl" -"+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" - -#: ../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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Buscar..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Buscar obxectos." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Non se cargaron datos." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Por favor, introduce unha cadea de busca." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "reemplazar selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "engadir á selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "eliminar da selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "sensible a maiúsculas" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "expresión regular" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "Baker Street - 'Baker' e 'Street' en calquer clave ou nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Baker Street\" - 'Baker Street' en calquera clave ou nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Bak - 'Bak' en calquer posición do nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "type=route - a clave 'type' co valor exacto 'route'" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - a clave 'type' con calquer valor. Proba tamén *=value, type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Bak - que non conteña 'Bak' no nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "foot: - clave=foot establecida con calquer valor." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "Obxectivos especiais:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "type: - tipo do obxecto(node,way,relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "user:... - todos os obxectos cambiados polo usuario" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - obxecto coa ID indicada" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:... - obxectro có número de nodos indicado" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "modified - todos os obxectos cambiados" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - todos os obxectos seleccionados" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - todos os obxectos incompletos" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - todos os obxectos sen etiquetar" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expresión - todos os fillos de obxectos que coincidan " -"coa expresión" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent expr - todos os pais de obxectos que coincidan coa " -"expresión" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "Usar | ou OR para combinar co operador OU lóxico" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "Usar \" para escapar operadores (p.e. se a clave conten : )" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "Usar ( e ) para agrupar expresións" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Buscar" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Comezar Busca" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Non se atoparon coincidencias para \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, java-format -msgid "Nothing added to selection by searching for ''{0}''" -msgstr "Non se engadiu nada á selección buscando por \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 -#, java-format -msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "Non se eliminou da selección buscando por \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 -#, java-format -msgid "Found {0} matches" -msgstr "Atopadas {0} coincidencias" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"A expresión regular \"{0}\" tiña un erro de análise no offset {1}, erro " -"completo:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou " -"relación" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Faltan argumentos para OR." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Faltan argumentos para NOT." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Esperabase parentese de peche." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Número de parámetros incorrecto para o operador nodes." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número " -"de nodos ou un rango, por exemplo nodes:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Valor incorrecto do operador id: {0}. Espérase un número." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 -msgid "Load Selection" -msgstr "Cargar Selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41 -#, java-format -msgid "Contact {0}..." -msgstr "Contacto {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Descargando..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Non se puido ler dende a URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Erro de análise na URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Erro durante a comunicación co servidor." - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Eliminar \"{0}\" para {1} \"{2}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Establecer {0}={1} para {2} \"{3}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "obxecto" -msgstr[1] "obxectos" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Eliminar \"{0}\" para {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Establecer {0}={1} para {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Resolver conflitos en coordenadas en {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Borrar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Borrar {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Relación contradictoria" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"A selección \"{0}\" é usada pola relación \"{1}\" co papel {2}.\n" -"Borrar da relación?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Borrar da relación" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"A selección \"{0}\" é usada pola relación \"{1}\".\n" -"Borrar da relación?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Separar segmento de vía" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Estás a punto de borrar nodos que se atopan fora da área que descargaches." -"
Isto pode causar problemas porque outros obxectos (que non ves) poden " -"estar usandoos.
Queres borralos realmente?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Resolver conflitos en estado borrado en {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Mover" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "nodo" -msgstr[1] "nodos" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Purgando 1 primitiva" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo de " -"2. Os actuais son {1}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Resolver conflitos na lista de membros da relación {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Secuencia" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, java-format -msgid "Undelete {0} primitives" -msgstr "Desfacer o borrado de {0} primitivas" - -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 -#, java-format -msgid "Resolve version conflicts for {0} {1}" -msgstr "Resolver conflitos de versión para {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Resolver conflitos na lista de nodos da vía {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Aplicar?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos " -"seus nodos son suxeridos para manter a consistencia dos datos." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relación" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Papel antigo" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Novo papel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Clave antiga" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Valor antigo" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nova clave" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Novo valor" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Aplicar os cambios seleccionados" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Non aplicar cambios" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "Por favor, selecciona que cambios de propiedade queres aplicar." - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "Propiedades de " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Papeis nas relacións que fan referencia a" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Corrección" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Ficheiro de configuración mal formado nas liñas {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Non se pode abrir o directorio de preferencias: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"O ficheiro de preferencias contiña erros. Creando copia de seguridade do " -"antigo a {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Preferencias almacenadas en {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "Non se puideron subir as preferencias. Razón: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "Non se puideron cargar as preferencias dende o servidor." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../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/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../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/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 @@ -2588,8 +2074,807 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../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 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "o parámetro \"{0}\" debe non ser nulo" + +#: ../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 +msgid "Draw" +msgstr "Debuxar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Debuxar nodos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "Foco do Debuxo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "seleccionado" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +msgid "Cannot add a node outside of the world." +msgstr "Non se pode engadir un nodo fora do mundo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528 +msgid "Add node" +msgstr "Engadir nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Engadir nodo na vía" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Conectar via existente a nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +msgid "Add a new node to an existing way" +msgstr "Engadir un novo nodo a unha via existente" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 +msgid "Add node into way and connect" +msgstr "Engadir nodo a vía e conectar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Crear novo nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Seleccionar nodo baixo o cursor." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Insertar novo nodo na vía." +msgstr[1] "Insertar novo nodo en {0} vías." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Comezar nova vía a partir do último nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Continuar vía a partir do último nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Rematar debuxo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Extrudir" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Crear áreas" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Extrudir Vía" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Soltar o botón do rato para deter a rotación." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Arrastrar un segmento de vía para crear un rectángulo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o " +"audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto." + +#: ../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:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Seleccionar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Seleccionar, mover e rotar obxectos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Engadir e mover un novo nodo virtual a unha vía." +msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Soltar o botón do rato para parar de mover. Ctrl para acoplar co nodo máis " +"próximo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Mover obxectos arrastrando; Maiúsculas para engadir á selección (Ctrl para " +"cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar selección" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Facer zoom e mover mapa" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl" +"+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" + +#: ../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 +msgid "Search..." +msgstr "Buscar..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Buscar obxectos." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Por favor, introduce unha cadea de busca." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "reemplazar selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "engadir á selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "eliminar da selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "sensible a maiúsculas" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "expresión regular" + +#: ../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' e 'Street' en calquer clave ou nome." + +#: ../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' en calquera clave ou nome." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "name:Bak - 'Bak' anywhere in the name." +msgstr "name:Bak - 'Bak' en calquer posición do nome." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "type=route - a clave 'type' co valor exacto 'route'" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - a clave 'type' con calquer valor. Proba tamén *=value, type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "-name:Bak - que non conteña 'Bak' no nome." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +msgid "foot: - key=foot set to any value." +msgstr "foot: - clave=foot establecida con calquer valor." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "Special targets:" +msgstr "Obxectivos especiais:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "type: - tipo do obxecto(node,way,relation)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +msgid "user:... - all objects changed by user" +msgstr "user:... - todos os obxectos cambiados polo usuario" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +msgid "id:... - object with given ID" +msgstr "id:... - obxecto coa ID indicada" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +msgid "nodes:... - object with given number of nodes" +msgstr "nodes:... - obxectro có número de nodos indicado" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "modified - todos os obxectos cambiados" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - todos os obxectos seleccionados" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - todos os obxectos incompletos" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - todos os obxectos sen etiquetar" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expresión - todos os fillos de obxectos que coincidan " +"coa expresión" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent expr - todos os pais de obxectos que coincidan coa " +"expresión" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use | or OR to combine with logical or" +msgstr "Usar | ou OR para combinar co operador OU lóxico" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "Usar \" para escapar operadores (p.e. se a clave conten : )" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "Usar ( e ) para agrupar expresións" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Buscar" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Comezar Busca" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "Non se atoparon coincidencias para \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, java-format +msgid "Nothing added to selection by searching for ''{0}''" +msgstr "Non se engadiu nada á selección buscando por \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#, java-format +msgid "Nothing removed from selection by searching for ''{0}''" +msgstr "Non se eliminou da selección buscando por \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#, java-format +msgid "Found {0} matches" +msgstr "Atopadas {0} coincidencias" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"A expresión regular \"{0}\" tiña un erro de análise no offset {1}, erro " +"completo:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou " +"relación" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Faltan argumentos para OR." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Faltan argumentos para NOT." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Esperabase parentese de peche." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Número de parámetros incorrecto para o operador nodes." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número " +"de nodos ou un rango, por exemplo nodes:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valor incorrecto do operador id: {0}. Espérase un número." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Cargar Selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Contacto {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Descargando..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "Non se puido ler dende a URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "Erro de análise na URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "Erro durante a comunicación co servidor." + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 +#, java-format +msgid "Change {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 +#, java-format +msgid "Remove \"{0}\" for {1} ''{2}''" +msgstr "Eliminar \"{0}\" para {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +msgstr "Establecer {0}={1} para {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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "obxecto" +msgstr[1] "obxectos" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Eliminar \"{0}\" para {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Establecer {0}={1} para {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Solucionar Conflito" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Non se atoparon coincidencias para \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Resolver conflitos en coordenadas en {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "Borrar {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 +#, java-format +msgid "Delete {0} {1}" +msgstr "Borrar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 +msgid "Conflicting relation" +msgstr "Relación contradictoria" + +#: ../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?" +msgstr "" +"A selección \"{0}\" é usada pola relación \"{1}\" co papel {2}.\n" +"Borrar da relación?" + +#: ../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:584 +msgid "Delete from relation" +msgstr "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" +"A selección \"{0}\" é usada pola relación \"{1}\".\n" +"Borrar da relación?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Separar segmento de vía" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Estás a punto de borrar nodos que se atopan fora da área que descargaches." +"
Isto pode causar problemas porque outros obxectos (que non ves) poden " +"estar usandoos.
Queres borralos realmente?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Resolver conflitos en estado borrado en {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Mover" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../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/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "nodo" +msgstr[1] "nodos" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Purgando 1 primitiva" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo de " +"2. Os actuais son {1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +msgstr "Resolver conflitos na lista de membros da relación {0}" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 +#, java-format +msgid "Remove relation member {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Secuencia" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, java-format +msgid "Undelete {0} primitives" +msgstr "Desfacer o borrado de {0} primitivas" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 +#, java-format +msgid "Resolve version conflicts for {0} {1}" +msgstr "Resolver conflitos de versión para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Resolver conflitos na lista de nodos da vía {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Aplicar?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos " +"seus nodos son suxeridos para manter a consistencia dos datos." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relación" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Papel antigo" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Novo papel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Clave antiga" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Valor antigo" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nova clave" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Novo valor" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Aplicar os cambios seleccionados" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Non aplicar cambios" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "Por favor, selecciona que cambios de propiedade queres aplicar." + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "Propiedades de " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Papeis nas relacións que fan referencia a" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Corrección" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, java-format +msgid "Malformed config file at lines {0}" +msgstr "Ficheiro de configuración mal formado nas liñas {0}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 +#, java-format +msgid "Cannot open preferences directory: {0}" +msgstr "Non se pode abrir o directorio de preferencias: {0}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 +#, java-format +msgid "Preferences file had errors. Making backup of old one to {0}." +msgstr "" +"O ficheiro de preferencias contiña erros. Creando copia de seguridade do " +"antigo a {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Preferencias almacenadas en {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, java-format +msgid "Could not upload preferences. Reason: {0}" +msgstr "Non se puideron subir as preferencias. Razón: {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +msgid "Could not load preferences from server." +msgstr "Non se puideron cargar as preferencias dende o servidor." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2617,5 +2902,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2624,27 +2909,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../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:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2652,13 +2937,13 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2666,22 +2951,22 @@ msgstr[1] "relacións" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relacións" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2695,23 +2980,23 @@ msgstr[1] "{0} membros" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "Carretera" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "Vía férrea" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "Vía acuática" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2769,5 +3054,5 @@ msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "A vía de estilo de área non está pechada." @@ -2905,9 +3190,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr "" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2924,5 +3204,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:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "fondo" @@ -2933,8 +3213,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2945,5 +3225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Zona Lambert (Franza)" @@ -2966,22 +3246,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Non se puideron ler os marcadores." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Non se puido escribir o marcador." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Non amosar de novo" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"Fallo ao iniciar comunicación co servidor OSM {0}.\n" +"Comproba o URL do servidor nas preferencias e a túa conexión a internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"A subida ao servidor fallou porque o teu
paquete " +"de datos actual viola a condición previa.
A mensaxe de erro é:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Violación de condición previa" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../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 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: 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:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "descoñecido" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Excepción Inesperada" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Non se puido conectar co servidor osm. Por favor revisa a túa conexión a " +"internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"Fallo ao iniciar comunicación co servidor OSM {0}.\n" +"Comproba o URL do servidor nas preferencias e a túa conexión a internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Maquina descoñecida" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"A subida fallou porque a primitiva que intentou " +"borrar
no servidor xa está borrada.

A mensaxe de erro é:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "A primitiva xa foi borrada" + +#: ../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 msgid "Message of the day not available" msgstr "Mensaxe do día non dispoñible" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Descargando \"Mensaxe do día\"" @@ -3062,63 +3458,57 @@ msgstr "Contrasinal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Non se puido atopar traducción para a localización {0}. Volvendo a {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "opcións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Amosar esta axuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Argumento de xeometría unix estandar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Descargar a caixa de límites" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Descargar a caixa de límites como datos gps en bruto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Seleccionar coa busca indicada" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Restablecer as preferencias ós valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Establecer o idioma." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "exemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3128,51 +3518,51 @@ "que cargas algo de información antes de --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "En lugar de --download= debes especificar osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Activando extensións actualizadas" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Cargando extensións anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Establecendo valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Cargando extensións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Axustes prestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3180,21 +3570,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Vista de malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Cambiar Vista de Malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Cambiar a vista de pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3238,53 +3628,68 @@ msgstr "escalar" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "A lonxitude xeográfica na posición do punteiro do rato." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "O nome do obxecto na posición do punteiro do rato." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "A latitude xeográfica na posición do punteiro do rato." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "O ángulo entre o segmento previo e o actual da vía." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "A dirección (da brúxula) do segmento de liña que se está a debuxar." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "A lonxitude do novo segmento de vía que se está a debuxar." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(sen obxecto)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "a capa non está na lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Contactando co servidor OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, 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 msgid "Error while parsing" msgstr "Erro durante a análise" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "Ficheiro non atopado" + +#: ../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 "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3309,4 +3714,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Inicializando" @@ -3338,20 +3744,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3359,47 +3765,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3407,25 +3813,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3462,5 +3868,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3471,5 +3877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3483,5 +3889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3556,7 +3962,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3630,14 +4035,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3666,10 +4071,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3678,19 +4083,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Si, desfacer o borrado de eles tamén" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Non, cancelar a operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3701,9 +4106,9 @@ "servidor.

Quere desfacer o borrado de eses nodos tamén?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Desfacer o borrado de nodos adicionais?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3713,13 +4118,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Desfacer o borrado de primitivas dependentes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3727,90 +4132,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3820,5 +4225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3843,12 +4248,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3893,10 +4297,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../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 #: ../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 @@ -3905,10 +4309,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../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:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3917,5 +4321,5 @@ msgstr "Valor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3975,9 +4379,9 @@ #: ../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:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3985,5 +4389,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:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4015,42 +4419,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../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 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Gardar de todas formas" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, java-format +msgid "" +"You didn''t finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 +msgid "Conflict not resolved completely" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Resolver conflitos de versión para {0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4068,23 +4489,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "" @@ -4092,73 +4513,106 @@ #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Capas" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Abrir unha lista de todas as capas cargadas." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Borrar a capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Existen cambios sen gardar. Borrar a capa igualmente?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Borrar Capa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Desexas realmente borrar a capa completa?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Información" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +msgid "Yes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Borrar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Borrar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Amosar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Cambiar o estado visible da capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Amosar/Ocultar Texto/Iconas" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Cambiar o estado visible do texto e iconas da marca." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Capas" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Abrir unha lista de todas as capas cargadas." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "Inactivo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Borrar a capa seleccionada." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Mover a capa seleccionada unha fila cara arriba." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Mover a capa seleccionada unha fila cara abaixo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Capas: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Máis información acerca desta característica" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4167,22 +4621,28 @@ msgstr[1] "Esto cambiará ata {0} obxectos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Un valor vacío borra a clave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Cambiar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, 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:265 #, java-format msgid "Change properties of up to {0} object" @@ -4191,85 +4651,90 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Por favor, selecciona unha tecla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Por favor selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor selecciona os obxectos dos que queres cambiar as propiedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Propiedades dos obxectos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Borrar realmente a selección da relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../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 #: ../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:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Engadir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Engadir un novo par clave/valor para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Editar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da clave seleccionada para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Borrar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Borrar a clave seleccionada en todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "" @@ -4278,63 +4743,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relacións" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Abrir unha lista con todas as relacións." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relacións: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Abrir un editor para a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Borrar a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Crear unha nova relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relacións: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Abrir un editor para a relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Borrar a relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Selección Actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Abrir unha ventá de lista de selección." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Actualizar a lista de seleccion." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Facer zoom sobre a selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4343,5 +4810,5 @@ msgstr[1] "{0} vías" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4350,5 +4817,5 @@ msgstr[1] "{0} relacións" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4359,5 +4826,10 @@ msgstr "Desacoplar o panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../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 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4366,144 +4838,411 @@ "da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Facer click para minimizar/maximizar o contido do panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../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 msgid "Authors" msgstr "Autores" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "" "Abrir a lista da xente que está a traballar nos obxectos seleccionados." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autores: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Área de Descarga" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Borrar a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Descargar Lugar" + +#: ../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:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relacións" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Descargando datos" + +#: ../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:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relacións" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Refacer a última acción desfeita." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

Do you really want to add another relation member?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +msgid "Multiple members referring to same primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711 +#, java-format +msgid "" +"You are trying to add a relation to itself.

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Fallou ao actualizar as primitivas seleccionadas." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Mover os membros actualmente seleccionados cara arriba" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Mover os membros seleccionados actualmente cara abaixo" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Eliminar da relación todos os obxectos seleccionados actualmente" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Borrar a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Non, cancelar a operación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Relación contradictoria" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Gardar os datos actuais." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../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 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Descargar todas as vías e nodos incompletos na relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Descargar Membros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Reducir Zoom" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Mover os membros seleccionados actualmente cara abaixo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Aplicar Cambios" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Básico" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Ocupado por" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Mover cara arriba" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Mover os membros actualmente seleccionados cara arriba" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Engadir Seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Engadir todos os obxectos seleccionados actualmente como membros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Eliminar Seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Eliminar da relación todos os obxectos seleccionados actualmente" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Mover cara abaixo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Mover os membros seleccionados actualmente cara abaixo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Eliminar o membro da fila actual desta relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Descargar Membros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Descargar todas as vías e nodos incompletos na relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Editor de Relación: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Cargar Selección" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4513,5 +5252,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../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 @@ -4521,25 +5260,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Marcadores" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Por favor, primeiro introduce as coordenadas desexadas." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Por favor, introduce un nome para o lugar." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "engadir á selección" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Selecciona primeiro un marcador." @@ -4574,22 +5310,22 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Fontes de Datos e Tipos" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Descargar como unha nova capa" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Área de Descarga" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" "Área de descarga demasiado grande; probablemente será rexeitada polo servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4598,13 +5334,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Por favor introduce unha cadea de busca" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Non se poden ler resultados de busca de lugar dende o servidor" @@ -4612,5 +5348,5 @@ #. 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:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Introduce o nome do lugar a buscar:" @@ -4618,5 +5354,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4624,6 +5360,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nome" @@ -4662,6 +5398,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4684,15 +5420,15 @@ msgstr "tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "cerca" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4701,5 +5437,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "" @@ -4731,5 +5467,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../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 msgid "Close the dialog" msgstr "" @@ -5471,5 +6213,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5636,59 +6378,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Imaxes para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Ler GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Non hai hora para o punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Non se atoparon imaxes con marcas de tempo lexibles." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Imaxes xeo-etiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Inicio GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Fin GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "Diferencia de zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5696,138 +6438,128 @@ msgstr[1] "imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} dentro da traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Sincronizar reloxo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "imaxes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "A data no ficheiro \"{0}\" non puido ser analizada." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Non hai hora EXIF no ficheiro \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Imaxe" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horaria da unidade GPS (differencia coa foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar hora coa da unidade GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "A hora introducida non puido ser analizada." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "punto gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Personalizar debuxo de liñas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Usar configuración global." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Debuxar liñas entre puntos para esta capa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Non debuxar liñas entre puntos para esta capa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Seleccionar as opcións de liña do debuxo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Personalizar Cor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Escolle unha cor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importar Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Ficheiros Wave Audio (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Marcas de audio de {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importar imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5836,5 +6568,5 @@ msgstr[1] "{0} trazados, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5843,5 +6575,5 @@ msgstr[1] "{0} rutas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5850,30 +6582,30 @@ msgstr[1] "{0} puntos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Nome: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Descrición: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Rango de tempo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Lonxitude: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5883,43 +6615,43 @@ "perxudicial.
Se desexas subir trazados, mira aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Convertido de: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Descargar todo o que abarca:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km cad." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5930,9 +6662,9 @@ "Desexas
continuar?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5940,5 +6672,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5948,47 +6680,47 @@ "correctamente os seus tempos foron omitidos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "fora da área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6013,5 +6745,5 @@ msgstr[1] "trazados" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6019,5 +6751,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6026,5 +6758,5 @@ msgstr[1] "un trazado con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6033,5 +6765,5 @@ msgstr[1] "{0} componse de {1} trazados" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6050,5 +6782,5 @@ msgstr[1] "marcas" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6057,9 +6789,9 @@ msgstr[1] "{0} componse de {1} marcas" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Sincronizar Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6067,20 +6799,20 @@ "Debes pausar o audio no momento que escoites a túa entrada de sincronización." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Audio sincronizado no punto {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Non se pode sincronizar nunha capa en reproducción." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6088,10 +6820,17 @@ msgstr "Debes ter pausado o audio no punto da pista onde queres a marca." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Amosar/Ocultar Texto/Iconas" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Cambiar o estado visible do texto e iconas da marca." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6099,5 +6838,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6105,29 +6844,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Non se puido crear unha nova marca de audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Houbo un erro tratando de amosar a URL desta marca." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(a URL era: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Erro amosando a URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Preferencias avanzadas" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Establecemento directo de entradas de preferencia. Usar con coidado!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../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 @@ -6135,27 +6874,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "O valor actual é o predeterminado." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "O valor predeterminado é \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" "O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../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 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Por favor selecciona a fila a editar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6163,14 +6902,14 @@ msgstr "Novo valor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../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 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Por favor seleccione a fila a borrar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Introduce un novo par clave/valor." @@ -6311,40 +7050,40 @@ msgstr "Calibración do grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Cor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Estilo de pintura {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Capa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Escoller" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Escolle unha cor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Establecer a predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Establecer todos ós predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Cores usadas por diferentes obxectos en JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Cores" @@ -6690,46 +7429,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Configurar os engadidos dispoñibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Descargar lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../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 msgid "Update" msgstr "Actualizar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Configurar sitios..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Por favor selecciona unha entrada." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +msgid "JOSM Plugin description URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Configurar os sitios dos engadidos" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Preferencias de Visualización" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6739,29 +7486,29 @@ "programa." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Preferencias de Conexión" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Preferencias de conexión para o servidor OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Preferencias do Mapa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Parámetros para a proxección do mapa e interpretación de datos." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Preferencias de audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Parámetros para o reproductor de audio e as marcas de audio." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos." @@ -6864,59 +7611,61 @@ msgstr "Atallo" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../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 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Borrar da lista a fonte seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7107,33 +7856,33 @@ msgstr "Grupos de modificadores" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Máis información acerca desta característica" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Atributos Opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Usar axuste preestablecido \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "vía pechada" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Tipo descoñecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7144,15 +7893,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Erro analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Os elementos do tipo {0} están soportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7162,18 +7911,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -7184,33 +7933,36 @@ msgstr "Grupo de axustes preestablecidos \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Contactando co Servidor OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Descargando os puntos {0} a {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Descargando datos de OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Preparando datos..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../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 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Non se puido ler \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7218,21 +7970,21 @@ msgstr "Ficheiros GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Marcas de {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7248,10 +8000,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "Descargando datos de 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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../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 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7259,48 +8030,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "Ficheiros NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Coordenadas importadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Sentencias mal formadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Erros de suma de verificación: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Sentencias descoñecidas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Coordenada cero: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Importación NMEA satisfactoria" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Fallo de importación NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Esta versión de JOSM é incompatible co servidor configurado." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7311,15 +8081,15 @@ "acepta {0} a {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7327,23 +8097,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Pechando colección de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Subindo..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Estilo de pintura {0}: {1}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7386,9 +8169,4 @@ msgid "Login" msgstr "Inicio de sesión" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Abortando..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7439,66 +8217,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Erro durante a análise." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Ficheiros de Servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Versión descoñecida" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Falta o número de versión dos datos do OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Versión descoñecida: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Atopouse un elemento no que non é unha vía." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " ten referencia cero" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Atopouse un elemento no que non é unha relación." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta de elemento con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Obxecto ilegal con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7506,46 +8288,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Falta o atributo obrigatorio \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Preparar os datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "ID de nodo mal formada" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Contactando co Servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7554,5 +8356,18 @@ "internet." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} restantes. Subindo {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 #, java-format msgid "" @@ -7561,16 +8376,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} restantes. Subindo {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Actualizar Engadidos" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Descargar Engadidos" @@ -7587,5 +8397,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7594,23 +8404,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7621,34 +8431,32 @@ msgstr "Ocurriu un erro no engadido {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Advertencia - foi solicitada a descarga do engadido {0}. Este engadido xa " "non é necesario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "O engadido {0} foi requerida polo engadido {1} pero non se atopou." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Engadido non atopado: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "A última actualización de engadidos foi fai máis de {0} días." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7659,21 +8467,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../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 msgid "Disable plugin" msgstr "Desactivar engadido" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7683,5 +8491,5 @@ "permisos para sobrescribir os existentes." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7690,10 +8498,10 @@ "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Dacordo coa información contida no engadido, o autor é {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7702,9 +8510,9 @@ "dun fallo." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Debería ser desactivado o engadido?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7712,27 +8520,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"O engadido non puido ser eliminado. Por favor, comentalle o problema á xente " -"que che propocionou JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Información" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Non se atopou información de engadidos." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "sen descripción dispoñible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7741,13 +8545,18 @@ msgstr[1] "Descargada información de engadidos de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Non se atopou información de engadidos." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Todos os engadidos instalados estan actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7760,9 +8569,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Descargar engadidos perdidos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7775,57 +8584,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: 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:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "descoñecido" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versión {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Engadido empaquetado con JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Erro lendo o ficheiro de informaclión de engadido: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Isto está despois do fin da grabación" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Erro reproducindo son" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Non facer nada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Informar de Fallo" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7840,18 +8627,18 @@ "erro." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Excepción Inesperada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7859,17 +8646,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Asegúrate de incluir a seguinte información:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(O texto xa foi copiado ao teu portapapeis.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Non amosar de novo" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"Non se puido atopar traducción para a localización {0}. Volvendo a {1}." + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7879,5 +8683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7885,5 +8689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7892,13 +8696,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Consello: Pode editar os atallos nas preferencias.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../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 +#, 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 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7906,21 +8725,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Seleccionar dúas vías cun nodo en común" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7928,74 +8747,75 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Público" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Conectando..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Subida de datos cancelada" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Error durante a subida de datos" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "A subida do GPX tivo éxito" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Subindo trazado GPX: {0}% ({1} de {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -8065,33 +8885,34 @@ msgstr "Un dos ficheiros seleccionados era nulo !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Ler fotos..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Atopouse un ficheiro nulo no directorio {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Erro obtendo ficheiros do directorio {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8111,15 +8932,15 @@ msgstr "Ficheiros GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Erro durante a análise {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8128,34 +8949,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8163,69 +8984,69 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8234,9 +9055,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8245,65 +9066,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8311,13 +9132,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Valores Predeterminados" @@ -8339,5 +9160,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Erro cargando ficheiro" @@ -8360,6 +9181,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8525,22 +9346,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8548,18 +9369,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8672,6 +9493,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "" @@ -8700,5 +9521,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8709,14 +9530,14 @@ "Crear unha nova." +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8804,4 +9625,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Non se cargaron datos." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8812,9 +9638,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8935,30 +9761,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8967,14 +9793,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "" @@ -9065,40 +9891,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "" @@ -9107,26 +9933,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9211,7 +10029,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "" @@ -9356,9 +10174,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9598,18 +10416,18 @@ msgstr "" +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +msgid "Open Visible..." +msgstr "" + #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -msgid "Open Visible..." -msgstr "" - -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open only files that are visible in current view." msgstr "Abrir só ficheiros que sexan visibles na vista actual." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9634,33 +10452,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9669,28 +10487,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9954,4 +10772,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10198,33 +11037,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10256,6 +11095,6 @@ #: ../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:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "" @@ -10265,10 +11104,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10355,22 +11194,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." msgstr "" @@ -10442,22 +11273,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "" @@ -10530,23 +11361,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10557,7 +11388,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:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10565,78 +11396,80 @@ #. 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:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../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:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10644,83 +11477,83 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Usar ficheiro de datos por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Usar o ficheiro de datos por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../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:726 +#: ../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:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Usar ficheiro de comprobación ortográfica predeterminado." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" "Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10865,7 +11698,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "" @@ -10879,5 +11712,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10911,10 +11744,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10968,7 +11801,31 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" msgstr "" @@ -10980,10 +11837,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -11032,14 +11889,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11050,26 +11907,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:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11077,5 +11934,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11085,5 +11942,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11092,107 +11949,107 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Gardar capa WMS nun ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "Cargar capa WMS dende ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Nome de Menú (Predeterminado)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "URL WMS (Predeterminada)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Copiar Predeterminado" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11297,11 +12154,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11311,10 +12173,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11322,5 +12184,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11330,5 +12192,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11338,15 +12200,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11354,5 +12216,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11360,5 +12222,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11367,15 +12229,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11384,10 +12246,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11396,15 +12258,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11414,10 +12276,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11426,5 +12288,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11433,5 +12295,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11439,11 +12301,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12598,58 +13467,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12663,6 +13480,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "" @@ -12688,6 +13505,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "" @@ -12713,6 +13530,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "" @@ -12738,6 +13555,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "" @@ -12751,5 +13568,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "" @@ -12767,5 +13584,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "" @@ -12799,6 +13616,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12825,6 +13642,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12874,5 +13691,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "" @@ -13851,5 +14668,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -15580,27 +16397,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: 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 msgid "sport" msgstr "" @@ -18439,7 +19256,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "" @@ -18509,7 +19326,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18535,5 +19352,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "" @@ -19024,13 +19841,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -19072,5 +19889,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19290,4 +20107,65 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +msgid "motorroad" +msgstr "" + #. color tertiary #. @@ -19322,6 +20200,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "" @@ -19377,7 +20255,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19433,8 +20311,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19455,5 +20333,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19467,5 +20345,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19486,5 +20364,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19499,5 +20377,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19512,5 +20390,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "" @@ -19524,5 +20402,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "" @@ -19536,5 +20414,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19562,5 +20440,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "" @@ -19728,13 +20606,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19796,7 +20674,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19819,10 +20697,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19858,7 +20736,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19903,6 +20781,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19916,5 +20794,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19936,5 +20814,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19948,5 +20826,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19994,7 +20872,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -20011,5 +20889,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -20024,5 +20902,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -20037,5 +20915,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -20050,5 +20928,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -20063,5 +20941,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -20076,5 +20954,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20179,10 +21057,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20196,5 +21074,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "" @@ -20208,5 +21086,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "" @@ -20334,12 +21212,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "" @@ -20353,5 +21231,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20423,8 +21301,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20526,10 +21404,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20915,22 +21793,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20962,6 +21840,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -21022,8 +21900,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "" @@ -21376,26 +22254,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "" @@ -21467,8 +22345,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "" @@ -21618,9 +22496,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "" @@ -21692,8 +22570,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "" @@ -21764,8 +22642,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21779,5 +22657,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "" @@ -21791,5 +22669,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21811,5 +22689,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21823,5 +22701,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "" @@ -21835,5 +22713,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21856,5 +22734,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21868,5 +22746,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "" @@ -21880,5 +22758,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21892,5 +22770,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21904,5 +22782,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21959,7 +22837,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "" @@ -21973,5 +22851,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "" @@ -21984,5 +22862,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "" @@ -21997,5 +22875,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "" @@ -22009,5 +22887,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "" @@ -22062,8 +22940,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -22077,5 +22955,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -22089,5 +22967,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -22101,5 +22979,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "" @@ -22113,5 +22991,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "" @@ -22125,5 +23003,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "" @@ -22201,8 +23079,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22250,7 +23128,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "" @@ -22392,10 +23270,10 @@ #. #. -#: 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_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: 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 msgid "place" msgstr "" @@ -22443,6 +23321,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "" @@ -22739,74 +23617,98 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Capa de datos" - -#~ msgid "Uploading data" -#~ msgstr "Subindo datos" - -#~ msgid "Not implemented yet." -#~ msgstr "Ainda sen implementar." - -#~ msgid "Email" -#~ msgstr "Correo Electrónico" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolver Conflitos" - -#~ msgid "There were conflicts during import." -#~ msgstr "Houbo conflitos durante a importación." +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha " +#~ "capa de datos?" + +#~ msgid "Update failed" +#~ msgstr "Actualización fallida" + +#~ msgid "Missing primitive" +#~ msgstr "Primitiva desaparecida" + +#~ msgid "Layers: {0}" +#~ msgstr "Capas: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Eliminar o membro da fila actual desta relación" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á " +#~ "xente que che propocionou JOSM." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou " +#~ "logo de esperar un tempo." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n" + +#~ msgid "Aborting..." +#~ msgstr "Abortando..." + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato " +#~ "mantendo o botón dereito pulsado. Seleccionar: Facer click." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contactando co servidor OSM..." + +#~ msgid "Basic" +#~ msgstr "Básico" + +#~ msgid "Occupied By" +#~ msgstr "Ocupado por" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Etiquetas (un valor vacío borra a etiqueta)" + +#~ msgid "Move Up" +#~ msgstr "Mover cara arriba" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Engadir todos os obxectos seleccionados actualmente como membros" + +#~ msgid "Remove Selected" +#~ msgstr "Eliminar Seleccionados" + +#~ msgid "Move Down" +#~ msgstr "Mover cara abaixo" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editor de Relación: {0}" + +#~ msgid "Error parsing server response." +#~ msgstr "Erro analizando a resposta do servidor." + +#~ msgid "Cannot connect to server." +#~ msgstr "Non se pode conectar co servidor." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Fai click en Recargar para actualizar a lista" #~ msgid "Object" #~ msgstr "Obxecto" -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} obxecto ten conflitos:" -#~ msgstr[1] "{0} obxectos teñen conflitos:" - -#~ msgid "my version:" -#~ msgstr "a miña versión:" - -#~ msgid "their version:" -#~ msgstr "a súa version:" - -#~ msgid "resolved version:" -#~ msgstr "versión final:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Nome de usuario OSM (correo-e)" - -#~ msgid "Unknown host" -#~ msgstr "Maquina descoñecida" - -#~ msgid "position" -#~ msgstr "posición" - -#~ msgid "different" -#~ msgstr "diferente" - -#~ msgid "true" -#~ msgstr "verdadeiro" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Solucionar {0} conflitos en {1} obxectos" - -#~ msgid "Change" -#~ msgstr "Cambiar" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Fai click en Recargar para actualizar a lista" +#~ msgid "Date" +#~ msgstr "Data" #~ msgid "Revert" #~ msgstr "Revertir" - -#~ msgid "Date" -#~ msgstr "Data" #~ msgid "" @@ -22817,35 +23719,33 @@ #~ "versión seleccionada na lista do historial." -#~ msgid "Rotate" -#~ msgstr "Xirar" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Etiquetas (un valor vacío borra a etiqueta)" - -#~ msgid "Error parsing server response." -#~ msgstr "Erro analizando a resposta do servidor." - -#~ msgid "Cannot connect to server." -#~ msgstr "Non se pode conectar co servidor." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar" +#~ msgid "Not implemented yet." +#~ msgstr "Ainda sen implementar." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Nome de usuario OSM (correo-e)" + +#~ msgid "Tagging preset source" +#~ msgstr "Fonte de etiquetado preestablecido" + +#~ msgid "Tagging preset sources" +#~ msgstr "Fontes de etiquetado preestablecido." #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki." -#~ msgid "Tagging preset source" -#~ msgstr "Fonte de etiquetado preestablecido" - -#~ msgid "Tagging preset sources" -#~ msgstr "Fontes de etiquetado preestablecido." - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou " -#~ "logo de esperar un tempo." +#~ msgid "their version:" +#~ msgstr "a súa version:" + +#~ msgid "my version:" +#~ msgstr "a miña versión:" + +#~ msgid "resolved version:" +#~ msgstr "versión final:" + +#~ msgid "Add Selected" +#~ msgstr "Engadir Seleccionados" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -22853,53 +23753,4 @@ #~ msgstr[0] "Engadido actualizado con éxito. Por favor reinicia JOSM." #~ msgstr[1] "Engadidos actualizados con éxito. Por favor reinicia JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Non se puido descargar o engadido: {0} de {1}" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato " -#~ "mantendo o botón dereito pulsado. Seleccionar: Facer click." - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "O engadido require a actualización de JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "O engadido xa existe" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Erro borrando ficheiro de engadido: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Algúns dos nodos están (case) na liña" - -#~ msgid "Import TCX File..." -#~ msgstr "Importar Ficheiro TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importar ficheiro TCX como trazado GPS" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo " -#~ "de preferencias.
O contrasinal é transferido ó servidor en texto " -#~ "plano, codificado na URL.
Non uses un contrasinal valioso." - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de " -#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/" -#~ "TaggingPresets para obter axuda." #~ msgid "" @@ -22909,4 +23760,19 @@ #~ "O engadido {0} semella estar estropeado ou non puido ser descargado " #~ "automáticamente." + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "O engadido require a actualización de JOSM: {0}." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Non se puido descargar o engadido: {0} de {1}" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Erro borrando ficheiro de engadido: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "O engadido xa existe" + +#~ msgid "Delete and Download" +#~ msgstr "Borrar e Descargar" #~ msgid "" @@ -22921,12 +23787,33 @@ #~ "{0}" -#~ msgid "Conflicts: {0}" -#~ msgstr "Conflitos: {0}" - -#~ msgid "Delete and Download" -#~ msgstr "Borrar e Descargar" - -#~ msgid "Solve Conflict" -#~ msgstr "Solucionar Conflito" +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de " +#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/" +#~ "TaggingPresets para obter axuda." + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo " +#~ "de preferencias.
O contrasinal é transferido ó servidor en texto " +#~ "plano, codificado na URL.
Non uses un contrasinal valioso." + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importar ficheiro TCX como trazado GPS" + +#~ msgid "Import TCX File..." +#~ msgstr "Importar Ficheiro TCX..." + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Algúns dos nodos están (case) na liña" + +#~ msgid "Email" +#~ msgstr "Correo Electrónico" #~ msgid "" @@ -22937,4 +23824,7 @@ #~ "elementos xa subidos teñen historial." +#~ msgid "unnamed" +#~ msgstr "sen nome" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -22947,4 +23837,28 @@ #~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:" +#~ msgid "Data Layer" +#~ msgstr "Capa de datos" + +#~ msgid "Change" +#~ msgstr "Cambiar" + +#~ msgid "Rotate" +#~ msgstr "Xirar" + +#~ msgid "position" +#~ msgstr "posición" + +#~ msgid "different" +#~ msgstr "diferente" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "true" +#~ msgstr "verdadeiro" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + #~ msgid "Cannot read numeric value from response" #~ msgstr "Non se pode ler valor numérico da resposta" @@ -22953,21 +23867,18 @@ #~ msgstr "A subida de datos fallou por causa descoñecida" +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Comprobando se o nodo {0} falta ..." + #~ msgid "Undeleting Way..." #~ msgstr "Desfacendo borrado de vía..." -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Comprobando se o nodo {0} falta ..." - #~ msgid "Undeleting relation..." #~ msgstr "Desfacendo o borrado da relación.." +#~ msgid "Keep mine" +#~ msgstr "Conservar a miña" + #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Comprobando se a primitiva {0} falta ..." - -#~ msgid "Keep mine" -#~ msgstr "Conservar a miña" - -#~ msgid "Delete mine" -#~ msgstr "Borrar a miña" #~ msgid "" @@ -22986,4 +23897,7 @@ #~ "
Fai click en {3} para cancelar.
" +#~ msgid "Delete mine" +#~ msgstr "Borrar a miña" + #~ msgid "" #~ "There are {0} primitives
selected for " @@ -22998,4 +23912,21 @@ #~ msgstr "Selección demasiado grande" +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Solucionar {0} conflitos en {1} obxectos" + +#~ msgid "There were conflicts during import." +#~ msgstr "Houbo conflitos durante a importación." + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} obxecto ten conflitos:" +#~ msgstr[1] "{0} obxectos teñen conflitos:" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Conflitos: {0}" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolver Conflitos" + #~ msgid "Didn't find an historized primitive with id {0} in this dataset" #~ msgstr ""