Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 15802) +++ 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 "Выгрузка прервана по неизвестной причине"