Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 15802) +++ applications/editors/josm/i18n/po/gl.po (revision 15910) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-05-23 21:11+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:36+0000\n" "Last-Translator: Rafael Ávila Coya \n" "Language-Team: Galician \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:44+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -67,9 +67,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 @@ -90,5 +90,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -99,4 +99,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Cancel" msgstr "Cancelar" @@ -498,6 +499,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 msgid "Overwrite" msgstr "Sobrescribir" @@ -535,5 +536,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 #, java-format msgid "File: {0}" @@ -642,8 +643,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -655,5 +656,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356 msgid "Error" msgstr "Erro" @@ -1030,5 +1031,5 @@ msgstr "Gardar os datos actuais." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 #, java-format msgid "File {0} exists. Overwrite?" @@ -1155,5 +1156,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:208 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871 msgid "Close" @@ -1379,53 +1380,84 @@ "continuar?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 msgid "Upload all changes to the OSM server." msgstr "SIbir todos os cambios ó servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Obxectos para engadir:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Obxectos para modificar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Obxectos para borrar:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Proporciona un breve comentario para os cambios que vas a subir:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Subir estes cambios?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Subir Cambios" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algún dato antes." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:159 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Hai conflictos sen resolver. Debes resolver estes antes." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Non hai cambios que subir." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Subindo datos" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205 +msgid "Uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.
Please synchronize your " +"local dataset using
File->Update Data, " +"resolve
any conflicts and try to upload again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:260 +msgid "" +"Uploading failed because the server has a newer version of one
of " +"your nodes, ways or relations.
Please synchronize your local dataset " +"using
File->Update Data, resolve
any conflicts " +"and try to upload again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:287 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2297,5 +2329,5 @@ #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262 msgid "deleted" msgstr "borrado" @@ -3121,5 +3153,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75 msgid "My version" msgstr "" @@ -3130,5 +3162,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3142,5 +3174,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 msgid "Their version" msgstr "" @@ -3295,4 +3327,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:140 msgid "parameter '{0}' must not be null" msgstr "" @@ -3324,9 +3357,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3334,47 +3367,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:265 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409 msgid "Undecide conflict between deleted state" msgstr "" @@ -6721,9 +6754,15 @@ msgstr "Fallo de importación NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:153 +#, java-format +msgid "preference {0} missing. Can't initialize OsmApi" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:206 msgid "This version of JOSM is incompatible with the configured server." msgstr "Esta versión de JOSM é incompatible co servidor configurado." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6734,47 +6773,33 @@ "acepta {0} a {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:211 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:192 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:250 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:265 msgid "Cannot read numeric value from response" msgstr "Non se pode ler valor numérico da resposta" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Pechando colección de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:367 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Subindo..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "A subida de datos fallou por causa descoñecida" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Sen inicializar" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Maquina descoñecida" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6910,13 +6935,5 @@ msgstr "Contactando co Servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -6933,5 +6950,12 @@ "logo de esperar un tempo." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103 +#, java-format +msgid "" +"WARNING: preference '{0}' or api version {1} of dataset requires to use " +"changesets, but API is not handle them. Ignoring changesets." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" @@ -7290,9 +7314,9 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7322,52 +7346,52 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:155 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Conectando..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:201 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 msgid "Upload cancelled" msgstr "Subida de datos cancelada" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:211 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 msgid "Error while uploading" msgstr "Error durante a subida de datos" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "GPX upload was successful" msgstr "A subida do GPX tivo éxito" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Subindo trazado GPX: {0}% ({1} de {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:337 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:340 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:362 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:343 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 msgid "Uploading GPX Track" msgstr "" @@ -7712,5 +7736,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355 msgid "Error loading file" msgstr "Erro cargando ficheiro" @@ -7757,25 +7781,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166 #, java-format msgid "Change the projection to {0} first." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." msgstr "" @@ -8014,9 +8053,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" +msgid "Adjust the position of the WMS layer (raster images only)" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -8030,6 +8069,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Blank Layer" msgstr "" @@ -8059,25 +8098,25 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Save WMS layer to file" msgstr "Gardar capa WMS nun ficheiro" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295 msgid "Save WMS layer" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 msgid "Load WMS layer from file" msgstr "Cargar capa WMS dende ficheiro" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 msgid "Load WMS layer" msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -8085,5 +8124,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" @@ -10335,5 +10374,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "" @@ -10379,19 +10418,51 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" msgstr "" @@ -10400,5 +10471,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10411,40 +10482,40 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro" @@ -21887,4 +21958,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Subindo datos" + +#~ msgid "Unknown host" +#~ msgstr "Maquina descoñecida" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki." @@ -21934,2 +22011,8 @@ #~ msgid "Delete and Download" #~ msgstr "Borrar e Descargar" + +#~ msgid "Not initialized" +#~ msgstr "Sen inicializar" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "A subida de datos fallou por causa descoñecida"