Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 16009) +++ applications/editors/josm/i18n/po/ru.po (revision 16179) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-19 21:52+0200\n" -"PO-Revision-Date: 2009-06-16 06:44+0000\n" -"Last-Translator: Egor Bushmelyov \n" +"POT-Creation-Date: 2009-06-27 14:26+0200\n" +"PO-Revision-Date: 2009-06-26 22:47+0000\n" +"Last-Translator: mulya \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-19 19:35+0000\n" +"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -30,6 +30,6 @@ #: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Help" msgstr "Справка" @@ -75,8 +75,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 @@ -84,6 +83,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 @@ -103,7 +101,7 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Cancel" @@ -208,4 +206,30 @@ msgid "File could not be found." msgstr "Файл не найден" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to history page for " +"OSM primitive will probably fail. API base URL is: ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, fuzzy +msgid "Please select at least one already uploaded node, way, or relation." +msgstr "Пожалуйста, выберите хотябы один узел или путь." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "Предупреждение" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#, java-format +msgid "" +"WARNING: launching browser windows for the first {0} of {1} selected " +"primitives only" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -251,5 +275,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Широта" @@ -258,5 +282,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Долгота" @@ -293,7 +317,7 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 -#: ../plugins/terracer/src/terracer/TerracerAction.java:82 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 +#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40 @@ -327,4 +351,49 @@ msgstr "Выделите не менее трёх точек." +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#, java-format +msgid "" +"Current number of changes exceeds the max. number of changes, current is " +"{0}, max is {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +msgid "API Capabilities Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 +msgid "Failed to initialize API. Please try again later." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 +#, fuzzy +msgid "API initialization failed" +msgstr "Не инициализированно" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#, fuzzy +msgid "Precondition Violation" +msgstr "Нарушение предварительного условия" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "data" @@ -340,5 +409,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 msgid "conflict" msgstr "конфликт" @@ -421,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301 msgid "Enter values for all conflicts." msgstr "Введите значения для всех конфликтов." @@ -428,5 +497,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303 msgid "Solve Conflicts" msgstr "Решение конфликтов" @@ -615,5 +684,5 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 msgid "E-Mail" -msgstr "" +msgstr "E-Mail" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 @@ -651,11 +720,11 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:559 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -685,5 +754,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -718,4 +787,5 @@ msgid "Help page missing. Create it in english." msgstr "" +"Страница справки отсутствует. Создайте её на английском." #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212 @@ -725,21 +795,27 @@ "\">your language." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:29 +"Страница справки отсутствует. Создайте её на английском или вашем языке." + +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18 msgid "History of Element" msgstr "История элемента" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:27 -msgid "Display history information about OSM ways or nodes." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 +#, fuzzy +msgid "Display history information about OSM ways, nodes, or relations." msgstr "Открыть в браузере историю изменений выделенного объекта." -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:77 -msgid "" -"Please select at least one node, way or relation. Only already uploaded " -"elements have a history." -msgstr "" -"Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже " -"загруженных элементов есть история." +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 +#, fuzzy +msgid "Info about Element" +msgstr "История элемента" + +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 +#, fuzzy +msgid "Display object information about OSM nodes, ways, or relations." +msgstr "Открыть в браузере историю изменений выделенного объекта." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -808,9 +884,9 @@ #: ../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 @@ -879,10 +955,7 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 #, java-format @@ -1049,5 +1122,5 @@ #, java-format msgid "File {0} exists. Overwrite?" -msgstr "" +msgstr "Файл {0} существует. Перезаписать?" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 @@ -1076,5 +1149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 msgid "Conflicts" msgstr "Конфликты" @@ -1102,5 +1175,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 msgid "Save Layer" -msgstr "" +msgstr "Сохранить слой" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 @@ -1238,5 +1311,5 @@ "линии)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:305 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -1246,5 +1319,14 @@ "Проверьте, и при необходимости внесите корректировки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#, fuzzy +msgid "" +"A relation membership was copied to all new ways.\n" +"You should verify this and correct it when necessary." +msgstr "" +"Участие в отношениях было применено ко всем новым линиям.\n" +"Проверьте, и при необходимости внесите корректировки." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 #, java-format msgid "Split way {0} into {1} parts" @@ -1388,129 +1470,37 @@ "Не найдено данных для обновления. Вы уже открыли скачанный слой данных?" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70 -msgid "Undeleting Way..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138 -#, java-format -msgid "" -"There are {0} additional nodes used by way {1}
which are deleted on " -"the server.

Do you want to undelete these nodes too?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170 -#, java-format -msgid "Checking whether node {0} is gone ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 -msgid "Undeleting relation..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252 -#, java-format -msgid "" -"There are {0} additional primitives referred to by relation {1}" -"
which are deleted on the server.

Do you want to undelete them too?" -"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284 -#, java-format -msgid "Checking whether primitive {0} is gone ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339 -msgid "Keep mine" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340 -msgid "Delete mine" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344 -#, java-format -msgid "" -"The OSM primitive with id {0} has been deleted
on " -"the server by another mapper.

Click {1} to keep your " -"primitive and ignore the deleted state.
Your primitive will be assigend a " -"new id.
Click {2} to accept the state on the server and " -"to delete your primitive.
Click {3} to cancel.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356 -msgid "Primitive deleted on the server" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58 msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396 +msgstr "Ошибка обновления выбранного примитива." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59 msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408 +msgstr "Ошибка обновления" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71 #, java-format msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409 +msgstr "Не могу найти примитив с ID {0} в текущем источнике данных" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72 msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445 +msgstr "Прошущен примитив" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107 msgid "Update Selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443 +msgstr "Обновить выборку" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105 msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457 +msgstr "Обновить выбранные примитивы с сервера" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458 +msgstr "Не выбраны примитивы для обновления." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471 -#, java-format -msgid "" -"There are {0} primitives
selected for individual " -"update. Please reduce the selection
to max. {1} primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476 -msgid "Selection too big" -msgstr "" +msgstr "Выборка пуста" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79 @@ -1523,59 +1513,59 @@ msgstr "Загрузить все изменения на OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 msgid "Objects to add:" msgstr "Новые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107 msgid "Objects to modify:" msgstr "Изменённые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 msgid "Objects to delete:" msgstr "Удаляемые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Опишите изменения для закачиваемых данных:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131 msgid "Upload these changes?" msgstr "Загрузить эти изменения?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 msgid "Upload Changes" msgstr "Загрузить изменения" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "No changes to upload." msgstr "Нет изменений для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208 msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +msgstr "Выгрузка" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259 msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +msgstr "Обновление примитива" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315 #, java-format msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355 +msgstr "Синхронизированы только {0} {1}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315 +msgstr "Синхронизировать весь набор данных" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320 #, java-format msgid "" @@ -1588,11 +1578,26 @@ "{6} to abort and continue editing.
" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370 +"Загрузка прервана так как на сервере есть более новая " +"версия одной
из ваших точек, путей или отношений.
Причиной конфликта " +"является {0} с id {1},
версия данных на " +"сервере {2}, ваша версия {3}.

Нажмите {4} что бы " +"синхронизировать только конфликтный примитив.
Нажмите {5} что бы синхронизировать весь локальный набор данных с сервером." +"
Нажмите {6} что бы прекратить и продолжить " +"редактирование.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 msgid "Conflict detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359 +msgstr "Обнаружен конфликт" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "неожиданное возвращённое значение. Получено {0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1602,11 +1607,18 @@ "{1} to abort and continue editing.
" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399 +"Ошибка обновления, так как на сервере имеется более " +"новая версия одного
из ваших узлов, путей или отношений.

. " +"Нажмите на {0} для синхронизации локальных данных с " +"сервером.
Нажмите {1} для прерывания и продолжения " +"редактирования.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412 +"Предупреждение: заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}" +"\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417 #, java-format msgid "" @@ -1615,10 +1627,13 @@ "html>" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 +"Ошибка выгрузки данных на сервер, так как ваши " +"данные
противоречат обязательным условиям.
Сообщение об ошибке:
" +"{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424 msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452 +msgstr "Нарушение предварительного условия" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 #, java-format msgid "" @@ -1627,19 +1642,22 @@ "
{0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463 +"Ошибкапри выгрузке данных, примитив который вы " +"пытаетесь удалить
уже удаленн с сервера.

Сообщение об ошибке:
" +"{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468 msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484 -#, java-format -msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539 +msgstr "Примитив уже удален" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544 msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552 +msgstr "Ошибка выгрузки в OSM API" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557 #, java-format msgid "" @@ -1647,4 +1665,6 @@ "Check the server URL in your preferences and your internet connection." msgstr "" +"Ошибка создания подключения к серверу OSM {0}.\n" +"Проверьте в настройках URL сервера и наличие подключения к сети Internet." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1761,34 +1781,34 @@ msgstr "Данные OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44 msgid "Data Layer" msgstr "Слой данных" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Скачивание {0} из {1} ({2} осталось)" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +msgid "The following errors occurred during mass download:" +msgstr "Следующие ошибки произошли во время массового скачивания:" + #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96 msgid "Errors during Download" msgstr "Ошибка в течение загрузки" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134 #, java-format msgid "" "There are {0} primitives in your local dataset which
might be " -"deleted on the server. If you later try to delete or
update them on the " -"server the server is likely to report a
conflict.

Click {1}" -" to check these primitives individually.
Click {2} to ignore.
" +"deleted on the server. If you later try to delete or
update them the " +"server is likely to report a
conflict.

Click {1} " +"to check the state of these primitives
on the server.
Click {2}" +" to ignore.
" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150 msgid "Deleted or moved primitives" -msgstr "" +msgstr "Удалённые или перемещённые примитивы" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 @@ -1934,5 +1954,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 @@ -2174,4 +2194,6 @@ msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" +"Ключ не может быть пустым при использовании тэга оператора. Пример " +"использования: ключ=значение" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 @@ -2179,9 +2201,10 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" +"Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь" #: ../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 @@ -2199,5 +2222,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 @@ -2207,9 +2230,11 @@ "nodes or range, for example nodes:10-20" msgstr "" +"Неверное значение оператора точек: {0}. Оператор точек ожидает число. точек " +"или диапазон, например, 10-20" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" +msgstr "Неверное значение id оператора: {0}. Ожидалось число." #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 @@ -2240,5 +2265,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 msgid "Error while communicating with server." -msgstr "" +msgstr "Ошибка связи с сервером." #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2295,17 +2320,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 -#, java-format -msgid "Resolve {0} conflicts in {1} objects" -msgstr "Разрешить {0} конфликтов в {1} объектах" - #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54 #, java-format msgid "Resolve conflicts in coordinates in {0}" -msgstr "" +msgstr "Решите конфликт в координатах в {0}" #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83 msgid "cannot resolve undecided conflict" msgstr "" @@ -2368,5 +2388,5 @@ #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" +msgstr "Разрешить конфликт при удалении {0}" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 @@ -2376,5 +2396,5 @@ #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 @@ -2388,9 +2408,14 @@ msgstr[2] "узлов" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 msgid "Purging 1 primitive" msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 #, java-format msgid "" @@ -2399,4 +2424,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 +#, fuzzy, java-format +msgid "removing reference from relation {0}" +msgstr "Удалить Элементы из Отношений" + #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 #, java-format @@ -2421,10 +2451,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 #, java-format msgid "Resolve version conflicts for {0} {1}" @@ -2440,5 +2470,5 @@ msgstr "Применить?" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -2529,25 +2559,4 @@ msgstr "Невозможно скачать параметры с сервера." -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34 -msgid "different" -msgstr "различный" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262 -msgid "deleted" -msgstr "удалён" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "истина" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "ложь" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "положение" - #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 msgid "Decimal Degrees" @@ -2574,21 +2583,21 @@ msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 #, java-format msgid "parameter {0} > 0 required. Got {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128 msgid "incomplete" msgstr "неполный" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 #, java-format msgid "Error: {0}" msgstr "Ошибка: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 #, java-format msgid "Warning: {0}" @@ -2597,5 +2606,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 msgid "nodes" -msgstr "" +msgstr "точки" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 @@ -2615,5 +2624,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 @@ -2627,5 +2636,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "relations" -msgstr "" +msgstr "отношения" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 @@ -2647,5 +2656,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118 #, java-format msgid "{0} member" @@ -2655,22 +2664,22 @@ msgstr[2] "{0} участников" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136 msgid "highway" msgstr "дорога" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137 #: build/trans_presets.java:2994 msgid "railway" msgstr "железная дорога" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 msgid "waterway" msgstr "водоёмы" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139 msgid "landuse" msgstr "землепользование" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 #, java-format @@ -2683,5 +2692,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153 msgid "There's no primitive with version {0} in this history" -msgstr "" +msgstr "В этой истории не существует примитива версии {0}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160 @@ -2693,21 +2702,21 @@ #, java-format msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" +msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 msgid "no earliest version found. History is empty." -msgstr "" +msgstr "более ранняя версия не найдена. История пуста." #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 msgid "no latest version found. History is empty." -msgstr "" +msgstr "более поздняя версия не найдена. История пуста." #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21 msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "" +msgstr "Примитив с id {0} не был найден в этом наборе данных" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27 msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -msgstr "" +msgstr "Примитив с id {0} и версией {1} не был найден в этом наборе данных" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46 @@ -2719,17 +2728,20 @@ #, java-format msgid "parameter ''{0}'' > 0 expected, got ''{1}''" -msgstr "" +msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 #, java-format msgid "parameter ''{0}'' must not be null" -msgstr "" +msgstr "параметр ''{0}'' не должен быть null" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" -msgstr "" +msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -2737,5 +2749,5 @@ #, java-format msgid "parameter {0} not in range 0..{1}, got {2}" -msgstr "" +msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 @@ -2865,4 +2877,14 @@ msgstr "текст" +#. should not happen +#. +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225 +#, java-format +msgid "" +"My primitive with id {0} and version {1} is visible although their primitive " +"with lower version {2} is not visible. Can't deal with this inconsistency. " +"Keeping my primitive. " +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 #, java-format @@ -2883,5 +2905,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144 msgid "background" @@ -2966,51 +2988,4 @@ msgstr "Невозможно записать закладки" -#. setting up the properties table -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 -msgid "Key" -msgstr "Ключ" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 -msgid "Value" -msgstr "Значение" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224 -#, java-format -msgid "{0} object has conflicts:" -msgid_plural "{0} objects have conflicts:" -msgstr[0] "{0} объект имеет конфликты." -msgstr[1] "{0} объекта имеет конфликты." -msgstr[2] "{0} объектов имеет конфликты." - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227 -msgid "my version:" -msgstr "моя версия:" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233 -msgid "their version:" -msgstr "их версия:" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239 -msgid "resolved version:" -msgstr "Разрешённая версия:" - #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76 msgid "Message of the day not available" @@ -3193,22 +3168,22 @@ "используется." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 msgid "Tools" msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Шаблоны" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 @@ -3221,21 +3196,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 msgid "Toggle Wireframe view" msgstr "Показать/скрыть каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 msgid "Full Screen" msgstr "Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 msgid "Toggle Full Screen view" msgstr "Переключить в Полноэкранный режим" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 msgid "Audio" msgstr "Аудио" @@ -3350,5 +3325,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17 msgid "My with Their" -msgstr "" +msgstr "Мою с их" #. * @@ -3357,5 +3332,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22 msgid "My with Merged" -msgstr "" +msgstr "Мою с объединённой" #. * @@ -3364,5 +3339,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27 msgid "Their with Merged" -msgstr "" +msgstr "Их с объединённой" #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82 @@ -3371,11 +3346,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 msgid "Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +msgstr "Параметры" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 @@ -3383,51 +3358,51 @@ msgstr "Тэги" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 msgid "Nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +msgstr "Точки" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203 msgid "Members" msgstr "Участники" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 #, java-format msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +msgstr "Тэги({0} конфликтов)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +msgstr "Точки(решённые)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3435,25 +3410,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 msgid "Conflict Resolution" msgstr "" @@ -3490,5 +3465,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -3499,5 +3474,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3511,5 +3486,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -3694,9 +3669,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#, fuzzy, java-format +msgid "" +"An error occurred while communicating with the server
Details: {0}" +msgstr "Ошибка связи с сервером." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#, fuzzy +msgid "Communication with server failed" +msgstr "Ошибка связи с сервером." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +msgid "Yes, undelete them too" +msgstr "Да, восстановить их тоже" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +msgid "No, cancel operation" +msgstr "Нет, отменить действие" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#, java-format +msgid "" +"There are {0} additional nodes used by way {1}
which are deleted on " +"the server.

Do you want to undelete these nodes too?" +msgstr "" +"Существует {0} дополнительных узлов используемых треком {1}
, " +"которые удалены на сервере.

Вы хотите восстановить эти узлы тоже?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +msgid "Undelete additional nodes?" +msgstr "Восстановить дополнительные узлы?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#, java-format +msgid "" +"There are {0} additional primitives referred to by relation {1}" +"
which are deleted on the server.

Do you want to undelete them too?" +"" +msgstr "" +"Существует {0} дополнительных примитива связанных с отношением {1}" +"
, которые удалены с сервера.

Вы хотите восстановить их тоже?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +msgid "Undelete dependent primitives?" +msgstr "Восстановить связанные примитивы?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3704,48 +3730,128 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "Visible State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 #: ../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:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +msgid "deleted" +msgstr "удалён" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#, fuzzy +msgid "visible (on the server)" +msgstr "Примитив удаляется на сервере" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#, fuzzy +msgid "not visible (on the server)" +msgstr "Примитив удаляется на сервере" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#, fuzzy +msgid "Keep a clone of the local version" +msgstr "Пожалуйста, введите название места." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +msgid "Physically delete from local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 msgid "Undecide conflict between deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +msgid "Keep my visible state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#, fuzzy +msgid "Yes, reset the id" +msgstr "Да, восстановить их тоже" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 +#, fuzzy +msgid "No, abort" +msgstr "Без даты" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#, java-format +msgid "" +"To keep your local version, JOSM
has to reset the id of {0} {1} to " +"0.
On the next upload the server will assign
it a new id.
Do yo " +"agree?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +msgid "Reset id to 0" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608 +msgid "Keep their visible state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623 +msgid "Yes, purge it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628 +#, java-format +msgid "" +"JOSM will have to remove your local primitive with id {0}
from the " +"dataset.
Do you agree?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633 +#, fuzzy +msgid "Remove from dataset" +msgstr "убрать из выделения" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +msgid "Undecide conflict between visible state" msgstr "" @@ -3790,4 +3896,29 @@ msgstr "" +#. setting up the properties table +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 +msgid "Key" +msgstr "Ключ" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 +msgid "Value" +msgstr "Значение" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 msgid "cannot apply undecided tag merge item" @@ -3846,5 +3977,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -3868,5 +3999,5 @@ msgstr "Стек команд: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 @@ -3875,63 +4006,51 @@ msgstr "Выбрать на карте объекты, выбранные в списке вверху." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "Resolve" msgstr "Разрешить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "Open a merge dialog of all selected items in the list above." msgstr "Открыть диалоговое окно для слияния выбранных объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70 msgid "Conflict" msgstr "Конфликт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69 msgid "Merging conflicts." msgstr "Разрешение конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 -msgid "WARNING: unexpected value for preference conflict.resolution, got " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 -msgid "Resolve Conflicts" -msgstr "Разрешить конфликты" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 -msgid "Solve Conflict" -msgstr "Разрешить конфликт" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 #, java-format msgid "Conflicts: {0}" msgstr "Конфликты: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 msgid "Apply Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 msgid "Apply partial resolutions" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 #, java-format msgid "" @@ -3941,11 +4060,4 @@ "resolving conflicts." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "Предупреждение" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -4376,5 +4488,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -4399,5 +4511,5 @@ msgstr "да" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -4424,27 +4536,27 @@ msgstr "нет" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424 #, java-format msgid "Members: {0}" msgstr "Участники: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432 #, java-format msgid "Relation Editor: {0}" msgstr "Редактор отношений: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "There were conflicts during import." msgstr "При импортировании возникли конфликтные ситуации." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553 msgid "Error parsing server response." msgstr "Ошибка при разборе ответа от сервера." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556 msgid "Cannot connect to server." msgstr "Невозможно связаться с сервером." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560 msgid "Error when communicating with server." msgstr "" @@ -4627,5 +4739,5 @@ msgstr "масштаб" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 msgid "Slippy map" msgstr "Интерактивная карта" @@ -4652,28 +4764,28 @@ msgstr "Номера квадратов" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279 #, java-format msgid "Images for {0}" msgstr "Изображения для {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:103 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284 msgid "Read GPX..." msgstr "Прочесть GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:112 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293 #, java-format msgid "No time for point {0} x {1}" msgstr "Нет указания времени для точки {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:117 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Невозможно прочесть время \"{0}\" у точки {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306 msgid "No images with readable timestamps found." msgstr "Не найдено изображений с информацией о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136 #, java-format @@ -4681,34 +4793,29 @@ msgstr "Чтение {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240 msgid "Geotagged Images" msgstr "Изображения с данными о местоположении" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:255 -#, java-format -msgid "Image with path {0} does not exist or is not readable." -msgstr "Картинка {0} не существует или произошла ошибка чтения." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 #, java-format msgid "GPS start: {0}" msgstr "Начало GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:364 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 #, java-format msgid "GPS end: {0}" msgstr "Конец GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 #, java-format msgid "current delta: {0}s" msgstr "текущая разница: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 msgid "timezone difference: " msgstr "разница в часовых поясах: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278 msgid "image" @@ -4718,14 +4825,14 @@ msgstr[2] "изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 #, java-format msgid "{0} within the track." msgstr "{0} в пределах трека" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 msgid "Sync clock" msgstr "Синхронизация часов" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 @@ -4733,32 +4840,32 @@ msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Невозможно прочесть дату из файла \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "EXIF файла \"{0}\" не содержит информации о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:497 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:499 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720 msgid "GPS unit timezone (difference to photo)" msgstr "Часовой пояс GPS объекта (отличается от фотографии)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизировать время с GPS приёмником" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:526 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:528 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 msgid "Time entered could not be parsed." msgstr "Введённое время невозможно использовать" @@ -4913,5 +5020,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4983,33 +5090,33 @@ msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 #, java-format msgid "There were {0} conflicts during import." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 #, java-format msgid " ({0} deleted.)" msgstr " ({0} удалено)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -6230,5 +6337,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set all to default" -msgstr "Задать все в значение по усмолчанию" +msgstr "Задать все значения по умолчанию" #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217 @@ -6241,7 +6348,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 -#: ../plugins/terracer/src/terracer/TerracerAction.java:422 -#: ../plugins/terracer/src/terracer/TerracerAction.java:440 -#: ../plugins/terracer/src/terracer/TerracerAction.java:504 +#: ../plugins/terracer/src/terracer/TerracerAction.java:412 +#: ../plugins/terracer/src/terracer/TerracerAction.java:430 +#: ../plugins/terracer/src/terracer/TerracerAction.java:494 msgid "All" msgstr "Все" @@ -6989,5 +7096,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 -#: ../plugins/terracer/src/terracer/TerracerAction.java:108 +#: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format msgid "Change {0} object" @@ -6998,5 +7105,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 -#: ../plugins/terracer/src/terracer/TerracerAction.java:110 +#: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ничего не выбрано!" @@ -7032,4 +7139,6 @@ #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 @@ -7047,10 +7156,11 @@ msgstr "Подготовка данных..." -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 msgid "GPX Files" msgstr "GPS файлы" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 @@ -7058,4 +7168,16 @@ msgid "Markers from {0}" msgstr "Маркеры из {0}" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#, fuzzy, java-format +msgid "File \"{0}\" does not exist" +msgstr "Файл {0} существует. Перезаписать?" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#, java-format +msgid "Parsing file \"{0}\" failed" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 @@ -7063,4 +7185,20 @@ msgstr "Ошибка разбора: неправильная структура документа gpx" +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#, java-format +msgid "no primitive with id {0} in local dataset. Can't infer primitive type" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, java-format +msgid "Server replied with response code 404 for id {0}. Skipping." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +msgid "" +"Server replied with response code 404, retrying with an individual request " +"for each primitive" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 msgid "NMEA-0183 Files" @@ -7068,4 +7206,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Координаты импортированы: " @@ -7138,13 +7277,13 @@ msgstr "Закрывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 msgid "No changeset present for diff upload" msgstr "Нет изменений для выгрузки" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 msgid "Preparing..." msgstr "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 msgid "Uploading..." msgstr "Закачка..." @@ -7239,58 +7378,58 @@ msgstr "OSM файлы сервера" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 msgid "Unknown version" msgstr "Неизвестная версия" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 msgid "Version number missing from OSM data" msgstr "Номер версии отсутствует по данным OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171 #, java-format msgid "Unknown version: {0}" msgstr "Версия неизвестна: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 msgid "Found element in non-way." msgstr "Найден элемент вне пути." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 msgid " has zero ref" msgstr "у нет ссылок ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:214 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222 msgid "Found element in non-relation." msgstr "Найден тэг вне отношения." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:219 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243 msgid "Incomplete specification with ref=0" msgstr "Неполная спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 msgid "Illegal object with id=0" msgstr "Недопустимый объект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315 #, java-format msgid "" @@ -7298,15 +7437,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Отсутствует необходимый атрибут \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -7315,9 +7454,9 @@ "{0}\n" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495 msgid "Prepare OSM data..." msgstr "Подготовка данных..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 msgid "Ill-formed node id" msgstr "Неверный номер точки" @@ -7348,5 +7487,5 @@ "соединение." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 #, java-format msgid "" @@ -7355,5 +7494,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" @@ -7605,9 +7744,9 @@ msgstr "Ошибка чтения файла с описанием модуля: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 msgid "This is after the end of the recording" msgstr "Это позже конца записи" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 msgid "Error playing sound" msgstr "Ошибка при воспроизведении звука" @@ -8609,4 +8748,23 @@ msgstr "" +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 +msgid "TangoGPS Files (*.log)" +msgstr "" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 +#, fuzzy +msgid "Format errors: " +msgstr "Ошибка формата файла" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112 +#, fuzzy +msgid "TangoGPS import success" +msgstr "Импорт NMEA успешно завершён" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 +#, fuzzy +msgid "TangoGPS import faliure!" +msgstr "Сбой при импорте NMEA!" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21 @@ -9343,4 +9501,15 @@ msgstr "Отображает проблемы из OpenStreetBugs" +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 +msgid "" +"The openstreetbus plugin is using the old server at appspot.com.
A " +"new server is available at schokokeks.org.
Do you want to switch to the " +"new server? (Strongly recommended)" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100 +msgid "Switch to new openstreetbugs server?" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51 msgid "" @@ -9447,9 +9616,9 @@ msgstr "Неизвестное расширение файла: {0}" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:41 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:39 msgid "Osmarender" msgstr "Osmarender" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:96 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:94 msgid "" "Firefox not found. Please set firefox executable in the Map Settings page of " @@ -9459,9 +9628,9 @@ "Настройки карты в окне настроек." -#: ../plugins/osmarender/src/OsmarenderPlugin.java:127 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "osmarender options" msgstr "Настройки osm рендера" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:128 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 msgid "Firefox executable" msgstr "исполняемый файл Firefox" @@ -9611,35 +9780,44 @@ msgstr "Введите значение толщины" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 msgid "Slippy Map" msgstr "Интерактивная карта" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 msgid "Load Tile" msgstr "Загрузить фрагмент" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 msgid "Show Tile Status" msgstr "Показать статус фрагмента" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 msgid "Request Update" msgstr "Запросить обновление" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 msgid "Load All Tiles" msgstr "Загрузить все фрагменты" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 msgid "Increase zoom" msgstr "Приблизить" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 msgid "Decrease zoom" msgstr "Отодвинуть" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +msgid "Flush Tile Cache" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 msgid "image not loaded" msgstr "изображение не загружено" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 +#, fuzzy +msgid "image loading..." +msgstr "Закачка..." #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9680,14 +9858,14 @@ msgstr "Бледный фон: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 msgid "error loading metadata" msgstr "ошибка загрузки метаданных" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 #, java-format msgid "requested: {0}" msgstr "предлагается: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 msgid "error requesting update" msgstr "ошибка при запросе обновления" @@ -9860,49 +10038,49 @@ msgstr "Обратный ряд домов вдоль улицы" -#: ../plugins/terracer/src/terracer/TerracerAction.java:78 -#: ../plugins/terracer/src/terracer/TerracerAction.java:82 +#: ../plugins/terracer/src/terracer/TerracerAction.java:68 +#: ../plugins/terracer/src/terracer/TerracerAction.java:72 msgid "Terrace a building" msgstr "Ряд домов вдоль улицы" -#: ../plugins/terracer/src/terracer/TerracerAction.java:80 +#: ../plugins/terracer/src/terracer/TerracerAction.java:70 msgid "Creates individual buildings from a long building." msgstr "Создать отдельные здания из длинного здания" -#: ../plugins/terracer/src/terracer/TerracerAction.java:140 +#: ../plugins/terracer/src/terracer/TerracerAction.java:130 msgid "Select a single, closed way of at least four nodes." msgstr "Выберите одину, замкнутую линию по крайней мере из четырех узлов." -#: ../plugins/terracer/src/terracer/TerracerAction.java:209 +#: ../plugins/terracer/src/terracer/TerracerAction.java:199 msgid "Terrace" msgstr "Ряд домов вдоль улицы" -#: ../plugins/terracer/src/terracer/TerracerAction.java:423 -#: ../plugins/terracer/src/terracer/TerracerAction.java:447 +#: ../plugins/terracer/src/terracer/TerracerAction.java:413 +#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "Четные" -#: ../plugins/terracer/src/terracer/TerracerAction.java:424 +#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Нечетные" -#: ../plugins/terracer/src/terracer/TerracerAction.java:482 +#: ../plugins/terracer/src/terracer/TerracerAction.java:472 msgid "Highest number" msgstr "Максимальный номер" -#: ../plugins/terracer/src/terracer/TerracerAction.java:483 +#: ../plugins/terracer/src/terracer/TerracerAction.java:473 msgid "Lowest number" msgstr "Минимальный номер" -#: ../plugins/terracer/src/terracer/TerracerAction.java:484 +#: ../plugins/terracer/src/terracer/TerracerAction.java:474 msgid "Interpolation" msgstr "Интерполяция" #. item "Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:485 +#: ../plugins/terracer/src/terracer/TerracerAction.java:475 #: build/trans_presets.java:2173 msgid "Street name" msgstr "Название улицы" -#: ../plugins/terracer/src/terracer/TerracerAction.java:485 +#: ../plugins/terracer/src/terracer/TerracerAction.java:475 msgid "Optional" msgstr "Необъязательно" @@ -9945,13 +10123,13 @@ msgstr "Извините, для анонимных пользователей это недоступно" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99 msgid "Join overlapping Areas" msgstr "Объединить накладывающиеся области" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99 msgid "Joins areas that overlap each other" msgstr "Объединить области, накладывающиеся друг на друга" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." msgstr "" @@ -9959,18 +10137,18 @@ "загрузкой." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 msgid "Continue anyway" msgstr "Продолжить в любом случае" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133 msgid "Only up to two areas can be joined at the moment." msgstr "Только два района могут быть объединены в данный момент." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64 msgid "" @@ -9983,10 +10161,10 @@ "Действительно продолжить?" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67 msgid "Please abort if you are not sure" msgstr "Пожалуйста, остановитесь, если вы не уверены" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172 msgid "Please select at least one closed way the should be joined." msgstr "" @@ -9994,29 +10172,29 @@ "быть объединены." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202 msgid "Added node on all intersections" msgstr "Добавлены узлы на всех пересечениях" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Удалить линии, которые не являются частью внутреннего мультиполигона" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 msgid "Fix relations" msgstr "Исправить отношения" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236 msgid "Joined self-overlapping area" msgstr "Присоединить самоперекрывающиеся области" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 msgid "Joined overlapping areas" msgstr "Присоединить перекрывающиеся области" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -10026,62 +10204,62 @@ "Пожалуйста, проверьте не появились ли ошибки." -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 msgid "Fix tag conflicts" msgstr "Инсправить конфликт тегов" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464 msgid "Removed Element from Relations" msgstr "Удалить Элементы из Отношений" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573 msgid "Join Areas: Remove Short Ways" msgstr "Присоединить районы: удаление коротких путей" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589 msgid "Closed Way" msgstr "Замкнутая линия" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856 msgid "Remove tags from inner ways" msgstr "Удаление тегов у внутренних линий" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885 msgid "Join Areas Function" msgstr "Присоединить районы функционирования" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "Перейти на позицию" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Opens a dialog that allows to jump to a specific location" msgstr "" "Открывает диалоговое окно, которое позволяет перейти к определенной местности" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Введите Lat / Lon, чтобы перейти к позиции." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Вы также можете вставить URL из www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Приближение (в метрах)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Перейти туда" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Перейти к позиции" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" @@ -10089,5 +10267,5 @@ "проверьте." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Невозможно разобрать широту/долготу" @@ -11168,6 +11346,11 @@ msgstr "" +#. Plugin dataimport +#: build/trans_plugins.java:13 +msgid "Allows to import various file formats into JOSM directly." +msgstr "" + #. Plugin DirectUpload -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -11178,10 +11361,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:15 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Дублирующиеся линии со смещением" #. Plugin editgpx -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -11190,5 +11373,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:21 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -11197,10 +11380,10 @@ #. Plugin grid -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:23 msgid "Provide a background layer that displays a map grid" msgstr "Предоставлен фоновый слой который отображает сетку на карте" #. Plugin ImageWayPoint -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11213,10 +11396,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "Helps vectorizing WMS images." msgstr "Помогает векторизовать изображения WMS." #. Plugin livegps -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11225,5 +11408,5 @@ #. Plugin measurement -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11236,5 +11419,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11247,15 +11430,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "Displays an OpenLayers background image" msgstr "Отобразить фоновый рисунок OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Imports issues from OpenStreetBugs" msgstr "Импорт вопросов из OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11265,5 +11448,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11271,5 +11454,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11280,20 +11463,20 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великолепный JGoodies Пластиковый Скин." #. Plugin remotecontrol -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "Let other applications send commands to JOSM." msgstr "Разрешить другим приложениям посылать команды JOSM." #. Plugin routing -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Provides routing capabilities." msgstr "Предоставляет возможности маршрутизации." #. Plugin slippymap -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11304,15 +11487,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Allow adding markers/nodes on current gps positions." msgstr "Разрешить добавить теги/узлы на текущей GPS позиции." #. Plugin tageditor -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показывает окно для редактирования тегов в табличной сетке." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11326,15 +11509,15 @@ #. Plugin tcx-support -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Directly load TCX files from JOSM." msgstr "Прямо загрузить TCX файлы из JOSM." #. Plugin terracer -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "Make terraced houses out of single blocks." msgstr "Сделать ряд домов вдоль улицы из одного блока." #. Plugin usertools -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11346,5 +11529,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11355,5 +11538,5 @@ #. Plugin validator -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11365,10 +11548,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:71 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -16377,5 +16560,5 @@ #: build/trans_presets.java:2891 msgid "unitarian" -msgstr "" +msgstr "унитарный" #: build/trans_presets.java:2161 build/trans_presets.java:2882 @@ -22531,21 +22714,109 @@ msgstr "" +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже " +#~ "загруженных элементов есть история." + +#~ msgid "Undeleting Way..." +#~ msgstr "Восстановление удаленного пути..." + +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Проверка существования узла {0} в прошлом..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Восстановление удаленного отношения..." + +#~ msgid "Checking whether primitive {0} is gone ..." +#~ msgstr "Проверка существования примитива {0} в прошлом..." + +#~ msgid "Keep mine" +#~ msgstr "Сохранить мои" + +#~ msgid "Delete mine" +#~ msgstr "Удалить мои" + +#~ msgid "" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" +#~ msgstr "" +#~ "OSM примитив с id {0} был удален
с сервера " +#~ "другим картографом.

Нажмите {1} для сохранения " +#~ "вашего примитива и игнорирования попытки удаления.
Ваш примитив будет " +#~ "добавлен с новым id.
Нажмите {2} для согласия с " +#~ "удалением примитива, (ваш примитив будет удален).
Нажмите {3} для отмены.
" + +#~ msgid "" +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" +#~ msgstr "" +#~ "Выбрано {0} примитивов
для индивидуального " +#~ "обновления. Пожалуйста, уменьшите выделение
до макс. {1} примитивов." + +#~ msgid "Selection too big" +#~ msgstr "Выборка слишком большая" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Картинка {0} не существует или произошла ошибка чтения." + +#~ msgid "Uploading data" +#~ msgstr "Загрузка данных" + +#~ msgid "Email" +#~ msgstr "Электронная почта" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Разрешить конфликты" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} объект имеет конфликты." +#~ msgstr[1] "{0} объекта имеет конфликты." +#~ msgstr[2] "{0} объектов имеет конфликты." + +#~ msgid "my version:" +#~ msgstr "моя версия:" + +#~ msgid "their version:" +#~ msgstr "их версия:" + +#~ msgid "resolved version:" +#~ msgstr "Разрешённая версия:" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" + +#~ msgid "OSM username (email)" +#~ msgstr "Имя пользователя OSM (e-mail)" + +#~ msgid "Unknown host" +#~ msgstr "Неизвестный хост" + +#~ msgid "position" +#~ msgstr "положение" + +#~ msgid "different" +#~ msgstr "различный" + +#~ msgid "true" +#~ msgstr "истина" + +#~ msgid "false" +#~ msgstr "ложь" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Разрешить {0} конфликтов в {1} объектах" + #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба." - -#~ msgid "Uploading data" -#~ msgstr "Загрузка данных" - -#~ msgid "Email" -#~ msgstr "Электронная почта" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" - -#~ msgid "OSM username (email)" -#~ msgstr "Имя пользователя OSM (e-mail)" - -#~ msgid "Unknown host" -#~ msgstr "Неизвестный хост" #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -22713,4 +22984,7 @@ #~ msgstr "Пересечения найдено. Ничего не изменялось." +#~ msgid "Solve Conflict" +#~ msgstr "Разрешить конфликт" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -22762,7 +23036,4 @@ #~ msgstr "Начать маршрутизацию" -#~ msgid "Not initialized" -#~ msgstr "Не инициализированно" - #~ msgid "Cannot read numeric value from response" #~ msgstr "Не возможно прочесть числовое знаечение из ответа"