Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 15909) +++ /applications/editors/josm/i18n/po/ar.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:32+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:45+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -68,9 +68,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 @@ -91,5 +91,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 @@ -100,4 +100,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 "إلغاء" @@ -493,6 +494,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 "الكتابة فوقه" @@ -529,5 +530,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}" @@ -634,8 +635,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 @@ -647,5 +648,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 "خطأ" @@ -1014,5 +1015,5 @@ msgstr "إحفظ المعطيات الحالية." -#: ../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?" @@ -1130,5 +1131,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" @@ -1339,53 +1340,84 @@ msgstr "" -#: ../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 "حمّل إلى أو.أس.أم ..." -#: ../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 "حمّل كل التغييرات إلى الخادم أو.أس.أم ." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "الأغراض اللتي يجب إضافتها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "الأغراض اللتي يجب تغييرها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "الأغراض اللتي يجب حذفها:" -#: ../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 "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "حمّل هذه التغييرات :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "حمّل التغييرات" -#: ../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 "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" -#: ../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 "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "لا يوجد تغييرات للتحميل." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "جاري تحميل التغييرات" +#: ../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 @@ -2247,5 +2279,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 "تم حذفه" @@ -3063,5 +3095,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 "" @@ -3072,5 +3104,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" @@ -3084,5 +3116,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 "" @@ -3237,4 +3269,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 "" @@ -3266,9 +3299,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 " @@ -3276,47 +3309,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 "" @@ -6601,9 +6634,15 @@ msgstr "فشل إستيراد 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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6612,47 +6651,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "اعداد..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "جاري الإرسال..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "مضيف غير معروف" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6788,13 +6813,5 @@ msgstr "جاري الإتصال بلخادم" -#: ../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." @@ -6807,5 +6824,12 @@ msgstr "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت." -#: ../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})" @@ -7142,9 +7166,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 @@ -7174,52 +7198,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 "" -#: ../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 "تمّ إلغاء التحميل" -#: ../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 "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 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 "" -#: ../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 "" @@ -7560,5 +7584,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 "" @@ -7605,25 +7629,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 "" @@ -7860,9 +7899,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}" @@ -7876,6 +7915,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 "" @@ -7905,25 +7944,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 "" #: ../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 "" #: ../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}" @@ -7931,5 +7970,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 "" @@ -10176,5 +10215,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "" @@ -10220,19 +10259,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 "" @@ -10241,5 +10312,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10252,40 +10323,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 "" @@ -21728,4 +21799,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "جاري تحميل التغييرات" + +#~ msgid "Unknown host" +#~ msgstr "مضيف غير معروف" + #~ msgid "Commit comment" #~ msgstr "أودع الملاحظات" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 15909) +++ /applications/editors/josm/i18n/po/bg.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:34+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 19:00+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Bulgarian \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:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:47+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 "Отмяна" @@ -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 "Презаписване" @@ -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}" @@ -643,8 +644,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 @@ -656,5 +657,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 "Грешка" @@ -1035,5 +1036,5 @@ msgstr "Запазване на текущите данни." -#: ../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?" @@ -1159,5 +1160,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" @@ -1386,53 +1387,84 @@ "да продължите?" -#: ../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 "Качи на 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 "Качване на всички промени на OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Обекти за добавяне:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Променени обекти:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Обекти за изтриване:" -#: ../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 "Опишете измененията на качваните от вас данни:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Качване на тези промени?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Качване на промени" -#: ../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 "Нищо за качване. Първо създайте някакви данни." -#: ../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 "Има неразрешени конфликти. Първо трябва да ги разрешите." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Няма промени за качване." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Качване на данни" +#: ../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 @@ -2310,5 +2342,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 "изтрито" @@ -3148,5 +3180,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 "" @@ -3157,5 +3189,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" @@ -3169,5 +3201,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 "" @@ -3322,4 +3354,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 "" @@ -3351,9 +3384,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 " @@ -3361,47 +3394,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 "" @@ -6749,9 +6782,15 @@ msgstr "Грешка при 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 "Тази версия на JOSM е несъвместима с конфигурирания сървър." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6762,47 +6801,33 @@ "{0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:211 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "При комуникация с {0} се свързахме използвайки протокол версия {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 "Не може да се прочетат числова стойност от отговора" -#: ../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 "Затваряне на списък промени по версии..." -#: ../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 "Подготвяне…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Качване..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "Качването на данни неуспя по неизяснена причина" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Не е инициализирано" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Неизвестен хост" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6938,13 +6963,5 @@ msgstr "Свързване със сървъра..." -#: ../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." @@ -6960,5 +6977,12 @@ "повторете опита си по-късно." -#: ../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})" @@ -7333,9 +7357,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 @@ -7365,52 +7389,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 "Избрана следа: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Свързване..." -#: ../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 "Качването е отменено" -#: ../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 "Грешка при качване" -#: ../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 "Качване на GPX данни беше успешно" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "Качването неуспешно. Сървърът върна следното съобщение: " -#: ../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 "Качване GPX следа: {0}% ({1} of {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 "Няма избран GPX слой. Не може да се качи следа." -#: ../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 "Качване на GPX следа" @@ -7768,5 +7792,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 "Грешка при зареждане на файла" @@ -7815,22 +7839,22 @@ msgstr "Избор на Tableau d'Assemblage" -#: ../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 "Променете първо проекцията до {0}." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7839,4 +7863,19 @@ "За да включите кадастровия WMS plugin, променете\n" "проекцията на JOSM до Ламбертова и рестартирайте" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8090,9 +8129,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Настройване позицията на WMS слоя" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -8108,6 +8147,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 "Празен слой" @@ -8137,25 +8176,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 "Запис на WMS слоя във файл" #: ../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 "Зареждане на WMS слой от файл" #: ../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}" @@ -8163,5 +8202,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 "Грешка във формата на файла" @@ -10484,5 +10523,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Възникна грешка" @@ -10551,20 +10590,52 @@ msgstr "Помощ за модула WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Трансформирано изображение..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Сваляне трансформирано изображение от Metacarta's Map Rectifier WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier image id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10572,5 +10643,5 @@ msgstr "Настройте позицията на избрания WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10585,15 +10656,15 @@ 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 "WMS слой ({0}), автоматично сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS слой ({0}), сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10602,25 +10673,25 @@ "разделителната способност." -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Отворете празен WMS слой за да заредите данни от файл" @@ -22106,4 +22177,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Качване на данни" + +#~ msgid "Unknown host" +#~ msgstr "Неизвестен хост" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Добавяне или на site-josm.xml, или на Wiki страници." @@ -22130,4 +22207,13 @@ #~ "картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Настройване позицията на WMS слоя" + #~ msgid "Charge" #~ msgstr "Такса" @@ -22153,4 +22239,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Сваляне трансформирано изображение от Metacarta's Map Rectifier WMS" #~ msgid "Portcullis" @@ -22203,2 +22292,8 @@ #~ msgid "Start routing" #~ msgstr "Започни маршрутизиране" + +#~ msgid "Not initialized" +#~ msgstr "Не е инициализирано" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Качването на данни неуспя по неизяснена причина" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 15909) +++ /applications/editors/josm/i18n/po/cs.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-29 19:18+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-12 12:24+0000\n" "Last-Translator: hanoj \n" "Language-Team: Czech \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:46+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,9 +69,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 @@ -92,5 +92,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 @@ -101,4 +101,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 "Zrušit" @@ -496,6 +497,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 "Přepsat" @@ -532,5 +533,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}" @@ -639,8 +640,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 @@ -652,5 +653,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 "Chyba" @@ -1025,5 +1026,5 @@ msgstr "Uložit aktuální data." -#: ../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?" @@ -1148,5 +1149,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" @@ -1372,53 +1373,84 @@ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?" -#: ../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 "Nahrát do 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 "Nahrát všechy změny na OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Objekty k přidání:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objekty ke změnění:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objekty ke smazání:" -#: ../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 "Napište stručný komentář ke změnám, které nahráváte na server:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Nahrát tyto úpravy?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Nahrát změny na server" -#: ../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 "Není nic k nahrání. Nejprve musíte mít nějaká data." -#: ../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 "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Žádné změny k nahrání." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Nahrávám data" +#: ../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 @@ -2293,5 +2325,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 "smazáno" @@ -3131,5 +3163,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 "" @@ -3140,5 +3172,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" @@ -3152,5 +3184,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 "" @@ -3305,4 +3337,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 "" @@ -3334,9 +3367,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 " @@ -3344,47 +3377,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 "" @@ -6678,9 +6711,15 @@ msgstr "NMEA import selhal!" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6689,47 +6728,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Otevírám sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Zavírám sadu změn..." -#: ../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 "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Nahrávám..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Není inicializováno" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Neznámé jméno počítače" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6865,13 +6890,5 @@ msgstr "Kontaktuji server..." -#: ../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." @@ -6888,5 +6905,12 @@ "oblast." -#: ../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})" @@ -7253,9 +7277,9 @@ msgstr "Vytvořit mřížku cest" -#: ../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 "Nahrát trasy" -#: ../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 @@ -7285,52 +7309,52 @@ msgstr "Prosím zadejte tagy o vaší trase" -#: ../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 "Zvolená trasa: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Připojuji se..." -#: ../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 "Nahrávání přerušeno" -#: ../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 "Chyba při nahrávání na server" -#: ../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 "Nahrání GPX dat na server proběhlo úspěšně" -#: ../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 "Nahrávání selhalo. Server vrátil následující chybu: " -#: ../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 "Nahrávám GPX trasu: {0}% ({1} z {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 "Není zadán žádný popisek. Prosíme, zadejte jej." -#: ../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 "Není vybrána GPX vrstva. Nelze nahrát trasu na server." -#: ../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 "Není zadáno uživatelské jméno." -#: ../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 "Není zadáno heslo." -#: ../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 "Nahrávám GPX trasu na server" @@ -7686,5 +7710,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 "Chyba při nahrávání souboru" @@ -7733,22 +7757,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Katastr" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Neplatná projekce" -#: ../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 "Nejprve změňte projekci na {0}." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7757,4 +7781,19 @@ "Pro použití katastrálního WMS pluginu, změňte projekci na Lambertovu a " "restartujte JOSM" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -7997,9 +8036,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Upravit pozici WMS vrstvy" +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}" @@ -8013,6 +8052,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 "Prázdná vrstva" @@ -8042,25 +8081,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 "Uložit WMS vrstvu do souboru" #: ../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 "Nahrát WMS vrstvu ze souboru" #: ../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}" @@ -8068,5 +8107,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 "Chyba formátu souboru" @@ -10365,5 +10404,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Nastala výjimka" @@ -10409,19 +10448,51 @@ msgstr "Nápověda pluginu WMS Plugin" -#: ../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 "Zaměřený obrázek..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta" - -#: ../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 "" @@ -10430,5 +10501,5 @@ msgstr "Upravit pozici zvolené WMS vrstvy" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10443,15 +10514,15 @@ msgstr "Automatické stahování" -#: ../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 "WMS vrstva ({0}), automatické stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10459,25 +10530,25 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu" @@ -10648,5 +10719,7 @@ #: build/trans_plugins.java:25 msgid "Helps vectorizing WMS images." -msgstr "Pomáká vektorizovat obrázky z WMS." +msgstr "" +"Vektrorizuje hranice souše a vody ze snímků družice Landsat, pásmo IR. " +"Vhodné pro rozsáhlé vodní plochy." #. Plugin livegps @@ -21940,4 +22013,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Nahrávám data" + +#~ msgid "Unknown host" +#~ msgstr "Neznámé jméno počítače" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." @@ -21962,4 +22041,7 @@ #~ "tlačítko a pohybuj myší. Vybrat: Kliknutí." +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Upravit pozici WMS vrstvy" + #~ msgid "Server does not support changesets" #~ msgstr "Server nepodporuje sady změn" @@ -21982,4 +22064,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Opravdu označit tento problém jako \"hotový\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta" #~ msgid "" @@ -22025,2 +22110,5 @@ #~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento " #~ "plugin může být použit pro přípravu tras pro uploud do OSM." + +#~ msgid "Not initialized" +#~ msgstr "Není inicializováno" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 15909) +++ /applications/editors/josm/i18n/po/da.po (revision 15910) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-07 12:55+0000\n" -"Last-Translator: nanker \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:18+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Danish \n" "MIME-Version: 1.0\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:46+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 "Fortryd" @@ -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 "Overskriv" @@ -534,5 +535,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}" @@ -641,8 +642,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 @@ -654,5 +655,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 "Fejl" @@ -1027,5 +1028,5 @@ msgstr "Gem nuværende data." -#: ../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?" @@ -1149,5 +1150,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" @@ -1365,53 +1366,84 @@ "fortsætte?" -#: ../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 "Send til 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 "Send alle ændringer til OSM-serveren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Tilføjede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Ændrede objekter:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Slettede objekter:" -#: ../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 "Angiv en kort kommentar for de ændringer, du uploader:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Send disse ændringer?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Send ændringer" -#: ../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 "Intet at sende. Skab først noget data." -#: ../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 "Der er uløste konflikter. Du skal løse disse først." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Ingen ændringer at sende." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Sender data" +#: ../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 @@ -2275,5 +2307,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 "slettet" @@ -3101,5 +3133,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 "" @@ -3110,5 +3142,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" @@ -3122,5 +3154,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 "" @@ -3275,4 +3307,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 "" @@ -3304,9 +3337,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 " @@ -3314,47 +3347,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 "ingen" -#: ../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 "" @@ -6647,9 +6680,15 @@ msgstr "Fejl ved NMEAimport!" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6658,47 +6697,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Åbner rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Lukker rettesæt..." -#: ../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 "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Uploader..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Ukendt vært" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6835,13 +6860,5 @@ msgstr "Forbinder til server..." -#: ../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." @@ -6857,5 +6874,12 @@ "igen om kort tid." -#: ../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})" @@ -7223,9 +7247,9 @@ msgstr "Opret et net af veje" -#: ../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 "Send sporing" -#: ../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 @@ -7255,52 +7279,52 @@ msgstr "Indtast nogle nøgleord om din sporing" -#: ../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 "Valgt spor: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Forbinder..." -#: ../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 "Opdatering afbrudt" -#: ../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 "Fejl under upload" -#: ../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 "GPX-upload lykkedes" -#: ../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 "Upload fejlede. Serveren angav følgende besked: " -#: ../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 "Sender GPX-spor: {0}% ({1} af {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 "Ingen beskrivelse er angivet. Tilføj venligst en beskrivelse." -#: ../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 "Intet GPX-lag er valgt. Kan ikke sende sporingen." -#: ../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 "Intet brugernavn er angivet." -#: ../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 "Intet kodeord er angivet." -#: ../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 "Sender GPX-spor" @@ -7655,5 +7679,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 "Fejl ved indlæsning af fil" @@ -7702,25 +7726,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 "" @@ -7960,9 +7999,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Tilpas positionen for WMS-laget" +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}" @@ -7976,6 +8015,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 "Tomt lag" @@ -8005,25 +8044,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 "" #: ../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 "" #: ../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}" @@ -8031,5 +8070,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 "Fil format fejl" @@ -10296,5 +10335,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "En undtagelse opstod" @@ -10363,19 +10402,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 "Korrigeret billede..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Hent korrigeret billede fra Metacartas Map Recitifier WMS" - -#: ../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 "" @@ -10384,5 +10455,5 @@ msgstr "Tilpas positionen for det valgte WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10395,15 +10466,15 @@ msgstr "Automatisk download" -#: ../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" @@ -10412,25 +10483,25 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Åbn et tomt WMS-lag for at hente data fra en fil" @@ -21884,4 +21955,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Sender data" + +#~ msgid "Unknown host" +#~ msgstr "Ukendt vært" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Tilføj enten site-josm.xml eller Wiki-sider." @@ -21907,4 +21984,7 @@ #~ "flyt musen. Vælg: Klik" +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Tilpas positionen for WMS-laget" + #~ msgid "Server does not support changesets" #~ msgstr "Serveren undersøtter ikke rettesæt" @@ -21927,4 +22007,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Hent korrigeret billede fra Metacartas Map Recitifier WMS" #~ msgid "Portcullis" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 15909) +++ /applications/editors/josm/i18n/po/de.po (revision 15910) @@ -9,6 +9,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-09 16:20+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-14 09:33+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,9 +71,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 @@ -94,5 +94,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 @@ -103,4 +103,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 "Abbrechen" @@ -311,5 +312,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 msgid "Align Nodes in Line" -msgstr "Knotenpunkte in einer Line anordnen." +msgstr "Knotenpunkte in einer Linie anordnen" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 @@ -504,6 +505,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 msgid "Overwrite" msgstr "Überschreiben" @@ -540,5 +541,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 #, java-format msgid "File: {0}" @@ -647,8 +648,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -660,5 +661,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356 msgid "Error" msgstr "Fehler" @@ -1038,5 +1039,5 @@ msgstr "Aktuelle Daten speichern." -#: ../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?" @@ -1161,5 +1162,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" @@ -1391,53 +1392,96 @@ "Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie fortfahren?" -#: ../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 "Zum OSM-Server hochladen..." -#: ../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 "Alle Änderungen zum OSM-Server hochladen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Neue Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Geänderte Objekte:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Zu löschende Objekte:" -#: ../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 "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Diese Änderungen hochladen?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Änderungen hochladen" -#: ../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 "Nichts geändert. Erfassen Sie erst einige Daten." -#: ../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 "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Keine Änderungen zum Hochladen vorhanden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Daten werden hochgeladen" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205 +msgid "Uploading" +msgstr "Hochladen" + +#: ../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 "" +"Hochladen fehlgeschlagen, da der Server eine neuere " +"Version einer Ihrer
Knoten, Wege oder Relationen hat.
Der Konflikt " +"wird von {0} mit ID {1} verursacht,
der " +"Server hat Version {2}, Ihre Version ist {3}.
Bitte synchronisieren Sie " +"Ihren lokalen Datensatz mittels
Datei->Daten aktualisieren, lösen
alle Konflikte und versuchen das Hochladen erneut." + +#: ../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 "" +"Hochladen fehlgeschlagen, da der Server eine neuere Version einer " +"Ihrer
Knoten, Wege oder Relationen hat.
Bitte synchronisieren Sie " +"Ihren lokalen Datensatz mittels
Datei->Daten aktualisieren, lösen
alle Konflikte und versuchen das Hochladen erneut." + +#: ../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 "Hochladen zu OSM-API fehlgeschlagen" + +#: ../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 "" +"Aufbau der Verbindung zum OSM-Server {0} ist fehlgeschlagen.\n" +"Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre Internetverbindung." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2324,5 +2368,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 "gelöscht" @@ -3171,5 +3215,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 "Meine Version" @@ -3180,5 +3224,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" @@ -3194,5 +3238,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 "Deren Version" @@ -3362,4 +3406,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 "Parameter \"{0}\" darf nicht NULL sein." @@ -3395,9 +3440,9 @@ msgstr "Unerwarteter Spaltenindex ({0})" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)" -#: ../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 " @@ -3405,47 +3450,47 @@ msgstr "Vereinigte Merkmale werden die lokalen nach der Übernahme ersetzen." -#: ../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 "Eigenschaften in deren Datensatz (Serverdatensatz)" -#: ../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 "Koordinaten:" -#: ../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 "Löschstatus:" -#: ../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 "(nichts)" -#: ../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 "nicht gelöscht" -#: ../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 "Behalte meine Koordinaten" -#: ../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 "Behalte Server-Koordinaten" -#: ../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 "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten." -#: ../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 "Behalte den Löchstatus der lokalen Daten." -#: ../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 "Behalte den Löchstatus der Server-Daten." -#: ../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 "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus." @@ -6057,5 +6102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213 msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)." +msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)" #. only on the head of a way @@ -6316,5 +6361,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 msgid "Connection Settings for the OSM server." -msgstr "Verbinungseinstellungen zum OSM Server." +msgstr "Verbindungseinstellungen zum OSM-Server." #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 @@ -6803,9 +6848,15 @@ msgstr "NMEA-Einlesen fehlgeschlagen!" -#: ../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 "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:206 msgid "This version of JOSM is incompatible with the configured server." msgstr "Diese JOSM-Version ist mit dem ein eingestellten Server inkompatibel." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6816,47 +6867,33 @@ "bis {1} unterstützt." -#: ../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 "Kommunikation mit {0} mittels Protokollversion {1} etabliert." -#: ../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 "Kann keinen numerischen Wert aus der Antwort lesen" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Öffne Änderungssatz..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Schließe Änderungssatz..." -#: ../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 "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Daten hochladen..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "Hochladen der Daten aus unbekanntem Grund fehlgeschlagen" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Nicht initialisiert" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Rechner unbekannt" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6997,15 +7034,5 @@ msgstr "Serververbindung..." -#: ../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 "" -"Aufbau der Verbindung zum OSM-Server {0} ist fehlgeschlagen.\n" -"Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre Internetverbindung." - -#: ../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." @@ -7022,5 +7049,15 @@ "kleineren Ausschnitt zu laden oder versuchen Sie es nach einiger Zeit erneut." -#: ../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 "" +"WARNUNG: Einstellung '{0}' oder API-Version {1} erfordern die Nutzung von " +"Änderungssätzen, aber die API kann diese nicht verarbeiten. Änderungssätze " +"werden ignoriert." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" @@ -7395,9 +7432,9 @@ msgstr "Ein Wegegitter erstellen." -#: ../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 "GPS-Spur hochladen" -#: ../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 @@ -7427,53 +7464,53 @@ msgstr "Bitte Stichworte für die GPS-Spur angeben." -#: ../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 "Gewählte GPS-Spur: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Verbinden..." -#: ../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 "Hochladen abgebrochen" -#: ../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 "Fehler beim Hochladen" -#: ../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 "GPX-Hochladen war erfolgreich" -#: ../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 "" "Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: " -#: ../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 "GPS-Spur hochladen: {0}% ({1} von {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 "Keine Beschreibung angegeben. Bitte Beschreibungstext ergänzen." -#: ../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 "Keine GPX-Ebene gewählt. Kann GPS-Spur nicht hochladen." -#: ../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 "Kein Nutzername angegeben." -#: ../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 "Kein Passwort angegeben." -#: ../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 "GPS-Spur hochladen" @@ -7834,5 +7871,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 "Fehler beim Laden der Datei" @@ -7881,22 +7918,22 @@ msgstr "Montagetabelle wählen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Automatische Quellenangabe" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Ungültige Projektion" -#: ../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 "Ändern Sie die Projektion vorher auf {0}." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7905,4 +7942,19 @@ "Um das Kataster-WMS-Plugin zu aktivieren, ändern Sie die JOSM-Projektion auf " "Lambert und starten neu." + +#: ../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 "JOSM wird zum Aktivieren der Änderung beendet." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8158,9 +8210,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Die Position der WMS-Ebene anpassen" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "Position des WMS-Layers justieren (nur Rasterbilder)" #: ../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}" @@ -8176,6 +8228,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 "Leere Ebene" @@ -8205,25 +8257,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 "WMS-Ebene in Datei speichern" #: ../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 "WMS-Ebene speichern" #: ../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 "WMS-Ebene aus Datei laden" #: ../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 "WMS-Ebene laden" #: ../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}" @@ -8231,5 +8283,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 "Dateiformatfehler" @@ -10559,5 +10611,5 @@ msgstr "Kreuzung erreicht" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Fehler" @@ -10627,20 +10679,54 @@ msgstr "Hilfe für WMS-Plugin" -#: ../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 "Berichtigtes Bild..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Berichtigtes Bild von Metacartas-WMS-Kartenkorrektur herunterladen" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta-Kartenkorrektur Bildnummer" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "Korrekturnummer={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "Berichtigte Bilder von verschiedenen Diensten herunterladen" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "WMS: {0}" + +#. 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 "Angepasste WMS-URL" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "Unterstützte Berichtigungsservices:" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "Webseite besuchen" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "WMS-URL oder Bild-ID:" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "Berichtigtes Bild hinzufügen" + +#: ../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 "" +"Der eingegebene Link oder die ID konnte dem gewählten Service nicht " +"zugeordnet werden. Bitte versuchen Sie es erneut." + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "Keine gültige WMS-URL oder ID" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10648,5 +10734,5 @@ msgstr "Die Position der gewählten WMS-Ebene anpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10661,15 +10747,15 @@ msgstr "Automatisches Laden" -#: ../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 "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10678,25 +10764,25 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Fehlerkacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden" @@ -22191,2 +22277,26 @@ msgid "Terraserver Urban" msgstr "Terraserver Urban" + +#~ msgid "Uploading data" +#~ msgstr "Daten werden hochgeladen" + +#~ msgid "Unknown host" +#~ msgstr "Rechner unbekannt" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta-Kartenkorrektur Bildnummer" + +#~ msgid "rectifier id={0}" +#~ msgstr "Korrekturnummer={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Die Position der WMS-Ebene anpassen" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Berichtigtes Bild von Metacartas-WMS-Kartenkorrektur herunterladen" + +#~ msgid "Not initialized" +#~ msgstr "Nicht initialisiert" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Hochladen der Daten aus unbekanntem Grund fehlgeschlagen" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 15909) +++ /applications/editors/josm/i18n/po/el.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-06-06 17:26+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:02+0000\n" "Last-Translator: alichani \n" "Language-Team: Greek \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:46+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+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 "Ακύρωση" @@ -492,6 +493,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 "Αντικατάσταση" @@ -529,5 +530,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}" @@ -636,8 +637,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 @@ -649,5 +650,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 "Σφάλμα" @@ -1024,5 +1025,5 @@ msgstr "Αποθήκευση τεχόντων δεδομένων." -#: ../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?" @@ -1144,5 +1145,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" @@ -1357,53 +1358,84 @@ "συνεχίσετε;" -#: ../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 "Αποστολή προς 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 "Αποστολή όλων των αλλαγών στον δακομιστή του OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Αντικείμενα που θα προστεθούν:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Αντικείμενα που θα αλλαχτούν" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Αντικείμενα που θα διαγραφούν:" -#: ../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 "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Να αποσταλούν αυτές οι αλλαγές;" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Αποστολή Αλλαγών" -#: ../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 "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." -#: ../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 "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Αποστολή δεδομένων" +#: ../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 @@ -2269,5 +2301,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 "διαγράφηκε" @@ -3097,5 +3129,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 "" @@ -3106,5 +3138,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" @@ -3118,5 +3150,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 "" @@ -3271,4 +3303,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 "" @@ -3300,9 +3333,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 " @@ -3310,47 +3343,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 "" @@ -6639,9 +6672,15 @@ msgstr "Αποτυχία εισαγωγής 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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6650,47 +6689,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Κλείσιμο πακέτου αλλαγών" -#: ../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 "Προετοιμασία..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Αποστολή..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Άγνωστος υπολογιστής" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6826,13 +6851,5 @@ msgstr "Επικοινωνία με τον Διακομιστή..." -#: ../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." @@ -6849,5 +6866,12 @@ "ξαναδοκιμάστε αργότερα." -#: ../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})" @@ -7221,9 +7245,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 @@ -7253,52 +7277,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 "Σύνδεση..." -#: ../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 "Ακυρώθηκε η αποστολή" -#: ../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 "Σφάλμα κατά την αποστολή" -#: ../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 "Η αποστολη GPX ήταν επιτυχής" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "Η αποστολή απέτυχε. Ο διακομιστής επέστρεψε το παρακάτω μηνυμα: " -#: ../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 "Αποστολή ίχνους GPX : {0}% ({1} από {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 "Αποστολή Ίχνους GPX" @@ -7645,5 +7669,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 "Σφάλμα φόρτωσης αρχείου" @@ -7690,25 +7714,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 "Αλλάξτε την προβολή σε {0} πρώτα." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" "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 "" @@ -7950,9 +7989,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}" @@ -7968,6 +8007,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 "Άδειο επίπεδο" @@ -7997,25 +8036,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 "Αποθ'ηκευση επιπέδου WMS σε αρχείο" #: ../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 "Φόρτωση επιπέδου WMS από αρχείο" #: ../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}" @@ -8023,5 +8062,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 "Σφάλμα μορφής αρχείου" @@ -10288,5 +10327,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Δημιοθργήθηκε εξαίρεση" @@ -10332,19 +10371,51 @@ msgstr "Βοήθεια πρόσθετου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Ανορθωμένη Εικόνα..." -#: ../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 "" @@ -10353,5 +10424,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10364,15 +10435,15 @@ 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" @@ -10380,25 +10451,25 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο" @@ -21845,4 +21916,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Αποστολή δεδομένων" + +#~ msgid "Unknown host" +#~ msgstr "Άγνωστος υπολογιστής" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι." Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 15909) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 15910) @@ -10,6 +10,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-06-09 15:39+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-12 05:36+0000\n" "Last-Translator: nin2jardin \n" "Language-Team: British English \n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,9 +69,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 @@ -92,5 +92,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 @@ -101,4 +101,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 "Cancel" @@ -500,6 +501,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 "Overwrite" @@ -536,5 +537,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}" @@ -643,8 +644,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 @@ -656,5 +657,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 "Error" @@ -1030,5 +1031,5 @@ msgstr "Save the current data." -#: ../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?" @@ -1153,5 +1154,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" @@ -1375,53 +1376,86 @@ "continue?" -#: ../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 "Upload to 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 "Upload all changes to the OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Objects to add:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objects to modify:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objects to delete:" -#: ../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 "Provide a brief comment for the changes you are uploading:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Upload these changes?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Upload Changes" -#: ../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 "Nothing to upload. Get some data first." -#: ../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 "There are unresolved conflicts. You have to resolve these first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "No changes to upload." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Uploading data" +#: ../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 "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2296,5 +2330,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 "deleted" @@ -3137,5 +3171,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 "My version" @@ -3146,5 +3180,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" @@ -3160,5 +3194,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 "Their version" @@ -3324,4 +3358,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 "parameter '{0}' must not be null" @@ -3355,9 +3390,9 @@ msgstr "unexpected column index. Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Properties in my dataset, i.e. the local dataset" -#: ../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 " @@ -3367,47 +3402,47 @@ "elements when merge decisions are applied." -#: ../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 "Properties in their dataset, i.e. the server dataset" -#: ../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 "Coordinates:" -#: ../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 "Deleted State:" -#: ../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 "(none)" -#: ../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 "not deleted" -#: ../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 "Keep my coordiates" -#: ../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 "Keep their coordiates" -#: ../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 "Undecide conflict between different coordinates" -#: ../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 "Keep my deleted state" -#: ../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 "Keep their deleted state" -#: ../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 "Undecide conflict between deleted state" @@ -3455,5 +3490,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 msgid "cannot apply undecided tag merge item" -msgstr "" +msgstr "cannot apply undecided tag merge item" #. should not happen, but just in case @@ -3461,34 +3496,34 @@ #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}" -msgstr "" +msgstr "Parameter 'col' must be 0 or 1. Got {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 msgid "My version (local dataset)" -msgstr "" +msgstr "My version (local dataset)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 msgid "Their version (server dataset)" -msgstr "" +msgstr "Their version (server dataset)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 msgid ">" -msgstr "" +msgstr ">" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" +msgstr "Keep the selected key/value pairs from the local dataset" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" -msgstr "" +msgstr "Keep the selected key/value pairs from the server dataset" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 msgid "Undecide" -msgstr "" +msgstr "Undecide" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" -msgstr "" +msgstr "Mark the selected tags as undecided" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 @@ -3496,5 +3531,5 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +msgstr "Their dataset does not include a tag with key {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -3558,5 +3593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 msgid "WARNING: unexpected value for preference conflict.resolution, got " -msgstr "" +msgstr "WARNING: unexpected value for preference conflict.resolution, got " #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 @@ -3575,25 +3610,25 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 msgid "Resolve conflicts" -msgstr "" +msgstr "Resolve conflicts" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 msgid "Cancel conflict resolution and close the dialog" -msgstr "" +msgstr "Cancel conflict resolution and close the dialog" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 msgid "Apply resolved conflicts and close the dialog" -msgstr "" +msgstr "Apply resolved conflicts and close the dialogue" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 msgid "Apply Resolution" -msgstr "" +msgstr "Apply Resolution" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 msgid "Apply partial resolutions" -msgstr "" +msgstr "Apply partial resolutions" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 msgid "Continue resolving" -msgstr "" +msgstr "Continue resolving" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 @@ -3605,4 +3640,8 @@ "resolving conflicts." msgstr "" +"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." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182 @@ -6217,5 +6256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 msgid "Add JOSM Plugin description URL." -msgstr "" +msgstr "Add JOSM Plugin description URL." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -6226,5 +6265,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Edit JOSM Plugin description URL." -msgstr "" +msgstr "Edit JOSM Plugin description URL." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6739,9 +6778,15 @@ msgstr "NMEA import faliure!" -#: ../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 "This version of JOSM is incompatible with the configured server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6752,56 +6797,42 @@ "{0} to {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 "Communications with {0} established using protocol version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:192 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:250 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:265 msgid "Cannot read numeric value from response" msgstr "Cannot read numeric value from response" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Opening changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../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 "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Uploading..." -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "Data upload failed for unknown reason" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Not initialized" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Unknown host" - #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 msgid "OSM Server Files bzip2 compressed" -msgstr "" +msgstr "OSM Server Files bzip2 compressed" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 msgid "Invalid bz2 file." -msgstr "" +msgstr "Invalid bz2 file." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80 @@ -6832,5 +6863,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" -msgstr "" +msgstr "OSM Server Files gzip compressed" #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -6929,15 +6960,5 @@ msgstr "Contacting Server..." -#: ../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 "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." - -#: ../core/src/org/openstreetmap/josm/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." @@ -6953,5 +6974,12 @@ "some time." -#: ../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})" @@ -6983,28 +7011,28 @@ msgid "{0} Plugin successfully downloaded. Please restart JOSM." msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} Plugin successfully downloaded. Please restart JOSM." +msgstr[1] "{0} Plugins successfully downloaded. Please restart JOSM." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 #, java-format msgid "Downloading Plugin {0}..." -msgstr "" +msgstr "Downloading Plugin {0}..." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 msgid "Skip download" -msgstr "" +msgstr "Skip download" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 #, java-format msgid "JOSM version {0} required for plugin {1}." -msgstr "" +msgstr "JOSM version {0} required for plugin {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 msgid "Download Plugin" -msgstr "" +msgstr "Download Plugin" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 msgid "Skip Download" -msgstr "" +msgstr "Skip Download" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -7025,5 +7053,5 @@ #, java-format msgid "Plugin {0} requires JOSM update to version {1}." -msgstr "" +msgstr "Plugin {0} requires JOSM update to version {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 @@ -7320,9 +7348,9 @@ msgstr "Create a grid of ways" -#: ../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 "Upload Trace" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7352,52 +7380,52 @@ msgstr "Please enter tags about your trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:155 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 #, java-format msgid "Selected track: {0}" msgstr "Selected track: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Connecting..." -#: ../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 "Upload cancelled" -#: ../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 while uploading" -#: ../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 "GPX upload was successful" -#: ../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 "Upload failed. Server returned the following message: " -#: ../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 "Uploading GPX track: {0}% ({1} of {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 "No description provided. Please provide some description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:340 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:362 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 msgid "No GPX layer selected. Cannot upload a trace." msgstr "No GPX layer selected. Cannot upload a trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:343 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 msgid "No username provided." msgstr "No username provided." -#: ../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 "No password provided." -#: ../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 "Uploading GPX Track" @@ -7755,5 +7783,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 "Error loading file" @@ -7802,22 +7830,22 @@ msgstr "Select Tableau d'Assemblage" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Invalid projection" -#: ../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 "Change the projection to {0} first." -#: ../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" @@ -7826,4 +7854,19 @@ "To enable the cadastre WMS plugin, change\n" "the JOSM projection to Lambert and restart" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8073,9 +8116,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "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}" @@ -8091,6 +8134,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 "Blank Layer" @@ -8120,25 +8163,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 "Save WMS layer to file" #: ../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 "" +msgstr "Save WMS layer" #: ../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 "Load WMS layer from file" #: ../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 "" +msgstr "Load WMS layer" #: ../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}" @@ -8146,5 +8189,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 "File Format Error" @@ -9412,5 +9455,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "" +msgstr "unexpected column number {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -10428,16 +10471,16 @@ #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 msgid "Select a starting node on the end of a way" -msgstr "" +msgstr "Select a starting node on the end of a way" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 msgid "Reached the end of the line" -msgstr "" +msgstr "Reached the end of the line" #. Three or more ways meeting at this node. Means we have a junction. #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156 msgid "Reached a junction" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +msgstr "Reached a junction" + +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Exception occurred" @@ -10503,20 +10546,52 @@ msgstr "WMS Plugin Help" -#: ../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 "Rectified Image..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier image id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10524,5 +10599,5 @@ msgstr "Adjust the position of the selected WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10537,15 +10612,15 @@ msgstr "Automatic downloading" -#: ../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 "WMS layer ({0}), automatically downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10553,25 +10628,25 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Open a blank WMS layer to load data from a file" @@ -10724,4 +10799,6 @@ "very fast." msgstr "" +"Allows the user to anonymise timestamps and delete parts of huge GPX tracks " +"very fast." #. Plugin globalsat @@ -10898,5 +10975,5 @@ #: build/trans_plugins.java:67 msgid "Easy downloading along a long set of interconnected ways" -msgstr "" +msgstr "Easy downloading along a long set of interconnected ways" #. Plugin wmsplugin @@ -22047,10 +22124,16 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg #: build/trans_wms.java:23 msgid "Terraserver Urban" -msgstr "" +msgstr "Terraserver Urban" + +#~ msgid "Uploading data" +#~ msgstr "Uploading data" + +#~ msgid "Unknown host" +#~ msgstr "Unknown host" #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -22078,4 +22161,13 @@ #~ "move mouse. Select: Click." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Adjust the position of the WMS layer" + #~ msgid "Charge" #~ msgstr "Charge" @@ -22101,4 +22193,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Really mark this issue as ''done''?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgid "Portcullis" @@ -22155,2 +22250,8 @@ #~ msgid "Error processing changeset upload response" #~ msgstr "Error processing changeset upload response" + +#~ msgid "Not initialized" +#~ msgstr "Not initialized" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Data upload failed for unknown reason" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 15909) +++ /applications/editors/josm/i18n/po/es.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-06-06 09:23+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-13 15:25+0000\n" "Last-Translator: Emilio Gomez Fernandez \n" "Language-Team: Spanish \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:46+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" @@ -316,5 +317,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 msgid "Please select at least three nodes." -msgstr "Por favor seleciona como mínimo tres nodos" +msgstr "Por favor selecciona como mínimo tres nodos" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 @@ -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" @@ -536,5 +537,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}" @@ -643,8 +644,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 @@ -656,5 +657,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 "Error" @@ -795,13 +796,13 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70 msgid "Mirror" -msgstr "" +msgstr "Invertir" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 msgid "Mirror selected nodes and ways." -msgstr "" +msgstr "Invertir los nodos y vías seleccionadas" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." -msgstr "" +msgstr "Por favor, seleccione al menos un nodo o vía" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 @@ -1035,8 +1036,8 @@ msgstr "Guardar los datos actuales." -#: ../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?" -msgstr "" +msgstr "El archivo {0} existe. ¿Sobreescribir?" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 @@ -1091,5 +1092,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 msgid "Save Layer" -msgstr "" +msgstr "Guardar capa" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 @@ -1159,5 +1160,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" @@ -1382,54 +1383,87 @@ "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 "Subir todos los cambios al 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 "Objetos que añadir" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objetos que modificar" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objetos que 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 "Introduzca un breve comentario sobre los cambios que se está subiendo:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "¿Subir estos 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 algunos datos primero." -#: ../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 "" "Existen algunos conflictos sin resolver. Tienes que solucionarlos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Ningún cambio que subir" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Subiendo datos" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205 +msgid "Uploading" +msgstr "Subiendo" + +#: ../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 "Subida a OSM API fallida" + +#: ../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 "" +"No se ha podido iniciar la comunicación con el servidor de OSM {0}.\n" +"Compruebe la URL del servidor en sus preferencias y su conexión a Internet." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2317,5 +2351,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" @@ -2685,5 +2719,5 @@ #, java-format msgid "- running version is {0}" -msgstr "- la versión en ejecucióñ es {0}" +msgstr "- la versión en ejecución es {0}" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118 @@ -3154,5 +3188,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 "" @@ -3163,5 +3197,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" @@ -3175,5 +3209,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 "" @@ -3328,4 +3362,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 "" @@ -3357,9 +3392,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 " @@ -3367,47 +3402,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 "(ninguno)" -#: ../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 "" @@ -6571,5 +6606,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" -msgstr "Atención: use solamente teclas reales de su teclado!" +msgstr "¡Atención: use solamente teclas reales de su teclado!" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:247 @@ -6773,9 +6808,15 @@ msgstr "¡Fallo en la 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 es incompatible con el servidor configurado" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6786,47 +6827,33 @@ "{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 "Establecidas comunicaciones con {0} usando la versión de protocolo {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 "No se puede leer el valor numérico de la respuesta" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Abriendo conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Cerrando conjunto 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 "Sin nuevos cambios que enviar" -#: ../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 "Subiendo..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "La subida de datos ha fallado por una razón desconocida" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "No iniciado" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Host desconocido" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6967,15 +6994,5 @@ msgstr "Contactando con el 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 "" -"No se ha podido iniciar la comunicación con el servidor de OSM {0}.\n" -"Compruebe la URL del servidor en sus preferencias y su conexión a Internet." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -6992,5 +7009,12 @@ "tarde." -#: ../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})" @@ -7366,9 +7390,9 @@ msgstr "Crear rejilla de vías" -#: ../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 "Subir traza" -#: ../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 @@ -7398,53 +7422,53 @@ msgstr "Por favor, introduzca una etiqueta sobre su traza" -#: ../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 "Traza seleccionada: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "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 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 al actualizar" -#: ../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 "GPX subido correctamente" -#: ../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 "Subida fallida. El servidor retorna el siguiente mensaje " -#: ../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 "Subiendo traza 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 "" "Ninguna descripción facilitada. Por favor, proporcione alguna descripción." -#: ../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 "No hay ninguna capa gpx seleccionada. No se puede subir la traza." -#: ../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 "Ningún nombre de usuario facilitado." -#: ../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 "Ninguna contraseña facilitada." -#: ../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 "Subiendo traza GPX" @@ -7806,5 +7830,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 "Error al leer el archivo" @@ -7853,22 +7877,22 @@ msgstr "Seleccione tabla de montaje" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Catastro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Digitalización automática" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Proyección inválida" -#: ../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 "Cambia la proyección a {0} previamente." -#: ../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" @@ -7877,4 +7901,19 @@ "Para activar el componente WMS Catastro cambie\n" "la proyección de JOSM a Lambert y reinicie la aplicación" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8137,9 +8176,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Ajustar la posición de la capa WMS" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -8155,6 +8194,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 "Capa en blanco" @@ -8184,25 +8223,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 "Guardar capa WMS como archivo" #: ../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 desde archivo" #: ../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}" @@ -8210,5 +8249,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 "Error en el formato del archivo" @@ -10544,5 +10583,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Ocurrió una excepción" @@ -10614,20 +10653,52 @@ msgstr "Ayuda del componente WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Rectificar la imagen..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Id de la imagen rectificada de Metacarta" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectificar id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10635,5 +10706,5 @@ msgstr "Ajustar la posición de la capa WMS seleccionada" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10649,15 +10720,15 @@ msgstr "Descarga automática" -#: ../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 "Capa WMS ({0}) descargándose automáticamente en el zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Capa WMS ({0}), descargando en zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10666,25 +10737,25 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo" @@ -10984,8 +11055,8 @@ "the jar-file as standalone as well." msgstr "" -"Añade una etiqueta predefinida de prueba para el menú de ayuda que le ayuda " -"a desarrollar el etiquetado de predefinidos (vista previa rápida de la " -"ventana de diálogo que aparecerá). También puede iniciar el archivo jar de " -"forma autónoma." +"Añade una etiqueta predefinida de prueba para el menú de ayuda que le " +"facilita a desarrollar el etiquetado de predefinidos (vista previa rápida de " +"la ventana de diálogo que aparecerá). También puede iniciar el archivo jar " +"de forma autónoma." #. Plugin tcx-support @@ -11762,5 +11833,5 @@ #: build/trans_presets.java:261 msgid "driveway" -msgstr "pista de rodadura" +msgstr "camino de entrada (a garage, casa, etc.)" #: build/trans_presets.java:261 @@ -22189,10 +22260,16 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg #: build/trans_wms.java:23 msgid "Terraserver Urban" -msgstr "" +msgstr "Terraserver Urban" + +#~ msgid "Uploading data" +#~ msgstr "Subiendo datos" + +#~ msgid "Unknown host" +#~ msgstr "Host desconocido" #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -22224,4 +22301,13 @@ #~ "botón derecho del ratón y mueva el ratón. Seleccionar: Click" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Id de la imagen rectificada de Metacarta" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectificar id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Ajustar la posición de la capa WMS" + #~ msgid "Charge" #~ msgstr "Pago" @@ -22247,4 +22333,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS" #~ msgid "Portcullis" @@ -22299,2 +22388,8 @@ #~ msgid "Start routing" #~ msgstr "Iniciar enrutamiento" + +#~ msgid "Not initialized" +#~ msgstr "No iniciado" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "La subida de datos ha fallado por una razón desconocida" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 15909) +++ /applications/editors/josm/i18n/po/et.po (revision 15910) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" "PO-Revision-Date: 2009-06-07 16:39+0000\n" "Last-Translator: Margus Värton \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:46+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:47+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 "Katkesta" @@ -495,6 +496,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 "Ülekirjutamine" @@ -531,5 +532,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}" @@ -636,8 +637,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 @@ -649,5 +650,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 "Viga" @@ -1021,5 +1022,5 @@ msgstr "Salvesta praegused andmed" -#: ../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?" @@ -1142,5 +1143,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" @@ -1365,53 +1366,84 @@ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?" -#: ../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 "Lae OSMi serverisse" -#: ../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 "Lae kõik muudatused OSM serverisse üles." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Objektid lisada:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objektid muuta:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objektid kustutada:" -#: ../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 "Esitada lühike kommentaar üleslaetavatele muutustele:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Kas laen need muudatused üles?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Lae muudatused üles" -#: ../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 "Midagi pole üles laadida. Hangi esmalt andmeid." -#: ../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 "Lahendamata konfliktid! Sa pead need enne lahendama." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Pole muudatusi mida üles laadida." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Andmete üles laadimine" +#: ../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 @@ -2258,5 +2290,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 "" @@ -3076,5 +3108,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 "" @@ -3085,5 +3117,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" @@ -3097,5 +3129,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 "" @@ -3250,4 +3282,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 "" @@ -3279,9 +3312,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 " @@ -3289,47 +3322,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 "" @@ -6592,9 +6625,15 @@ msgstr "NMEA impordi viga!" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6603,47 +6642,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Avan muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Sulgen muutustekogumit..." -#: ../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 "Ettevalmistus..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Üleslaadimine..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Tundmatu host" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6779,13 +6804,5 @@ msgstr "Ühendun serveriga..." -#: ../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." @@ -6800,5 +6817,12 @@ "uuesti ." -#: ../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})" @@ -7149,9 +7173,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 @@ -7181,52 +7205,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 "" -#: ../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 "" -#: ../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 "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 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 "" -#: ../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 "" @@ -7567,5 +7591,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 "" @@ -7612,25 +7636,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 "" @@ -7867,9 +7906,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}" @@ -7883,6 +7922,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 "" @@ -7912,25 +7951,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 "" #: ../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 "" #: ../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}" @@ -7938,5 +7977,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 "" @@ -10183,5 +10222,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "" @@ -10227,19 +10266,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 "" @@ -10248,5 +10319,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10259,40 +10330,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 "" @@ -21735,4 +21806,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Andmete üles laadimine" + +#~ msgid "Unknown host" +#~ msgstr "Tundmatu host" + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 15909) +++ /applications/editors/josm/i18n/po/fi.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:52+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:00+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Finnish \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:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+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 "Peruuta" @@ -496,6 +497,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 "Korvaa" @@ -532,5 +533,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}" @@ -639,8 +640,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 @@ -652,5 +653,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 "Virhe" @@ -1025,5 +1026,5 @@ msgstr "Tallenna tämänhetkinen data." -#: ../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?" @@ -1147,5 +1148,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" @@ -1372,54 +1373,85 @@ "jatkaa?" -#: ../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 "Lähetä OSM-palvelimelle..." -#: ../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 "Lähetä kaikki muutokset OSM-palvelimelle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Lisättävät objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Muokattavat objektit:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Poistettavat objektit:" -#: ../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 "Anna lyhyt kuvaus lähetettävistä muutoksista:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Lähetetäänkö nämä muutokset?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Lähetä muutokset" -#: ../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 "Ei mitään lähetettävää. Hae ensin dataa." -#: ../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 "" "Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten lähetystä." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Ei lähetettäviä muutoksia." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Lähetetään dataa" +#: ../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 @@ -2286,5 +2318,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 "poistettu" @@ -3104,5 +3136,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 "" @@ -3113,5 +3145,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" @@ -3125,5 +3157,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 "" @@ -3278,4 +3310,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 "" @@ -3307,9 +3340,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 " @@ -3317,47 +3350,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 "" @@ -6649,9 +6682,15 @@ msgstr "NMEA-tuonti epäonnistui" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6660,47 +6699,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Luodaan muutoskokoelma..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Suljetaan muutoskokoelma..." -#: ../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 "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Lähetetään..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Tuntematon palvelin" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6836,13 +6861,5 @@ msgstr "Yhdistetään palvelimeen..." -#: ../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." @@ -6857,5 +6874,12 @@ "myöhemmin uudestaan." -#: ../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})" @@ -7222,9 +7246,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 @@ -7254,52 +7278,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 "Yhdistetään..." -#: ../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 "Lähetys peruttu" -#: ../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 "Virhe lähetettäessä" -#: ../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 "GPX-jäljen lähetys onnistui" -#: ../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 "Lähetään GPX-jälkeä: {0}% ({1} / {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 "GPX-tasoa ei valittuna. Ei voida lähettää jälkeä." -#: ../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 "Lähetetään GPX-jälkeä" @@ -7648,5 +7672,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 "Virhe ladattaessa tiedostoa" @@ -7693,25 +7717,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 "" @@ -7948,9 +7987,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin" +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}" @@ -7964,6 +8003,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 "Tyhjä taso" @@ -7993,25 +8032,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 "Tallenna WMS-taso tiedostoon" #: ../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 "Lataa WMS-taso tiedostosta" #: ../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}" @@ -8019,5 +8058,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 "" @@ -10315,5 +10354,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "" @@ -10359,19 +10398,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 "Suoristettu kuva..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier:in kuvatunnus (id)" - -#: ../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 "" @@ -10380,5 +10451,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10391,15 +10462,15 @@ msgstr "Automaattinen lataus" -#: ../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" @@ -10408,25 +10479,25 @@ "resoluutiota" -#: ../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 "Vaihda resoluutiota" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston." @@ -21871,4 +21942,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Lähetetään dataa" + +#~ msgid "Unknown host" +#~ msgstr "Tuntematon palvelin" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto." @@ -21896,4 +21973,10 @@ #~ "raahaamalla oikealla napilla, valitse alue vetämällä vasemmalla napilla." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin" + #~ msgid "Server does not support changesets" #~ msgstr "Palvelin ei tue muutoskokoelmia" @@ -21916,4 +21999,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä" #~ msgid "Portcullis" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 15909) +++ /applications/editors/josm/i18n/po/fr.po (revision 15910) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-09 15:31+0000\n" -"Last-Translator: nin2jardin \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 17:52+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Fr\n" "MIME-Version: 1.0\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,9 +70,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 @@ -93,5 +93,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -102,4 +102,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Cancel" msgstr "Annuler" @@ -504,6 +505,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 msgid "Overwrite" msgstr "Écrire dessus" @@ -540,5 +541,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 #, java-format msgid "File: {0}" @@ -647,8 +648,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:540 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:544 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -660,5 +661,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356 msgid "Error" msgstr "Erreur" @@ -1043,5 +1044,5 @@ msgstr "Sauvegarder les données actuelles." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 #, java-format msgid "File {0} exists. Overwrite?" @@ -1167,5 +1168,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:208 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871 msgid "Close" @@ -1393,54 +1394,88 @@ "continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 msgid "Upload to OSM..." msgstr "Chargement vers OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 msgid "Upload all changes to the OSM server." msgstr "Envoyer tous les changements sur le serveur OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Objets à ajouter :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objets à modifier :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Charger ces changements ?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Envoyer les changements" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154 msgid "Nothing to upload. Get some data first." msgstr "Rien à envoyer. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:159 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "" "Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Aucun changement à envoyer." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Envoi des données" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205 +msgid "Uploading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 +#, java-format +msgid "" +"Uploading failed because the server has a newer " +"version of one
of your nodes, ways or relations.
The conflict is " +"caused by the {0} with id {1},
the " +"server has version {2}, your version is {3}.
Please synchronize your " +"local dataset using
File->Update Data, " +"resolve
any conflicts and try to upload again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:260 +msgid "" +"Uploading failed because the server has a newer version of one
of " +"your nodes, ways or relations.
Please synchronize your local dataset " +"using
File->Update Data, resolve
any conflicts " +"and try to upload again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:287 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" +"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " +"Internet." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2336,5 +2371,5 @@ #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262 msgid "deleted" msgstr "supprimé" @@ -3186,5 +3221,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75 msgid "My version" msgstr "Ma version" @@ -3195,5 +3230,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3209,5 +3244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 msgid "Their version" msgstr "Leur version" @@ -3379,4 +3414,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:140 msgid "parameter '{0}' must not be null" msgstr "le paramètre {0} ne peut pas être vide" @@ -3410,9 +3446,9 @@ msgstr "index de colonne inattendu. Reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propriétés de mon jeu de données, i.e. les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3422,47 +3458,47 @@ "éléments lorsque les choix de fusion seront appliqués." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Propriétés de leur jeu de données, i.e. les données du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:102 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101 msgid "Coordinates:" msgstr "Coordonnées :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174 msgid "Deleted State:" msgstr "Etat supprimé :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:249 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:261 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(aucun)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:265 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "not deleted" msgstr "non supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:335 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334 msgid "Keep my coordiates" msgstr "Conserver mes coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349 msgid "Keep their coordiates" msgstr "Conserver leurs coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 msgid "Undecide conflict between different coordinates" msgstr "Ne pas résoudre le conflit de coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379 msgid "Keep my deleted state" msgstr "Conserver mon état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:395 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394 msgid "Keep their deleted state" msgstr "Conserver leur état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409 msgid "Undecide conflict between deleted state" msgstr "Ne pas résoudre le conflit d'état" @@ -6853,9 +6889,15 @@ msgstr "Erreur lors de l'import des trames NMEA !" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:149 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:153 +#, java-format +msgid "preference {0} missing. Can't initialize OsmApi" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:206 msgid "This version of JOSM is incompatible with the configured server." msgstr "Cette version de JOSM est incompatible avec le serveur défini." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6866,5 +6908,5 @@ "supporte que les versions {0} à {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:211 #, java-format msgid "Communications with {0} established using protocol version {1}" @@ -6872,42 +6914,28 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:192 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:250 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:265 msgid "Cannot read numeric value from response" msgstr "Impossible de lire une valeur numérique dans la réponse" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Ouverture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:367 msgid "No changeset present for diff upload" msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Envoi en cours..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "L'envoi de données a échoué pour une raison inconnue" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Non initialisé" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Hôte inconnu" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7049,16 +7077,5 @@ msgstr "Contact du serveur..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:51 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" -"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " -"Internet." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7075,5 +7092,12 @@ "charger, et/ou attendez un peu avant de recommencer." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:127 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103 +#, java-format +msgid "" +"WARNING: preference '{0}' or api version {1} of dataset requires to use " +"changesets, but API is not handle them. Ignoring changesets." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" @@ -7448,9 +7472,9 @@ msgstr "Créer un reseau de voies" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 msgid "Upload Trace" msgstr "Envoyer la trace" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7480,52 +7504,52 @@ msgstr "Veuillez entrer des mot-clés liés à votre trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:155 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 #, java-format msgid "Selected track: {0}" msgstr "Trace sélectionnée : {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Connexion..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:201 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 msgid "Upload cancelled" msgstr "Envoi annulé" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:211 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 msgid "Error while uploading" msgstr "Erreur lors du chargement" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "GPX upload was successful" msgstr "Succès de l'envoi de la trace GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "L'envoi a échoué. Le serveur a retourné le message suivant : " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Envoyer la trace GPX : {0}% ({1} ou {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:337 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 msgid "No description provided. Please provide some description." msgstr "Pas de description fournie. Merci de fournir une description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:340 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:362 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Pas de calque GPX sélectionné. Impossible de téléverser une trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:343 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 msgid "No username provided." msgstr "Pas de nom d'utilisateur fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 msgid "No password provided." msgstr "Pas de mot de passe fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 msgid "Uploading GPX Track" msgstr "Envoyer la trace GPX" @@ -7887,5 +7911,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:339 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" @@ -7934,22 +7958,22 @@ msgstr "Sélectionner le tableau d'assemblage" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Projection invalide" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166 #, java-format msgid "Change the projection to {0} first." msgstr "Changez auparavant la projection en {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7958,4 +7982,19 @@ "Pour activer le greffon cadastre WMS, modifiez\n" "la projection JOSM en Lambert et redémarrez" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8216,9 +8255,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Ajuster la position du calque WMS" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -8234,6 +8273,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Blank Layer" msgstr "Calque vide" @@ -8263,25 +8302,25 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:287 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:314 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 msgid "Load WMS layer" msgstr "Charger la couche WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -8291,5 +8330,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:325 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335 msgid "File Format Error" msgstr "Erreur de format de fichier" @@ -10637,5 +10676,5 @@ msgstr "Intersection atteinte" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Une exception s’est produite" @@ -10705,20 +10744,52 @@ msgstr "Aide sur le greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Rectifier l'image..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Télécharger une image rectifiée sur le WMS Metacarta's Map Rectifer" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier image id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10726,5 +10797,5 @@ msgstr "Ajuster la position du calque WMS sélectionné" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10739,15 +10810,15 @@ msgstr "Téléchargement automatique" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10756,25 +10827,25 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier" @@ -22273,4 +22344,10 @@ msgstr "Terraserver Urbain" +#~ msgid "Uploading data" +#~ msgstr "Envoi des données" + +#~ msgid "Unknown host" +#~ msgstr "Hôte inconnu" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki." @@ -22297,4 +22374,13 @@ #~ "bouton droit de souris enfoncé et déplacer la souris. Sélection : Clic" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Ajuster la position du calque WMS" + #~ msgid "Charge" #~ msgstr "Charge" @@ -22320,4 +22406,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Marquer ce problème comme \"fait\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Télécharger une image rectifiée sur le WMS Metacarta's Map Rectifer" #~ msgid "Portcullis" @@ -22375,2 +22464,8 @@ #~ msgid "Error processing changeset upload response" #~ msgstr "Erreur lors du traitement de la réponse au changement envoyé" + +#~ msgid "Not initialized" +#~ msgstr "Non initialisé" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "L'envoi de données a échoué pour une raison inconnue" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 15909) +++ /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" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 15909) +++ /applications/editors/josm/i18n/po/he.po (revision 15910) @@ -8,7 +8,7 @@ "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:56+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-11 08:10+0000\n" +"Last-Translator: Moshe Sayag \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\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:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:44+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 "ביטול" @@ -492,6 +493,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 "שכתוב" @@ -528,5 +529,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}" @@ -633,8 +634,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 @@ -646,5 +647,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 "שגיאה" @@ -779,13 +780,13 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70 msgid "Mirror" -msgstr "" +msgstr "שיקוף" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 msgid "Mirror selected nodes and ways." -msgstr "" +msgstr "שקף את הנקודות והדרכים הבחורות" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." -msgstr "" +msgstr "נא לבחור לפחות נקודה אחת או דרך" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 @@ -1012,5 +1013,5 @@ msgstr "שמור את הנתונים הנוכחיים." -#: ../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?" @@ -1132,5 +1133,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" @@ -1337,53 +1338,84 @@ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?" -#: ../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 "העלה ל-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 "העלה את כל השינויים לשרת ה-OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "פריטים להוספה:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "פריטים לשינוי:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "פריטים למחיקה:" -#: ../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 "ספק הערה קצרה לשינויים שאתה מעלה:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "העלה את השינויים האלה?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "העלה שינויים" -#: ../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 "אין מה להעלות. קבל כמה נתונים תחילה." -#: ../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 "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "אין שינויים להעלאה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "מעלה נתונים" +#: ../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 @@ -2240,5 +2272,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 "מחוק" @@ -3058,5 +3090,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 "" @@ -3067,5 +3099,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" @@ -3079,5 +3111,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 "" @@ -3232,4 +3264,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 "" @@ -3261,9 +3294,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 " @@ -3271,47 +3304,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 "" @@ -6574,9 +6607,15 @@ msgstr "יבוא 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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6585,47 +6624,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "מכין..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "מעלה..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "מארח לא ידוע" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6761,13 +6786,5 @@ msgstr "מתחבר לשרת..." -#: ../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." @@ -6780,5 +6797,12 @@ msgstr "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר." -#: ../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})" @@ -7135,9 +7159,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 @@ -7167,52 +7191,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 "מתחבר..." -#: ../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 "" -#: ../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 "שגיאה בזמן ההעלאה" -#: ../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 "GPX הועלה בהצלחה" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../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 "" -#: ../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 "" @@ -7561,5 +7585,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 "שגיאה בטעינת קובץ" @@ -7606,25 +7630,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 "" @@ -7861,9 +7900,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "התאם את מיקום שכבת WMS" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -7877,6 +7916,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 "שכבה ריקה" @@ -7906,25 +7945,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 "שמור שכבת WMS לקובץ" #: ../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 "טען שכבת WMS מקובץ" #: ../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}" @@ -7932,5 +7971,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 "שגיאה בפורמט קובץ" @@ -10187,5 +10226,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "אירעה שגיאה" @@ -10231,19 +10270,51 @@ msgstr "עזרת תוסף WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "" -#: ../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 "" @@ -10252,5 +10323,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10263,40 +10334,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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ" @@ -21741,4 +21812,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "מעלה נתונים" + +#~ msgid "Unknown host" +#~ msgstr "מארח לא ידוע" + #~ msgid "Commit comment" #~ msgstr "הערת ביצוע" @@ -21754,4 +21831,7 @@ #~ msgid "Navigation" #~ msgstr "ניווט" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "התאם את מיקום שכבת WMS" #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 15909) +++ /applications/editors/josm/i18n/po/is.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:46+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:07+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \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:46+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+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 "Hætta við" @@ -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 "" @@ -534,5 +535,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}" @@ -637,8 +638,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 @@ -650,5 +651,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 "Villa" @@ -1017,5 +1018,5 @@ msgstr "Vista þau gögn sem sjást núna." -#: ../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?" @@ -1135,5 +1136,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" @@ -1341,53 +1342,84 @@ msgstr "" -#: ../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 "Upphala til 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 "Upphala öllum breytingum á OSM þjóninn." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Hlutum sem verður bætt við:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Hlutum sem verður breytt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Hlutum sem verður eytt:" -#: ../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 "Bættu við stuttri umsögn um þær breytingar sem þú ert að hlaða upp:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Hlaða upp breytingum?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Hlaða upp breytingum" -#: ../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 "" -#: ../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 "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Engar breytingar til að hlaða upp." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Hleð upp gögnum" +#: ../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 @@ -2246,5 +2278,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 "" @@ -3058,5 +3090,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 "" @@ -3067,5 +3099,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" @@ -3079,5 +3111,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 "" @@ -3232,4 +3264,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 "" @@ -3261,9 +3294,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 " @@ -3271,47 +3304,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 "" @@ -6571,9 +6604,15 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6582,47 +6621,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Opna breytingasett..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Loka breytingasetti..." -#: ../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 "Undirbý..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Hleð upp gögnum..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6758,13 +6783,5 @@ msgstr "Hef samband við þjóninn..." -#: ../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." @@ -6780,5 +6797,12 @@ "reyna síðar." -#: ../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})" @@ -7132,9 +7156,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 "Upphala feril" -#: ../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 @@ -7166,52 +7190,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 "Ferill: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "" -#: ../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 "" -#: ../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 "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 msgid "Upload failed. Server returned the following message: " msgstr "Upphal gagna tókst ekki. Þjónnin skilaði eftirfarandi villuböðum: " -#: ../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 "" -#: ../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 "" @@ -7552,5 +7576,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 "" @@ -7597,25 +7621,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 "" @@ -7852,9 +7891,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Leiðrétta stöðu WMS lagsins" +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}" @@ -7868,6 +7907,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 "Tómt lag" @@ -7897,25 +7936,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 "Vista WMS lag í skrá" #: ../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 "Hlaða WMS lag úr skrá" #: ../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}" @@ -7923,5 +7962,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 "" @@ -10168,5 +10207,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "" @@ -10212,19 +10251,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 "" @@ -10233,5 +10304,5 @@ msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10244,40 +10315,40 @@ msgstr "Sjálfvirkt niðurhal" -#: ../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 "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../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 "" @@ -21720,4 +21791,7 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Hleð upp gögnum" + #~ msgid "Commit comment" #~ msgstr "Staðfesta umsögn" @@ -21738,4 +21812,7 @@ #~ "músina. Velja: Smellið" +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Leiðrétta stöðu WMS lagsins" + #~ msgid "Charge" #~ msgstr "Gjaldtaka" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 15909) +++ /applications/editors/josm/i18n/po/it.po (revision 15910) @@ -5,6 +5,6 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-08 08:58+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-10 09:34+0000\n" "Last-Translator: Davide Prade \n" "Language-Team: Italian \n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,9 +69,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 @@ -92,5 +92,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 @@ -101,4 +101,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 "Annulla" @@ -502,6 +503,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 "Sovrascrivi" @@ -538,5 +539,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}" @@ -645,8 +646,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 @@ -658,5 +659,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 "Errore" @@ -1034,5 +1035,5 @@ msgstr "Salva i dati attuali." -#: ../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?" @@ -1158,5 +1159,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" @@ -1388,53 +1389,88 @@ "desidera continuare?" -#: ../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 "Carica su 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 "Carica tutti i cambiamenti sul server OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Oggetti da aggiungere:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Oggetti da modificare:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Oggetti da eliminare:" -#: ../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 "Crea un breve commento ai cambiamenti che sta caricando:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Caricare questi cambiamenti?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Carica le modifiche" -#: ../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 "Niente da caricare. Prima è necessario ottenere dei dati." -#: ../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 "Ci sono dei conflitti non risolti. Prima è necessario risolverli." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Nessun cambiamento da caricare." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Caricamento dei dati" +#: ../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 "" +"E'' fallito il tentativo di inizializzare la comunicazione con il server OSM " +"{0}.\n" +"Controllare l''indirizzo URL del server nelle proprie preferenze e la " +"propria connessione ad internet." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2134,5 +2170,5 @@ #, java-format msgid "Resolve conflicts in coordinates in {0}" -msgstr "" +msgstr "Risolvi conflitti nelle coordinate in {0}" #. should not happen @@ -2140,5 +2176,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 msgid "cannot resolve undecided conflict" -msgstr "" +msgstr "non è possibile risolvere il conflitto irrisolto" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 @@ -2199,5 +2235,5 @@ #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" +msgstr "Risolvi conflitti nello stato eliminato in {0}" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 @@ -2338,5 +2374,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 "cancellato" @@ -3064,5 +3100,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 msgid "Properties" -msgstr "" +msgstr "Proprietà" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 @@ -3076,5 +3112,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 msgid "Nodes" -msgstr "" +msgstr "Nodi" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 @@ -3139,13 +3175,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 msgid "No pending property conflicts" -msgstr "" +msgstr "Non c'è alcun conflitto di proprietà in attesa" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 msgid "Properties(with conflicts)" -msgstr "" +msgstr "Proprietà(con conflitti)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 msgid "Pending property conflicts to be resolved" -msgstr "" +msgstr "Conflitti di proprietà in attesa di essere risolti" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 @@ -3184,5 +3220,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 "Versione personale" @@ -3195,5 +3231,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3209,5 +3245,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 "La loro versione" @@ -3380,6 +3416,7 @@ #: ../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 "" +msgstr "il parametro '{0}' non deve essere nullo" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 @@ -3413,59 +3450,63 @@ msgstr "indice di colonna non atteso. Ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 +"Proprietà nell'insieme di dati personale, cioè l'insieme di dati locale" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "" "Properties in the merged element. They will replace properties in my " "elements when merge decisions are applied." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 +"Proprietà nell'elemento unito. Queste sostituiranno le proprietà presenti " +"negli elementi personali non appena saranno applicate le decisioni " +"sull'unione." + +#: ../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 +msgstr "Proprietà nel loro insieme di dati, cioè l'insieme di dati del server" + +#: ../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 +msgstr "Coordinate:" + +#: ../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 +msgstr "Stato eliminato:" + +#: ../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 "(nessuno/a)" -#: ../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 +msgstr "non eliminato" + +#: ../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 +msgstr "Mantieni le mie coordinate" + +#: ../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 +msgstr "Mantieni le loro coordinate" + +#: ../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 +msgstr "Marca come irrisolto il conflitto tra coordinate differenti" + +#: ../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 +msgstr "Mantieni il mio stato eliminato" + +#: ../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 +msgstr "Mantieni il loro stato eliminato" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409 msgid "Undecide conflict between deleted state" -msgstr "" +msgstr "Marca come irrisolto il conflitto tra stati eliminati" #. setting up the member table @@ -3504,4 +3545,5 @@ msgid "The merged dataset will not include a tag with key {0}" msgstr "" +"L'unione dell'insieme dei dati non includerà una etichetta con la chiave {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 @@ -3510,8 +3552,9 @@ msgid "My dataset does not include a tag with key {0}" msgstr "" +"L''insieme di dati personale non include una etichetta con la chiave {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 msgid "cannot apply undecided tag merge item" -msgstr "" +msgstr "non è possibile marcare come irrisolto l'elemento oggetto di unione" #. should not happen, but just in case @@ -3519,9 +3562,9 @@ #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}" -msgstr "" +msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 msgid "My version (local dataset)" -msgstr "" +msgstr "Versione personale (insieme di dati locale)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 @@ -3537,16 +3580,18 @@ msgid "Keep the selected key/value pairs from the local dataset" msgstr "" +"Mantieni la coppia chiave/valore selezionata dall'insieme di dati locale" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +"Mantieni la coppia chiave/valore selezionata dall'insieme di dati del server" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 msgid "Undecide" -msgstr "" +msgstr "Irrisolto" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" -msgstr "" +msgstr "Marca le etichette selezionate come irrisolte" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 @@ -3554,5 +3599,5 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +msgstr "Il loro insieme di dati non include una etichetta con la chiave {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -3619,4 +3664,6 @@ msgid "WARNING: unexpected value for preference conflict.resolution, got " msgstr "" +"ATTENZIONE: valore inaspettato per la preferenza sulla risoluzione del " +"conflitto, ottenuto " #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 @@ -3665,4 +3712,8 @@ "resolving conflicts." msgstr "" +"Non si è finito di risolvere tutti i conflitti.
Cliccare {0}" +" per applicare lo stesso i conflitti già risolti.
Si possono " +"risolvere successivamente i conflitti restanti.
Cliccare {1} per ritornare alla risoluzione dei conflitti." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182 @@ -6307,5 +6358,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 msgid "Add JOSM Plugin description URL." -msgstr "" +msgstr "Aggiungi indirizzo URL di descrizione dell'estensione JOSM." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 @@ -6316,5 +6367,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Edit JOSM Plugin description URL." -msgstr "" +msgstr "Modifica indirizzo URL di descrizione dell'estensione JOSM." #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 @@ -6837,9 +6888,15 @@ msgstr "Importazione NMEA non riuscita!" -#: ../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 "Questa versione di JOSM non è compatibile con il configurato." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6850,5 +6907,5 @@ "supportare le versione da {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}" @@ -6857,43 +6914,29 @@ "protocollo" -#: ../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 "Impossibile leggere valori numerici dalla risposta" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Apertura del gruppo di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Chiusura del gruppo di modifiche..." -#: ../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 "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Invio in corso..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "Il caricamento dei dati è fallito per una ragione sconosciuta" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Non inizializzato" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Host sconosciuto" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7035,17 +7078,5 @@ msgstr "Connessione al server in corso..." -#: ../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 "" -"E'' fallito il tentativo di inizializzare la comunicazione con il server OSM " -"{0}.\n" -"Controllare l''indirizzo URL del server nelle proprie preferenze e la " -"propria connessione ad internet." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7062,5 +7093,12 @@ "aspetta prima di riprovare." -#: ../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})" @@ -7092,11 +7130,12 @@ msgid "{0} Plugin successfully downloaded. Please restart JOSM." msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." -msgstr[0] "" +msgstr[0] "L'estensione {0} è stata scaricata con successo. Riavviare JOSM." msgstr[1] "" +"Le estensioni {0} sono state scaricate con successo. Riavviare JOSM." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 #, java-format msgid "Downloading Plugin {0}..." -msgstr "" +msgstr "Scaricamento estensione {0}..." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 @@ -7107,5 +7146,5 @@ #, java-format msgid "JOSM version {0} required for plugin {1}." -msgstr "" +msgstr "Per l''estensione {1} è richiesta la versione di JOSM {0}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 @@ -7134,5 +7173,5 @@ #, java-format msgid "Plugin {0} requires JOSM update to version {1}." -msgstr "" +msgstr "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 @@ -7438,9 +7477,9 @@ msgstr "Crea una griglia di percorsi" -#: ../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 "Carica tracciato" -#: ../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 @@ -7471,52 +7510,52 @@ msgstr "Inserire le etichette sul proprio tracciato." -#: ../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 "Tracciato selezionato: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Connessione in corso..." -#: ../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 "Caricamento annullato" -#: ../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 "Errore durante il caricamento" -#: ../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 "Caricamento GPX completato con successo" -#: ../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 "Caricamento fallito. Il server ha risposto con il seguente messaggio: " -#: ../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 "Caricamento tracciato GPX in corso: {0}% ({1} di {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 "Non è stata fornita alcuna descrizione. Specificarne una." -#: ../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 "Nessun livello GPX selezionato. Impossibile caricare un tracciato." -#: ../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 "Non è stato fornito alcun nome utente." -#: ../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 "Non è stata fornita alcuna password." -#: ../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 "Caricamento del tracciato GPX in corso" @@ -7875,5 +7914,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 "Errore durante il caricamento del file" @@ -7922,22 +7961,22 @@ msgstr "Selezionare la tabella di assemblaggio" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Sorgente auto-determinata" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Proiezione non valida" -#: ../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 "Modificare prima la proiezione in {0}." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7946,4 +7985,19 @@ "Per abilitare l'estensione WMS del catasto, cambiare\n" "la proiezione di JOSM a Lambert e riavviare JOSM." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8201,9 +8255,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Aggiusta la posizione dl layer WMS" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -8219,6 +8273,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:80 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Blank Layer" msgstr "Livello vuoto" @@ -8248,25 +8302,25 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:282 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" #: ../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 "Salva livello WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" #: ../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 "Carica livello WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:324 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -8274,5 +8328,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 "Errore nel formato del file" @@ -9563,5 +9617,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "" +msgstr "numero di colonna {0} non atteso" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -10612,16 +10666,16 @@ #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92 msgid "Select a starting node on the end of a way" -msgstr "" +msgstr "Selezionare un nodo iniziale alla fine di un percorso" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 msgid "Reached the end of the line" -msgstr "" +msgstr "E' stata raggiunta la fine della linea" #. Three or more ways meeting at this node. Means we have a junction. #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156 msgid "Reached a junction" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +msgstr "E' stato raggiunto un incrocio" + +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "E' stata generata una eccezione" @@ -10691,20 +10745,52 @@ msgstr "Aiuto sull'estensione WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Immagine rettificata..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Scarica l'immagine rettificata dal WMS Map Rectifer di Metacarta" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Id dell'immagine Metacarta Map Rectifier" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "identificativo rectifier={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10712,5 +10798,5 @@ msgstr "Correggere la posizione del layer WMS selezionato" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10725,5 +10811,5 @@ msgstr "Scaricamento automatico" -#: ../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}" @@ -10731,10 +10817,10 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10743,25 +10829,25 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Ricarica tile sbagliati" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Apri un livello WMS vuoto per caricare i dati da file" @@ -10920,4 +11006,6 @@ "very fast." msgstr "" +"Permette all'utente di rendere anonime le marcature temporali ed eliminare " +"velocemente parti di tracciati GPX di grandi dimensioni." #. Plugin globalsat @@ -11106,4 +11194,5 @@ msgid "Easy downloading along a long set of interconnected ways" msgstr "" +"Scaricamento facilitato lungo un numeroso insieme di percorsi interconnessi" #. Plugin wmsplugin @@ -22256,10 +22345,16 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg #: build/trans_wms.java:23 msgid "Terraserver Urban" -msgstr "" +msgstr "Terraserver Urban" + +#~ msgid "Uploading data" +#~ msgstr "Caricamento dei dati" + +#~ msgid "Unknown host" +#~ msgstr "Host sconosciuto" #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -22287,4 +22382,13 @@ #~ "il mouse tenendo premuto il tasto destro. Selezionare: click." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Id dell'immagine Metacarta Map Rectifier" + +#~ msgid "rectifier id={0}" +#~ msgstr "identificativo rectifier={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Aggiusta la posizione dl layer WMS" + #~ msgid "Charge" #~ msgstr "Costo" @@ -22310,4 +22414,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Scarica l'immagine rettificata dal WMS Map Rectifer di Metacarta" #~ msgid "Portcullis" @@ -22367,2 +22474,8 @@ #~ "Errore nell'elaborazione della risposta al caricamento del gruppo di " #~ "modifiche" + +#~ msgid "Not initialized" +#~ msgstr "Non inizializzato" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Il caricamento dei dati è fallito per una ragione sconosciuta" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 15909) +++ /applications/editors/josm/i18n/po/ja.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-28 19:10+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-11 01:23+0000\n" "Last-Translator: nazotoko \n" "Language-Team: Japanese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -68,9 +68,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 @@ -91,5 +91,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 @@ -100,4 +100,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 "キャンセル" @@ -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 "上書きする" @@ -534,5 +535,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}" @@ -641,8 +642,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 @@ -654,5 +655,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 "エラー" @@ -792,13 +793,13 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70 msgid "Mirror" -msgstr "" +msgstr "鏡像" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 msgid "Mirror selected nodes and ways." -msgstr "" +msgstr "選択したノードやウェイの鏡像を作ります。" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." -msgstr "" +msgstr "少なくとも1つはノードかウェイを選んでください。" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 @@ -1029,8 +1030,8 @@ msgstr "最新データを保存します。" -#: ../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?" -msgstr "" +msgstr "ファイル {0}は存在します。上書きしますか?" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 @@ -1085,5 +1086,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 msgid "Save Layer" -msgstr "" +msgstr "レイヤーを保存" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 @@ -1152,5 +1153,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" @@ -1374,53 +1375,84 @@ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" -#: ../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 "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 "OSMサーバにすべての変更をアップロードします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "追加するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "修正するオブジェクト:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "削除するオブジェクト:" -#: ../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 "アップロードする変更の概略コメントを入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "この変更をアップロードしますか?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "変更のアップロード" -#: ../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 "アップロードするものがありません。最初にデータを取得してください。" -#: ../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 "未解決の競合があります。まずこれらの競合を解決してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "アップロードする変更はありません。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "アップロードするデータ" +#: ../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 @@ -1797,5 +1829,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" +msgstr "type=route - 正確に 'route'の値を持つキー 'type'です。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 @@ -1804,4 +1836,6 @@ "type=, *=*, *=" msgstr "" +"type=* - キー 'type' はどんな値でも良い。 また *=value, " +"type=, *=*, *=もできます。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 @@ -1929,4 +1963,6 @@ msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" +"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく" +"ださい: key=value" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 @@ -1934,9 +1970,11 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" +"不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして " +"\"relation\"です。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 #, java-format msgid "Unexpected token: {0}" -msgstr "" +msgstr "想定外のトークン: {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 @@ -1954,5 +1992,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 msgid "Wrong number of parameters for nodes operator." -msgstr "" +msgstr "間違った数のパラメータが、ノード演算子に渡されました。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 @@ -2288,5 +2326,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 "削除された" @@ -3121,5 +3159,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 +3168,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 +3180,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 +3333,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 +3363,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 +3373,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 "" @@ -6661,9 +6700,15 @@ msgstr "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 "このバージョンのJOSMは、設定されたサーバーと互換性がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6674,47 +6719,33 @@ "は、 {0} から {1}をサポートするといっています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:211 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。" -#: ../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 "応答から数値を読み取れません。" -#: ../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 "変更した設定を閉じています..." -#: ../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 "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "アップロード中..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "不明な理由でデータのアップロードに失敗しました。" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "初期化されていません。" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "不明なホスト" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6850,13 +6881,5 @@ msgstr "サーバに接続中..." -#: ../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." @@ -6871,5 +6894,12 @@ "試してください。" -#: ../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})" @@ -7237,9 +7267,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 @@ -7269,52 +7299,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 "選択したトラック{0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "接続中..." -#: ../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 "アップロードを中止" -#: ../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 "アップロードする際にエラー" -#: ../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 "GPXアップロードが成功しました。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "アップロードに失敗しました。サーバは以下のメッセージを返しました： " -#: ../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 "GPSトラックをアップロード中：{0}% ({1} of {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 "GPXレイヤーが選ばれていません。トレースのアップロードはできません。" -#: ../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 "GPXトラックのアップロード" @@ -7674,5 +7704,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 "ファイルの読み込みエラー" @@ -7721,22 +7751,22 @@ msgstr "Tableau d'Assemblageを選択" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "自動ソーシング" -#: ../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 "最初に投影法を {0} に変えてください。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7745,4 +7775,19 @@ "土地台帳WMSプラグインを可能にするために、JOSMの座標系をランバート投影法に変え" "て、再起動してください。" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -7978,9 +8023,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "WMSレイヤーの位置を調整" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -7996,6 +8041,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 "ブランクのレイヤー" @@ -8025,25 +8070,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 "WMSレイヤーをファイルに保存" #: ../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 "WMSレイヤーをファイルから読み込む" #: ../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}" @@ -8051,5 +8096,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 "ファイルフォーマットエラー" @@ -10315,5 +10360,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "例外が発生しました" @@ -10359,21 +10404,52 @@ msgstr "WMSプラグイン　ヘルプ" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "修正した画像..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "" -"Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier image id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "修正子 ID={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10381,5 +10457,5 @@ msgstr "選択されたWMSレイヤーの位置を調整してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10392,15 +10468,15 @@ 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 "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10408,25 +10484,25 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く" @@ -17263,7 +17339,5 @@ #: build/trans_presets.java:2846 msgid "Edit Village Green Landuse" -msgstr "" -"Copy text \t\r\n" -"里山利用区画" +msgstr "里山利用区画の編集" #. item "Land use/Village Green" text "Name" @@ -19198,5 +19272,5 @@ #: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_expert" -msgstr "" +msgstr "熟練者用のゲレンデ" #. color piste_expert @@ -21273,5 +21347,5 @@ #: build/trans_style.java:3357 msgid "beach" -msgstr "ビーチ" +msgstr "砂浜" #. color natural @@ -21400,5 +21474,5 @@ #: build/trans_style.java:3495 msgid "boundary" -msgstr "行政区画" +msgstr "行政区境" #. color deprecated @@ -21795,5 +21869,5 @@ #: build/trans_validator.java:67 msgid "relation without type" -msgstr "タイプなしの関連" +msgstr "typeのないリレーション" #. relation : E : type != * @@ -21881,4 +21955,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "アップロードするデータ" + +#~ msgid "Unknown host" +#~ msgstr "不明なホスト" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "site-josm.xmlかWikiページを追加する。" @@ -21905,4 +21985,13 @@ #~ "した状態で移動させる。選択：クリック。" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "修正子 ID={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "WMSレイヤーの位置を調整" + #~ msgid "Charge" #~ msgstr "料金" @@ -21929,4 +22018,8 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "本当に、この問題を“処理済み”としてマークしますか？" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" # http://en.wikipedia.org/wiki/Portcullis @@ -21971,2 +22064,8 @@ #~ msgid "Start routing" #~ msgstr "ルーティングの開始" + +#~ msgid "Not initialized" +#~ msgstr "初期化されていません。" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "不明な理由でデータのアップロードに失敗しました。" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 15909) +++ /applications/editors/josm/i18n/po/nb.po (revision 15910) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-03 16:44+0000\n" -"Last-Translator: Svein Olav Hagen \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 19:18+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\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:46+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:47+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 "Avbryt" @@ -493,6 +494,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 "Skriv over" @@ -529,5 +530,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}" @@ -636,8 +637,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 @@ -649,5 +650,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 "Feil" @@ -1023,5 +1024,5 @@ msgstr "Lagre data" -#: ../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?" @@ -1143,5 +1144,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" @@ -1356,53 +1357,84 @@ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?" -#: ../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 "Last opp til 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 "Last opp alle endringer til OSM serveren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Objekter som legges til:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objekter som endres:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objekter som slettes:" -#: ../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 "Gi en kort kommentar for endringene du laster opp:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Laste opp disse endringene?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Last opp endringer" -#: ../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 "Ingen endringer å laste opp. Finn frem data først." -#: ../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 "Data inneholder uløste konflikter som først må løses." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Ingen endringer å laste opp." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Laster opp data" +#: ../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 @@ -2273,5 +2305,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 "slettet" @@ -3110,5 +3142,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 "" @@ -3119,5 +3151,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" @@ -3131,5 +3163,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 "" @@ -3284,4 +3316,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 "" @@ -3313,9 +3346,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 " @@ -3323,47 +3356,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 "(ingen)" -#: ../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 "" @@ -6685,9 +6718,15 @@ msgstr "Feil ved import av NMEA data!" -#: ../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 "Denne versjon av JOSM kan ikke lese fra serveren." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6697,47 +6736,33 @@ "Den støtter protocol versjon 0.5 og 0.6, men serveren støtter {0} til {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 "Kommunikasjon er opprettet med {0} med protocol versjon {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 "Finner ikke tallverdi i svaret" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Åpner basen med rettinger.." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Lukker basen med rettinger..." -#: ../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 "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Laster opp..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "Opplasting av data feilet av ukjent grunn" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Ikke startet" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Ukjent vert" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6873,13 +6898,5 @@ msgstr "Kobler opp Server..." -#: ../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." @@ -6896,5 +6913,12 @@ "prøver på nytt." -#: ../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})" @@ -7265,9 +7289,9 @@ msgstr "Lag Rutenett med linjer" -#: ../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 "Last opp sporlogg" -#: ../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 @@ -7299,52 +7323,52 @@ msgstr "Oppgi egenskaper til sporet" -#: ../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 "Valgt spor: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Kobler til..." -#: ../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 "Opplastingen ble avsluttet" -#: ../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 "Feil under opplastingen" -#: ../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 "GPX opplastingen var vellykket" -#: ../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 "Opplasting feilet. Server gav følgende svar: " -#: ../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 "Laster opp GPX spor: {0}% ({1} av {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 "Ingen beskrivelse er gitt. Legg inn beskrivelse av sporet" -#: ../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 "GPX lag er ikke valgt -> Ingen spor å laste opp." -#: ../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 "Ingen Brukernavn er oppgitt." -#: ../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 "Det er ikke oppgitt passord." -#: ../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 "GPX Spor lastes opp" @@ -7700,5 +7724,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 "Feil ved lasting av fil" @@ -7747,22 +7771,22 @@ msgstr "Velg Tableau d'Assemblage" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Ugyldig kartprojeksjon" -#: ../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 "Bytt til kartprojeksjonen {0}." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7771,4 +7795,19 @@ "For å aktivisere Cadastre WMS plugin (Fransk matrikkel)\n" "Bytt kartprojeksjon til Lambert og restart JOSM" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8019,9 +8058,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Juster posisjon til WMS laget" +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}" @@ -8037,6 +8076,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 "Blank ut lag" @@ -8066,25 +8105,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 "Lagre WMS lag til fil" #: ../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 "les inn WMS lag fra fil" #: ../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}" @@ -8092,5 +8131,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 "Feil Fil Format" @@ -10384,5 +10423,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Det oppsto en feil" @@ -10449,20 +10488,52 @@ msgstr "Hjelp WMS tilleggsprogram" -#: ../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 "Ortografisk korrekt bilde" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier bilde id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10470,5 +10541,5 @@ msgstr "Tilpass posisjon på valgt WMS lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10483,40 +10554,40 @@ msgstr "Automatisk nedlasting" -#: ../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 "WMS lag ({0}) laster automatisk ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS lag ({0}) laster ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Åpne tomt WMS lag til data fra fil" @@ -21995,4 +22066,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Laster opp data" + +#~ msgid "Unknown host" +#~ msgstr "Ukjent vert" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider." @@ -22013,4 +22090,13 @@ #~ "flytt musa. Velg: Klik" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier bilde id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Juster posisjon til WMS laget" + #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Programtillegget krever oppdatering {0} av JOSM." @@ -22021,4 +22107,8 @@ #~ msgid "Error deleting plugin file: {0}" #~ msgstr "Feil ved sletting av programtillegg: {0}" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" #~ msgid "" @@ -22051,2 +22141,8 @@ #~ "Programtillegget kan brukes for klargjøring og redigering av GPC spor " #~ "(fjerne uinteressante punkt) før opplasting til OSM." + +#~ msgid "Not initialized" +#~ msgstr "Ikke startet" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Opplasting av data feilet av ukjent grunn" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 15909) +++ /applications/editors/josm/i18n/po/nl.po (revision 15910) @@ -8,7 +8,7 @@ "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-31 17:26+0000\n" -"Last-Translator: mvexel \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-10 15:21+0000\n" +"Last-Translator: Willem1 \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\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:47+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -35,4 +35,6 @@ msgid "The projection could not be read from preferences. Using Mercartor" msgstr "" +"De projectie kon niet worden gelezen uit de voorkeuren. Mercator wordt " +"gebruikt." #: ../core/src/org/openstreetmap/josm/Main.java:349 @@ -70,9 +72,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 @@ -93,5 +95,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -102,4 +104,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 "Annuleren" @@ -501,6 +504,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 "Overschrijven?" @@ -537,5 +540,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}" @@ -644,8 +647,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 @@ -657,5 +660,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 "Fout" @@ -716,4 +719,6 @@ "\">your language." msgstr "" +"De helppagina bestaat niet. Maak hem aan in het Engels " +"of in je eigen taal." #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26 @@ -795,13 +800,13 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70 msgid "Mirror" -msgstr "" +msgstr "Spiegelen" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 msgid "Mirror selected nodes and ways." -msgstr "" +msgstr "Spiegel de geselecteerde knopen en wegen." #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." -msgstr "" +msgstr "Selecteer ten minste één knoop of weg." #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 @@ -1031,8 +1036,8 @@ msgstr "Huidige gegevens opslaan." -#: ../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?" -msgstr "" +msgstr "Het bestand {0} bestaat al. Overschrijven?" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 @@ -1087,5 +1092,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 msgid "Save Layer" -msgstr "" +msgstr "Laag opslaan" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 @@ -1154,5 +1159,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" @@ -1383,53 +1388,84 @@ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch doorgaan?" -#: ../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 "Naar OSM uploaden..." -#: ../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 "Upload alle aanpassingen naar de OSM-server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Objecten om toe te voegen:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Objecten om te bewerken:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Objecten om aan te verwijderen:" -#: ../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 "Beschrijf kort de veranderingen die je upload:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Deze veranderingen uploaden?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Aanpassingen uploaden" -#: ../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 "Niets om te uploaden. Creëer eerst gegevens." -#: ../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 "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Geen aanpassingen aanwezig om te uploaden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Gegevens uploaden" +#: ../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 @@ -1808,5 +1844,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" +msgstr "type=route - sleutel 'type' met exacte waarde 'route'." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 @@ -1815,4 +1851,6 @@ "type=, *=*, *=" msgstr "" +"type=* - sleutel 'type' met elke waarde. Probeer ook *=value, " +"type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 @@ -2175,5 +2213,5 @@ #, java-format msgid "Resolve conflicts in member list of of relation {0}" -msgstr "" +msgstr "Conflicten in ledenlijst van relatie {0} oplossen" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 @@ -2192,10 +2230,10 @@ #, java-format msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" +msgstr "Los {0} tag-conflicten op in {1} {2}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:57 #, java-format msgid "Resolve version conflicts for {0} {1}" -msgstr "" +msgstr "Versieconflicten voor {0} {1} oplossen" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 @@ -2303,5 +2341,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 "verwijderd" @@ -2889,5 +2927,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:246 msgid "Toggle Full Screen view" -msgstr "" +msgstr "Volledig scherm aan-/uitzetten" #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:286 @@ -3007,5 +3045,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 msgid "My with Their" -msgstr "" +msgstr "Mijn met Hun" #. * @@ -3014,5 +3052,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 msgid "My with Merged" -msgstr "" +msgstr "Mijn met Samengevoegd" #. * @@ -3021,5 +3059,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 msgid "Their with Merged" -msgstr "" +msgstr "Hun met Samengevoegd" #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 @@ -3031,5 +3069,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 msgid "Properties" -msgstr "" +msgstr "Eigenschappen" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 @@ -3043,5 +3081,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 msgid "Nodes" -msgstr "" +msgstr "Knopen" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 @@ -3053,19 +3091,19 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 msgid "No pending tag conflicts to be resolved" -msgstr "" +msgstr "Geen tag-conflicten om op te lossen" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 #, java-format msgid "Tags({0} conflicts)" -msgstr "" +msgstr "Tags ({0} conflicten)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 #, java-format msgid "{0} pending tag conflicts to be resolved" -msgstr "" +msgstr "{0} tag-conflicten om op te lossen" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 msgid "Nodes(resolved)" -msgstr "" +msgstr "Knopen (opgelost)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 @@ -3076,13 +3114,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 msgid "Nodes(with conflicts)" -msgstr "" +msgstr "Knopen (met conflicten)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 msgid "Pending conflicts in the node list of this way" -msgstr "" +msgstr "Conflicten in de knopen van deze weg" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 msgid "Members(resolved)" -msgstr "" +msgstr "Leden (opgelost)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 @@ -3094,5 +3132,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 msgid "Members(with conflicts)" -msgstr "" +msgstr "Leden (met conflicten)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 @@ -3144,10 +3182,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 msgid "Compare " -msgstr "" +msgstr "Vergelijk " #: ../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 "" +msgstr "Mijn versie" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 @@ -3156,8 +3194,8 @@ #: ../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" -msgstr "" +msgstr "Samengevoegde versie" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 @@ -3168,7 +3206,7 @@ #: ../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 "" +msgstr "Hun versie" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 @@ -3230,9 +3268,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 msgid "Move up the selected elements by one position" -msgstr "" +msgstr "Geselecteerde elementen één positie omhoog schuiven" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 msgid "Down" -msgstr "" +msgstr "Omlaag" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 @@ -3321,6 +3359,7 @@ #: ../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 "" +msgstr "parameter '{0}' mag niet leeg zijn" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 @@ -3338,5 +3377,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 msgid "Node" -msgstr "" +msgstr "Knoop" #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 @@ -3350,9 +3389,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 " @@ -3360,47 +3399,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 +msgstr "Coördinaten:" + +#: ../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 +msgstr "(geen)" + +#: ../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 +msgstr "niet verwijderd" + +#: ../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 +msgstr "Mijn coördinaten houden" + +#: ../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 +msgstr "Hun coördinaten houden" + +#: ../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 "" @@ -3430,5 +3469,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 @@ -3467,5 +3506,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 msgid ">" -msgstr "" +msgstr ">" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 @@ -3571,5 +3610,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 msgid "Resolve conflicts" -msgstr "" +msgstr "Conflicten oplossen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 @@ -3579,5 +3618,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 msgid "Apply resolved conflicts and close the dialog" -msgstr "" +msgstr "Opgeloste conflicten toepassen en dialoog sluiten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 @@ -3591,5 +3630,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 msgid "Continue resolving" -msgstr "" +msgstr "Doorgaan met oplossen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 @@ -4641,5 +4680,5 @@ #, java-format msgid "version {0}" -msgstr "" +msgstr "versie {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364 @@ -4660,5 +4699,5 @@ #, java-format msgid "API version: {0}" -msgstr "" +msgstr "API-versie: {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:463 @@ -6746,9 +6785,15 @@ msgstr "Importeren NMEA is mislukt!" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6757,47 +6802,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Changeset openen" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Changeset sluiten" -#: ../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 "Voorbereiden…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Uploaden..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Onbekende host" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6933,13 +6964,5 @@ msgstr "Met server verbinden..." -#: ../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." @@ -6955,5 +6978,12 @@ "nog eens." -#: ../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})" @@ -7323,9 +7353,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 "Spoor uploaden" -#: ../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 @@ -7355,52 +7385,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 "Geselecteerde track: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Verbinden..." -#: ../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 "Uploaden afgebroken" -#: ../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 "Uploaden is mislukt" -#: ../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 "GPX-track is geupload" -#: ../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 "Upload is mislukt. Server gaf de volgende melding: " -#: ../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 "GPX-track uploaden: {0}% ({1} van {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 "Geen beschrijving opgegeven. Voer deze s.v.p. in," -#: ../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 "Geen GPX-laag geselecteerd. Kan geen spoor uploaden." -#: ../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 "Geen gebruikersnaam opgegeven." -#: ../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 "Geen wachtwoord opgegeven." -#: ../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 "GPX-track uploaden" @@ -7758,5 +7788,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 "Laden bestand is mislukt" @@ -7805,22 +7835,22 @@ msgstr "Tableau d'Assemblage selecteren" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Kadaster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Automatisch vullen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Onjuiste projectie" -#: ../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 "Verander eerste de projectie in {0}." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7829,4 +7859,19 @@ "Verander de JOSM-projectie en herstart om\n" "de kadaster-WMS-plugin in te schakelen." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8083,9 +8128,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "De positie van de WMS-laag aanpassen" +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}" @@ -8101,6 +8146,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 "Lege laag" @@ -8130,25 +8175,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 "WMS-laag in bestand opslaan" #: ../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 "WMS-laag uit bestand laden" #: ../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}" @@ -8156,5 +8201,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 "Fout in bestandsindeling" @@ -10466,5 +10511,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Uitzondering opgetreden" @@ -10534,21 +10579,52 @@ msgstr "WMS-pluginhulp" -#: ../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 "Geogerefereerde afbeelding..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "" -"Geogerefereerde afbeelding van Metacarta's Map Rectifier WMS downloaden" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Afbeeldings-id Metacarta Map Rectifier" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectifier-id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10556,5 +10632,5 @@ msgstr "De positie van de geselecteerde WMS-laag aanpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10570,15 +10646,15 @@ msgstr "Automatisch downloaden" -#: ../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 "WMS-laag ({0}), automatisch in zoom {1} downloaden" -#: ../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 "WMS-laag ({0}), in zoom {1} downloaden" -#: ../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" @@ -10586,25 +10662,25 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden" @@ -22052,4 +22128,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Gegevens uploaden" + +#~ msgid "Unknown host" +#~ msgstr "Onbekende host" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "site-josm.xml of Wiki-paginas toevoegen." @@ -22076,4 +22158,13 @@ #~ "indrukken en muis bewegen. Selecteer" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Afbeeldings-id Metacarta Map Rectifier" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier-id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "De positie van de WMS-laag aanpassen" + #~ msgid "Charge" #~ msgstr "Lading" @@ -22099,4 +22190,8 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Geogerefereerde afbeelding van Metacarta's Map Rectifier WMS downloaden" #~ msgid "Portcullis" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 15909) +++ /applications/editors/josm/i18n/po/pl.po (revision 15910) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" "PO-Revision-Date: 2009-05-18 15:54+0000\n" "Last-Translator: Łukasz Jernaś \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:44+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -72,9 +72,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 @@ -95,5 +95,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 @@ -104,4 +104,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 "Anuluj" @@ -503,6 +504,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 "Zastąp" @@ -541,5 +542,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}" @@ -648,8 +649,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 @@ -661,5 +662,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 "Błąd" @@ -1039,5 +1040,5 @@ msgstr "Zapisuje bieżące dane." -#: ../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?" @@ -1161,5 +1162,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 @@ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?" -#: ../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 "Wyślij do 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 "Wysyła wszystkie zmiany na serwer OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Obiekty do dodania:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Obiekty do zmiany:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Obiekty do usunięcia:" -#: ../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 "Dołącz krótki opis zmian, które wysyłasz do serwera:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Czy wysłać te zmiany?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Wyślij zmiany" -#: ../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 "Nie ma nic do wysłania. Wprowadź jakieś dane." -#: ../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 "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Brak zmian do wysłania." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Przesyłanie danych" +#: ../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 @@ -2286,5 +2318,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 "usunięto" @@ -3107,5 +3139,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 "" @@ -3116,5 +3148,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" @@ -3128,5 +3160,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 "" @@ -3281,4 +3313,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 "" @@ -3310,9 +3343,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 " @@ -3320,47 +3353,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 "" @@ -6657,9 +6690,15 @@ msgstr "Import NMEA zakończony niepowodzeniem!" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6668,47 +6707,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Otwieranie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Zamykanie zestawu zmian..." -#: ../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 "Przygotowywanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Wysyłanie..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Nieznany adres" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6844,13 +6869,5 @@ msgstr "Łączenie z serwerem..." -#: ../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." @@ -6867,5 +6884,12 @@ "chwili." -#: ../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})" @@ -7236,9 +7260,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 @@ -7268,52 +7292,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 "Łączenie..." -#: ../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 "" -#: ../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 "Błąd podczas wysyłania" -#: ../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 "Wysyłanie GPX zakończone sukcesem" -#: ../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 "" -#: ../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 "Nie podano opisu. Proszę podać jakiś opis." -#: ../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 "Nie wybrano żadnej warstwy GPX. Nie można wysłać sladu." -#: ../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 "Nie podano nazwy użytkownika." -#: ../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 "Nie podano hasła." -#: ../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 "Wysyłanie śladu GPX" @@ -7660,5 +7684,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 "Błąd podczas ładowania pliku" @@ -7707,25 +7731,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Kataster" -#: ../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 "Nieprawidłowe odwzorowanie" -#: ../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 "" @@ -7963,9 +8002,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}" @@ -7979,6 +8018,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 "Pusta warstwa" @@ -8008,25 +8047,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 "" #: ../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 "" #: ../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}" @@ -8034,5 +8073,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 "Błędny format pliku" @@ -10290,5 +10329,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Wystąpił wyjątek" @@ -10334,20 +10373,52 @@ msgstr "Pomoc wtyczki WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "" -#: ../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}" -msgstr "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10355,5 +10426,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10368,40 +10439,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 "Zmiana rozdzielczości" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "" @@ -21844,4 +21915,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Przesyłanie danych" + +#~ msgid "Unknown host" +#~ msgstr "Nieznany adres" + #~ msgid "Commit comment" #~ msgstr "Komentarz zmiany" @@ -21861,4 +21938,7 @@ #~ msgid "Navigation" #~ msgstr "Nawigacja" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" #~ msgid "Charge" Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 15909) +++ /applications/editors/josm/i18n/po/ro.po (revision 15910) @@ -8,7 +8,7 @@ "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-31 13:16+0000\n" -"Last-Translator: twist3r \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 17:50+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -73,9 +73,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 @@ -96,5 +96,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 @@ -105,4 +105,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 "Renunţă" @@ -500,6 +501,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 "Suprascrie" @@ -536,5 +537,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}" @@ -639,8 +640,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 @@ -652,5 +653,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 "Eroare" @@ -1017,5 +1018,5 @@ msgstr "Salvează datele curente." -#: ../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?" @@ -1135,5 +1136,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" @@ -1340,53 +1341,84 @@ msgstr "" -#: ../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 "Despre JOSM..." -#: ../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 "Trimite toate schimbările la serverul OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Obiecte de adăugat:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Obiecte de modificat:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Obiecte de şters:" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "" -#: ../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 "Nimic de transmis. Mai întâi obţineţi nişte date." -#: ../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 "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Nu sunt schimbări de transmis." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Transmit datele" +#: ../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 @@ -2236,5 +2268,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 "şters" @@ -3052,5 +3084,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 "" @@ -3061,5 +3093,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" @@ -3073,5 +3105,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 "" @@ -3226,4 +3258,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 "" @@ -3255,9 +3288,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 " @@ -3265,47 +3298,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 "" @@ -6578,9 +6611,15 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6589,47 +6628,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "" - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Gazdă necunoscută" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6765,13 +6790,5 @@ msgstr "" -#: ../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." @@ -6784,5 +6801,12 @@ msgstr "" -#: ../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})" @@ -7115,9 +7139,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 @@ -7147,52 +7171,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 "" -#: ../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 "" -#: ../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 "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 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 "" -#: ../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 "" @@ -7533,5 +7557,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 "" @@ -7578,25 +7602,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 "" @@ -7833,9 +7872,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}" @@ -7849,6 +7888,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 "" @@ -7878,25 +7917,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 "" #: ../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 "" #: ../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}" @@ -7904,5 +7943,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 "" @@ -10149,5 +10188,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "" @@ -10193,19 +10232,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 "" @@ -10214,5 +10285,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10225,40 +10296,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 "" @@ -21677,5 +21748,5 @@ #: build/trans_wms.java:17 msgid "YAHOO (WebKit GTK)" -msgstr "" +msgstr "YAHOO (WebKit GTK)" #. yahoo://webkit-image-gtk {0} @@ -21700,2 +21771,8 @@ msgid "Terraserver Urban" msgstr "" + +#~ msgid "Uploading data" +#~ msgstr "Transmit datele" + +#~ msgid "Unknown host" +#~ msgstr "Gazdă necunoscută" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 15909) +++ /applications/editors/josm/i18n/po/ru.po (revision 15910) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-05 18:32+0000\n" -"Last-Translator: Egor Bushmelyov \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-12 21:16+0000\n" +"Last-Translator: kolen \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -72,9 +72,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 @@ -95,5 +95,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 @@ -104,4 +104,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 "Отмена" @@ -505,6 +506,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 "Перезаписать" @@ -541,5 +542,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}" @@ -648,8 +649,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 @@ -661,5 +662,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 "Ошибка" @@ -1044,5 +1045,5 @@ msgstr "Сохранить текущие данные." -#: ../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?" @@ -1168,5 +1169,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" @@ -1397,53 +1398,84 @@ "желаете продолжить?" -#: ../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 "Загрузить на 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 "Загрузить все изменения на OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Новые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Изменённые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Удаляемые объекты:" -#: ../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 "Опишите изменения для закачиваемых данных:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Загрузить эти изменения?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Загрузить изменения" -#: ../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 "Нечего загружать. Сначала создайте данные." -#: ../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 "Присутствуют неразрешённые конфликты. Для начала, разрешите их" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Нет изменений для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Загрузка данных" +#: ../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 @@ -2325,5 +2357,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 "удалён" @@ -3166,5 +3198,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 "" @@ -3175,5 +3207,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" @@ -3187,5 +3219,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 "" @@ -3340,4 +3372,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 "" @@ -3369,9 +3402,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 " @@ -3379,47 +3412,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 "" @@ -6063,5 +6096,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75 msgid "Draw lines between raw GPS points" -msgstr "Нарисуйте линии между первоначальными GPS точками" +msgstr "Рисовать линии между точками GPS" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97 @@ -6771,9 +6804,15 @@ msgstr "Сбой при импорте 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 "Эта версия JOSM несовместима с настроенным сервером." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6784,47 +6823,33 @@ "поддержке {0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:154 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:211 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Соединение с {0} установлено используя протокол {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 "Не возможно прочесть числовое знаечение из ответа" -#: ../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 "Закрывается список правок..." -#: ../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 "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Закачка..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "Выгрузка прервана по неизвестной причине" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Не инициализированно" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Неизвестный хост" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6962,13 +6987,5 @@ msgstr "Соединение с сервером..." -#: ../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." @@ -6985,5 +7002,12 @@ "повторите попытку позже." -#: ../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})" @@ -7354,9 +7378,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 @@ -7386,52 +7410,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 "Выбранный трэк: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Подключение..." -#: ../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 "Загрузка отменена" -#: ../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 "Ошибка во время загрузки" -#: ../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 "Загрузка GPX успешно закончена" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "Загрузка прервалась. Сервер ответил следующим сообщением: " -#: ../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 "Загрузка GPX трэка: {0}% ({1} из {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 "Слой GPX не выбран. Не удается загрузить трэк." -#: ../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 "Загрузка GPX трэка" @@ -7789,5 +7813,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 "Ошибка при загрузке файла" @@ -7836,22 +7860,22 @@ msgstr "Выберите Таблицу d'Assemblage" -#: ../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 "Изменение проекции на {0} в первую очередь." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7860,4 +7884,19 @@ "Для включения кадастрового WMS плагина, измените\n" "в JOSM проекцию на Ламберта и перезапустите" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8110,9 +8149,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Подстроить положение слоя WMS" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -8128,6 +8167,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 "Пустой слой" @@ -8157,25 +8196,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 "Сохранить слой WMS в файл" #: ../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 "Загрузить слой WMS из файла" #: ../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}" @@ -8184,5 +8223,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 "Ошибка формата файла" @@ -10507,5 +10546,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Произошла ошибка." @@ -10574,20 +10613,52 @@ msgstr "Справка по модулю WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "Трансформированное изображение..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Скачать трансформированное изображение с WMS сервера Metacarta" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "ID изобрадения карты Metacarta Rectifier" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "выпрямитель id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10595,5 +10666,5 @@ msgstr "Отрегулируйте положение выбранного слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10608,15 +10679,15 @@ 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 "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10625,25 +10696,25 @@ "измените разрешение" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Открыть пустой WMS-слой для загрузки данных из файла" @@ -22131,4 +22202,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Загрузка данных" + +#~ msgid "Unknown host" +#~ msgstr "Неизвестный хост" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" @@ -22156,4 +22233,13 @@ #~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "ID изобрадения карты Metacarta Rectifier" + +#~ msgid "rectifier id={0}" +#~ msgstr "выпрямитель id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Подстроить положение слоя WMS" + #~ msgid "Charge" #~ msgstr "Переодевание" @@ -22179,4 +22265,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Вы действительно желаете отметить проблему, как решённую?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Скачать трансформированное изображение с WMS сервера Metacarta" #~ msgid "Portcullis" @@ -22228,2 +22317,8 @@ #~ msgid "Start routing" #~ msgstr "Начать маршрутизацию" + +#~ msgid "Not initialized" +#~ msgstr "Не инициализированно" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Выгрузка прервана по неизвестной причине" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 15909) +++ /applications/editors/josm/i18n/po/sk.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-06-08 04:20+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-13 05:07+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:47+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,9 +69,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 @@ -92,5 +92,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 @@ -101,4 +101,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 "Zrušiť" @@ -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 "Prepísať" @@ -534,5 +535,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}" @@ -641,8 +642,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 @@ -654,5 +655,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 "Chyba" @@ -1030,5 +1031,5 @@ msgstr "Uložiť aktuálne dáta." -#: ../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?" @@ -1153,5 +1154,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" @@ -1384,53 +1385,87 @@ "pokračovať?" -#: ../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 "Uložiť do 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 "Uložiť všetky zmeny na OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Pridané objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Upravené objekty:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Odstránené objekty:" -#: ../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 "Doplniť krátky komentár k nahrávaným zmenám" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Uložiť tieto úpravy?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Nahrať zmeny" -#: ../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 "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." -#: ../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 "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Žiadne zmeny pre uloženie." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Nahrávam dáta" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205 +msgid "Uploading" +msgstr "Nahrávanie" + +#: ../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 "Nahrávanie na OSM API neúspešné" + +#: ../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 "" +"Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n" +"Skontrolujte URL servera vo vašich nastaveniach a funkčnosť vašeho " +"pripojenia na internet." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -2116,5 +2151,5 @@ #, java-format msgid "Resolve conflicts in coordinates in {0}" -msgstr "" +msgstr "Vyriešte rozpor v súradniciach v {0}" #. should not happen @@ -2122,5 +2157,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 msgid "cannot resolve undecided conflict" -msgstr "" +msgstr "nemôžem vyriešiť nerozhodnutý konflikt" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 @@ -2181,5 +2216,5 @@ #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" +msgstr "Vyriešte konflikty v zmazaných (state) v {0}" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 @@ -2317,5 +2352,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 "zmazané" @@ -3042,5 +3077,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 msgid "Properties" -msgstr "" +msgstr "Vlastnosti" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 @@ -3054,5 +3089,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 msgid "Nodes" -msgstr "" +msgstr "Body" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 @@ -3117,13 +3152,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 msgid "No pending property conflicts" -msgstr "" +msgstr "Nevyriešený konflikt vo vlastnostiech" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 msgid "Properties(with conflicts)" -msgstr "" +msgstr "Vlastnosti (s konfliktmi)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 msgid "Pending property conflicts to be resolved" -msgstr "" +msgstr "Nebyriešený konflikty vlastností musia byť vyriešené" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 @@ -3162,5 +3197,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 "Moja verzia" @@ -3171,5 +3206,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" @@ -3185,5 +3220,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 "Ich verzia" @@ -3356,6 +3391,7 @@ #: ../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 "" +msgstr "parameter '{0}' nesmie byť nulový" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 @@ -3387,9 +3423,9 @@ msgstr "neočakávaný index stĺpca. Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:77 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../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 " @@ -3397,47 +3433,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 +msgstr "Súradnice:" + +#: ../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 "(žiadny)" -#: ../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 +msgstr "Ponechaj moje súradnice" + +#: ../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 +msgstr "Ponechaj ich súradnice" + +#: ../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 +msgstr "Nerozhodnuté konflikty medzi rôznymi súradnicami" + +#: ../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 "" @@ -6796,5 +6832,11 @@ msgstr "NMEA import zlyhal!" -#: ../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 "" @@ -6802,5 +6844,5 @@ "nastaveniach." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6811,47 +6853,33 @@ "{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 "Komunikácia s {0} je ustálená, používa protokol verzie {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 "Nemôžem čítať číselné hodnoty z odpovede" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Otváranie kontroly..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Zatváranie kontroly..." -#: ../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 "Nie sú prítomné zmenené súbory(changeset) pre diff nahratie." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 msgid "Preparing..." msgstr "Pripravujem..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Nahrávam..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "Chyba pri nahrávaní z neznámeho dôvodu" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "Nie je inicializované" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Neznámy hostiteľ" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6988,16 +7016,5 @@ msgstr "Kontaktujem server..." -#: ../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 "" -"Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n" -"Skontrolujte URL servera vo vašich nastaveniach a funkčnosť vašeho " -"pripojenia na internet." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7014,5 +7031,12 @@ "oblasť." -#: ../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})" @@ -7383,9 +7407,9 @@ msgstr "Vytvoriť cestnú sieť" -#: ../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 "Nahrať stopu" -#: ../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 @@ -7415,52 +7439,52 @@ msgstr "Prosím zapíšte značky o vašej stope(trace)" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:155 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 #, java-format msgid "Selected track: {0}" msgstr "Vybratá stopa: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Pripájam sa..." -#: ../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 "Nahrávanie je zrušené" -#: ../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 "Chyba počas nahrávania" -#: ../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 "Nahratie GPS stopy bolo úspešné" -#: ../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 "Chyba pri nahrávaní. Server napísal nasledujúcu správu: " -#: ../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 "Nahrávam GPS stopu(track): {0}% ({1} of {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 "Nie je poskytnutý žiaden popis. Prosím doplňte nejaký popis" -#: ../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 "Nie je vybratá GPX vrstva. Nemôžem nahrať stopu (trace)." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:343 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 msgid "No username provided." msgstr "Nie je doplnené užívateľské meno." -#: ../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 "Nie je doplnené heslo." -#: ../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 "Nahrávam GPX stopu (track)" @@ -7817,5 +7841,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 "Chyba pri nahrávaní súboru" @@ -7864,22 +7888,22 @@ msgstr "Vybrať Tableau d'Assemblage" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Automatické získavanie" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Chybná projekcia" -#: ../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 "Najskôr zmente projekciu na {0}." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170 msgid "" "To enable the cadastre WMS plugin, change\n" @@ -7888,4 +7912,19 @@ "K zapnutiu cadastre WMS pluginu, zmeňte\n" "projekciu na Lambert a reštartujte JOSM" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 +msgid "" +"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" +"which is currently allocated for full-screen switch by default\n" +"Would you like to restore F11 for grab action ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +msgid "Restore grab shortcut F11" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213 +msgid "JOSM is stopped for the change to take effect." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28 @@ -8136,9 +8175,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Upraviť pozíciu WMS vrstvy" +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}" @@ -8154,6 +8193,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 "Prázdna vrstva" @@ -8183,25 +8222,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 "Uložiť WMS vrstvu do súboru" #: ../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 "Uložiť WMS vrstvu" #: ../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 "Nahrať WMS vrstvu zo súboru" #: ../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 "Načítať WMS vrstvu" #: ../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}" @@ -8209,5 +8248,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 "Chyba formátu súboru" @@ -10520,5 +10559,5 @@ msgstr "Je dosiahnuté spojenie" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Nastavenie výnimky" @@ -10586,20 +10625,52 @@ msgstr "Nápoveda WMS Pluginu" -#: ../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 "Prekreslený obrázok..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "prekresľovač id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10607,5 +10678,5 @@ msgstr "Nastavte polohu vybratej WMS vrstvy" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10621,15 +10692,15 @@ msgstr "Automatické sťahovanie" -#: ../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 "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10637,25 +10708,25 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru" @@ -22160,4 +22231,10 @@ msgstr "Terraserver Urban" +#~ msgid "Uploading data" +#~ msgstr "Nahrávam dáta" + +#~ msgid "Unknown host" +#~ msgstr "Neznámy hostiteľ" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Vložte buď site-josm.xml alebo wiki stránku" @@ -22185,4 +22262,13 @@ #~ "tlačítko myši a hýbte myšou. Výber: Kľuk." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id" + +#~ msgid "rectifier id={0}" +#~ msgstr "prekresľovač id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Upraviť pozíciu WMS vrstvy" + #~ msgid "Charge" #~ msgstr "Poplatok" @@ -22208,4 +22294,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Naozaj označiť tento problém ako \"hotový\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS" #~ msgid "Portcullis" @@ -22262,2 +22351,8 @@ #~ msgid "Error processing changeset upload response" #~ msgstr "Chyba pri odpovedi počas nahrávania zmenených súborov." + +#~ msgid "Not initialized" +#~ msgstr "Nie je inicializované" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Chyba pri nahrávaní z neznámeho dôvodu" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 15909) +++ /applications/editors/josm/i18n/po/sl.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:45+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:38+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,9 +70,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 @@ -93,5 +93,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:129 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -102,4 +102,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Cancel" msgstr "Prekliči" @@ -495,6 +496,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 "Prepiši" @@ -531,5 +532,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}" @@ -636,8 +637,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 @@ -649,5 +650,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 "Napaka" @@ -1014,5 +1015,5 @@ msgstr "Shrani trenutne podatke" -#: ../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?" @@ -1131,5 +1132,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" @@ -1336,53 +1337,84 @@ msgstr "" -#: ../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 "Pošlji v 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 "Pošlji vse spremembe na strežnik OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Novi predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Spremenjeni predmeti:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Izbrisani predmeti:" -#: ../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 "Vpišite kratek opis sprememb, ki jih pošiljate:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Pošljem te spremembe?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "" -#: ../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 "Ni česa poslati. Najprej pridobite kakšne podatke." -#: ../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 "Obstajajo nerazrešeni konflikti. Razrešite jih." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Ni sprememb za pošiljanje." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Pošiljanje podatkov" +#: ../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 @@ -2241,5 +2273,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 "izbrisano" @@ -3059,5 +3091,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 "" @@ -3068,5 +3100,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" @@ -3080,5 +3112,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 "" @@ -3233,4 +3265,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 "" @@ -3262,9 +3295,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 " @@ -3272,47 +3305,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 "" @@ -6591,9 +6624,15 @@ msgstr "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6602,47 +6641,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "" -#: ../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 "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Pošiljanje ..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Neznan gostitelj" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6778,13 +6803,5 @@ msgstr "Vzpostavljanje povezave s strežnikom..." -#: ../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." @@ -6799,5 +6816,12 @@ msgstr "" -#: ../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})" @@ -7156,9 +7180,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 @@ -7188,52 +7212,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 "Izbrana GPS sled: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 "Sled GPX je bila uspešno poslana" -#: ../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 "Pošiljanje sledi GPX: {0}% ({1} od {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 "Ni obveznega opisa. Prosimo, vpišite opis sledi." -#: ../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 "Ni izbrana plast GPX. Sledi ni mogoče poslati." -#: ../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 "Pošiljanje sledi GPX" @@ -7574,5 +7598,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 "" @@ -7619,25 +7643,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 "" @@ -7874,9 +7913,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Prilagodi položaj plasti WMS" +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 -#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:18 +#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 #, java-format msgid "Download WMS tile from {0}" @@ -7890,6 +7929,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 "Prazna plast" @@ -7919,25 +7958,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 "Shrani plast WMS v datoteko" #: ../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 "Naloži plast WMS iz datoteke" #: ../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}" @@ -7945,5 +7984,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 "" @@ -10192,5 +10231,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "" @@ -10236,19 +10275,51 @@ msgstr "Pomoč vstavka WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 msgid "Rectified Image..." msgstr "" -#: ../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 "" @@ -10257,5 +10328,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10268,40 +10339,40 @@ msgstr "Samodejno sprejemanje" -#: ../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 "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke" @@ -21744,4 +21815,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Pošiljanje podatkov" + +#~ msgid "Unknown host" +#~ msgstr "Neznan gostitelj" + #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -21761,4 +21838,7 @@ #~ "premik. Izbor: Kliknite z miško in povlecite" +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Prilagodi položaj plasti WMS" + #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" #~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 15909) +++ /applications/editors/josm/i18n/po/sv.po (revision 15910) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:51+0200\n" -"PO-Revision-Date: 2009-06-07 12:53+0000\n" -"Last-Translator: nanker \n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-13 13:46+0000\n" +"Last-Translator: Zippert \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\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:47+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -68,9 +68,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 @@ -91,5 +91,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 @@ -100,4 +100,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 "Avbryt" @@ -500,6 +501,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 "Skriv över" @@ -536,5 +537,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}" @@ -643,8 +644,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 @@ -656,5 +657,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 "Fel" @@ -803,5 +804,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." -msgstr "" +msgstr "Markera minst en nod eller sträcka." #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 @@ -1034,5 +1035,5 @@ msgstr "Spara nuvarande data." -#: ../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?" @@ -1091,5 +1092,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 msgid "Save Layer" -msgstr "" +msgstr "Spara Lager" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 @@ -1158,5 +1159,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" @@ -1384,53 +1385,84 @@ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?" -#: ../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 "Skicka in till 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 "Skicka in alla ändringar till OSM-servern." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Nya objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Ändrade objekt:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Borttagna objekt:" -#: ../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 "Ge en kort kommentar till de ändringar som du skickar in:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Skicka in dessa ändringar?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "Skicka in ändringar" -#: ../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 "Det finns inte någonting att skicka in. Skaffa lite data först." -#: ../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 "Det finns olösta konflikter. Du måste lösa dessa först." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Det finns inte några ändringar att skicka in." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Skickar data" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:205 +msgid "Uploading" +msgstr "Ladda Upp" + +#: ../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 "Uppladningen till OSM API misslyckades" + +#: ../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 @@ -2308,5 +2340,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 "raderad" @@ -3139,5 +3171,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 "" @@ -3148,5 +3180,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" @@ -3160,5 +3192,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 "" @@ -3313,4 +3345,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 "" @@ -3342,9 +3375,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 " @@ -3352,47 +3385,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 "" @@ -6730,9 +6763,15 @@ msgstr "Import från NMEA misslyckades!" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6741,47 +6780,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Öppnar ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../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 "Förbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Skickar in..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Okänd värddator" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6918,13 +6943,5 @@ msgstr "Tar kontakt med servern..." -#: ../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." @@ -6940,5 +6957,12 @@ "igen efter en stund." -#: ../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})" @@ -7314,9 +7338,9 @@ msgstr "Skapa ett rutnät av sträckor" -#: ../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 "Skicka in spår" -#: ../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 @@ -7346,52 +7370,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 "Valt spår: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 msgid "Connecting..." msgstr "Ansluter..." -#: ../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 "Inskickning avbruten" -#: ../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 "Fel vid inskickning" -#: ../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 "GPX-inskickning genomförd" -#: ../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 "Inskickning misslyckades. Servern returnerade följande meddelande: " -#: ../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 "Skickar in GPX-spår: {0}% ({1} av {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 "Ingen beskrivning angiven. Skriv in en beskrivning." -#: ../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 "Inget GPX-lager valt. Kan inte skicka in ett spår." -#: ../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 "Inget användarnamn angivet." -#: ../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 "Inget lösenord angviet." -#: ../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 "Skickar in GPX-spår" @@ -7748,5 +7772,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 "Fel vid läsning av fil" @@ -7795,25 +7819,40 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140 msgid "Auto sourcing" msgstr "Automatkälla" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165 msgid "Invalid projection" msgstr "Ogiltig kartprojektion" -#: ../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 "Ändra projektionen till {0} först." -#: ../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 "" @@ -8056,9 +8095,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "Justera WMS-lagrets position" +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}" @@ -8072,6 +8111,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 "Tomt lager" @@ -8101,25 +8140,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 "Spara WMS-lagret till en fil" #: ../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 "Hämta WMS-lager från en fil" #: ../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}" @@ -8127,5 +8166,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 "Fel filformat" @@ -10444,5 +10483,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "Undantag inträffade" @@ -10511,20 +10550,52 @@ msgstr "Hjälp om WMS-insticksmodulen" -#: ../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 "Korrigerad bild..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Hämta en korrigerad bild från Metacartas kartkorrigerar-WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Id för Metacartas korrigerade kartbild" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "korrigeringsid={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10532,5 +10603,5 @@ msgstr "Justera valt WMS-lagers läge" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10543,40 +10614,40 @@ msgstr "Automatisk hämtning" -#: ../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 "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:273 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil" @@ -22024,4 +22095,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Skickar data" + +#~ msgid "Unknown host" +#~ msgstr "Okänd värddator" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Lägg till antingen site-josm.xml eller wikisidor." @@ -22048,4 +22125,13 @@ #~ "musknapp och flytta musen. Välj: Klicka" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Id för Metacartas korrigerade kartbild" + +#~ msgid "rectifier id={0}" +#~ msgstr "korrigeringsid={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Justera WMS-lagrets position" + #~ msgid "Charge" #~ msgstr "Avgift" @@ -22072,4 +22158,7 @@ #~ msgstr "" #~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Hämta en korrigerad bild från Metacartas kartkorrigerar-WMS" #~ msgid "Portcullis" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 15909) +++ /applications/editors/josm/i18n/po/tr.po (revision 15910) @@ -10,6 +10,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:54+0000\n" +"POT-Creation-Date: 2009-06-14 16:51+0200\n" +"PO-Revision-Date: 2009-06-09 18:22+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-06-09 16:45+0000\n" +"X-Launchpad-Export-Date: 2009-06-14 14:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,9 +69,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 @@ -92,5 +92,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 @@ -101,4 +101,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 "İptal" @@ -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 "Üzerine Yaz" @@ -534,5 +535,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}" @@ -641,8 +642,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 @@ -654,5 +655,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 "Hata" @@ -1023,5 +1024,5 @@ msgstr "Şimdiki bilgiyi kaydet." -#: ../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?" @@ -1143,5 +1144,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" @@ -1355,53 +1356,84 @@ msgstr "" -#: ../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 "OSM ye yükle..." -#: ../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 "Bütün değişiklikleri OSM server'ına yükle." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:96 msgid "Objects to add:" msgstr "Eklenilecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104 msgid "Objects to modify:" msgstr "Düzenlenecek objeler:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 msgid "Objects to delete:" msgstr "Silinecek objeler:" -#: ../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 "Yaptığınız yükleme için kısa bir bilgi yazınız:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 msgid "Upload these changes?" msgstr "Değişiklikleri yükle?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:130 msgid "Upload Changes" msgstr "" -#: ../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 "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." -#: ../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 "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:182 msgid "No changes to upload." msgstr "Yüklenilecek değişiklik yok." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -msgid "Uploading data" -msgstr "Bilgi yükleniyor" +#: ../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 @@ -2264,5 +2296,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 "silindi" @@ -3087,5 +3119,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 "" @@ -3096,5 +3128,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" @@ -3108,5 +3140,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 "" @@ -3261,4 +3293,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 "" @@ -3290,9 +3323,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 " @@ -3300,47 +3333,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 "" @@ -6611,9 +6644,15 @@ msgstr "NMEA içeri alınmasında hata!" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:150 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:207 #, java-format msgid "" @@ -6622,47 +6661,33 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:275 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 msgid "Opening changeset..." msgstr "Açılıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:289 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Closing changeset..." msgstr "Kapanıyor..." -#: ../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 "Hazırlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 msgid "Uploading..." msgstr "Yükleniyor..." - -#. shouldn't happen, but just in case -#. -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:405 -msgid "Data upload failed for unknown reason" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 -msgid "Not initialized" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:533 -msgid "Unknown host" -msgstr "Tanımsız host" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -6798,13 +6823,5 @@ msgstr "Server'e bağlanıyor..." -#: ../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." @@ -6820,5 +6837,12 @@ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra yapınız." -#: ../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})" @@ -7179,9 +7203,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 @@ -7211,52 +7235,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 "Bağlanıyor..." -#: ../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 "" -#: ../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 "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263 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 "" -#: ../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 "GPX tabakası seçili değil. İz yüklenemez." -#: ../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 "İzleri Yükle" @@ -7610,5 +7634,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 "Dosya Yüklemede Sorun" @@ -7655,25 +7679,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 "" @@ -7909,9 +7948,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 -msgid "Adjust the position of the WMS layer" -msgstr "WMS tabakasının pozisyonunu ayarla" +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}" @@ -7925,6 +7964,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 "Boş Tabaka" @@ -7954,25 +7993,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 "WMS tabakasını dosyaya kaydet" #: ../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 "WMS tabakasını dosyadan yükle" #: ../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}" @@ -7980,5 +8019,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 "Dosya Format Hatası" @@ -10259,5 +10298,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 msgid "Exception occurred" msgstr "İstisna oluştu" @@ -10323,20 +10362,52 @@ msgstr "WMS Eklenti Yardımı" -#: ../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 "Rectifiye İmaj..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20 -msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -msgstr "Metacarta linkinden Rektifiye dosyayı indiriniz" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24 -msgid "Metacarta Map Rectifier image id" -msgstr "Metacarta Map Rectifier imaj id" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32 -#, java-format -msgid "rectifier id={0}" -msgstr "rectifier id={0}" +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +msgid "Download Rectified Images From Various Services" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#, java-format +msgid "WMS: {0}" +msgstr "" + +#. This service serves the purpose of "just this once" without forcing the user +#. to commit the link to the preferences +#. Clipboard content gets trimmed, so matching whitespace only ensures that this +#. service will never be selected automatically. +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +msgid "Custom WMS Link" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgid "Supported Rectifier Services:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgid "Visit Homepage" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgid "WMS URL or Image ID:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +msgid "Add Rectified Image" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +msgid "" +"Couldn't match the entered link or id to the selected service. Please try " +"again." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +msgid "No valid WMS URL or id" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -10344,5 +10415,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 #, java-format msgid "" @@ -10355,15 +10426,15 @@ msgstr "Otomatik indir" -#: ../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 "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS tabakası ({0}), görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:170 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -10372,25 +10443,25 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../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 "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 msgid "Open a blank WMS layer to load data from a file" msgstr "Veri yüklemek için boş bir WMS tabakası aç" @@ -21837,4 +21908,10 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "Bilgi yükleniyor" + +#~ msgid "Unknown host" +#~ msgstr "Tanımsız host" + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "site-josm.xml veya Wiki Pages ekle." @@ -21860,4 +21937,13 @@ #~ "oynat.Seçim:Klik" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier imaj id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "WMS tabakasının pozisyonunu ayarla" + #~ msgid "Charge" #~ msgstr "Para Değişim" @@ -21883,4 +21969,7 @@ #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Gerçekten ''yapılmış'' olarak işaretlemek istiyormusunuz?" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Metacarta linkinden Rektifiye dosyayı indiriniz" #~ msgid "Portcullis"