Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 16179) +++ applications/editors/josm/i18n/po/ru.po (revision 16407) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-27 14:26+0200\n" -"PO-Revision-Date: 2009-06-26 22:47+0000\n" +"POT-Creation-Date: 2009-07-09 10:40+0200\n" +"PO-Revision-Date: 2009-07-06 20:56+0000\n" "Last-Translator: mulya \n" "Language-Team: Koptev Oleg \n" @@ -17,10 +17,10 @@ "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-27 12:18+0000\n" +"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\n" -#: ../core/src/org/openstreetmap/josm/Main.java:189 +#: ../core/src/org/openstreetmap/josm/Main.java:192 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" @@ -28,6 +28,6 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:198 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 +#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 @@ -35,32 +35,33 @@ msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:261 -msgid "The projection could not be read from preferences. Using Mercator" +#: ../core/src/org/openstreetmap/josm/Main.java:281 +#, fuzzy, java-format +msgid "The projection {0} could not be activated. Using Mercator" msgstr "" "Невозможно прочитать вид проекции из настроек. Используется проекция " "Меркатора" -#: ../core/src/org/openstreetmap/josm/Main.java:349 +#: ../core/src/org/openstreetmap/josm/Main.java:394 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." -#: ../core/src/org/openstreetmap/josm/Main.java:350 +#: ../core/src/org/openstreetmap/josm/Main.java:395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 msgid "Unsaved Changes" msgstr "Несохранённые изменения" -#: ../core/src/org/openstreetmap/josm/Main.java:351 +#: ../core/src/org/openstreetmap/josm/Main.java:396 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" -#: ../core/src/org/openstreetmap/josm/Main.java:352 +#: ../core/src/org/openstreetmap/josm/Main.java:397 msgid "Save and Exit" msgstr "Сохранить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:352 +#: ../core/src/org/openstreetmap/josm/Main.java:397 msgid "Discard and Exit" msgstr "Отменить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:352 +#: ../core/src/org/openstreetmap/josm/Main.java:397 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 @@ -73,12 +74,12 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 -#: ../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/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 @@ -92,7 +93,7 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 @@ -103,32 +104,32 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Cancel" msgstr "Отмена" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:424 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:391 +#: ../core/src/org/openstreetmap/josm/Main.java:437 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнорируется неверный адрес файла: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 msgid "UNKNOWN" msgstr "НЕИЗВЕСТНО" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "About" msgstr "О программе" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 msgid "Display the about screen." msgstr "Отобразить информацию о программе." @@ -136,10 +137,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -147,25 +148,26 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 #, java-format msgid "Version {0}" msgstr "Версия {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #, java-format msgid "Last change at {0}" msgstr "Последние изменения: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Java Version {0}" msgstr "Версия Java: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 msgid "Homepage" msgstr "Домашняя страница" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Bug Reports" msgstr "Отчёты об ошибках" @@ -175,5 +177,5 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 #: build/trans_surveyor.java:64 @@ -181,27 +183,27 @@ msgstr "Сведения" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 msgid "Readme" msgstr "Для прочтения" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 msgid "Revision" msgstr "Версия" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Contribution" msgstr "Авторы" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 msgid "Plugins" msgstr "Модули" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 msgid "About JOSM..." msgstr "О программе" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 msgid "File could not be found." msgstr "Файл не найден" @@ -213,14 +215,18 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL API. Перенаправление на " +"страницу истории OSM примитива вероятно не выполнено. Базовый URL API: " +"''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 -#, fuzzy msgid "Please select at least one already uploaded node, way, or relation." -msgstr "Пожалуйста, выберите хотябы один узел или путь." +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 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 msgid "Warning" msgstr "Предупреждение" @@ -232,4 +238,6 @@ "primitives only" msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} выделенных " +"примитивов" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -275,5 +283,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81 msgid "Latitude" msgstr "Широта" @@ -282,5 +290,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84 msgid "Longitude" msgstr "Долгота" @@ -288,5 +296,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246 msgid "Align Nodes in Circle" msgstr "Выстроить точки окружностью" @@ -299,5 +307,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -357,18 +365,19 @@ "{0}, max is {1}" msgstr "" +"Текущее число изменений превысило максимальное, текущее - {0}, максимальное " +"- {1}" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 msgid "API Capabilities Violation" -msgstr "" +msgstr "Нарушение возможностей API" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 msgid "Failed to initialize API. Please try again later." -msgstr "" +msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее." #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -#, fuzzy msgid "API initialization failed" -msgstr "Не инициализированно" +msgstr "Сбой инициализации API" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 @@ -378,4 +387,6 @@ "{1}" msgstr "" +"Предупреждение: автоматическое усечение значения тэга ''{0}'' на удалённом " +"примитиве {1}" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 @@ -385,48 +396,49 @@ "length {2}. Values length is {3}." msgstr "" +"Длина значения 'для тега '{0}'' примитива {1} превышает максимально " +"допустимую длину {2}. Значение длины {3}." #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 -#, fuzzy msgid "Precondition Violation" -msgstr "Нарушение предварительного условия" +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 +msgstr "{0} точек в линии {1} превышают максимально допустимое число точек {2}" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 msgid "data" msgstr "данные" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 msgid "layer" msgstr "слой" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 msgid "selection" msgstr "выделение" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 msgid "download" msgstr "скачанное" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom to {0}" msgstr "Показать {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #, java-format msgid "Zoom the view to {0}." msgstr "Изменить масштаб чтобы показать {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -436,9 +448,9 @@ msgstr "Вид: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 msgid "Nothing selected to zoom to." msgstr "Ничего не выделено для показа." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 msgid "No conflicts to zoom to" msgstr "Нет конфликтов чтобы их показать." @@ -531,39 +543,43 @@ msgstr "Выделите что-нибудь для копирования." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 msgid "Create Circle" msgstr "Создать окружность" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 msgid "Create a circle from three selected nodes." msgstr "Создать окружность по трём выделенным точкам" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101 -msgid "Please select exactly three nodes or one way with exactly three nodes." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 +msgid "Those nodes are not in a circle." +msgstr "Точки не расположены по кругу" + +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#, fuzzy +msgid "" +"Please select exactly two or three nodes or one way with exactly two or " +"three nodes." msgstr "" "Пожалуйста, выберите ровно три точки, или линию, состоящую ровно из трёх " "точек." - -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121 -msgid "Those nodes are not in a circle." -msgstr "Точки не расположены по кругу" #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 msgid "Delete" msgstr "Удалить" @@ -613,5 +629,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 #, java-format msgid "File: {0}" @@ -720,11 +736,12 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563 #: ../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:554 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -735,5 +752,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 msgid "Error" msgstr "Ошибка" @@ -743,30 +760,30 @@ msgstr "Выберите лицензию из набора" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 msgid "JOSM Online Help" msgstr "Online-справка по JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 msgid "Open in Browser" msgstr "Открыть в браузере" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569 msgid "Edit" msgstr "Правка" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 @@ -774,14 +791,14 @@ msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 msgid "Can only edit help pages from JOSM Online Help" msgstr "Возможно только редактирование справочных страниц JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 #, java-format msgid "Error while loading page {0}" msgstr "Ошибка при загрузке страницы {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 #, java-format msgid "Help page missing. Create it in english." @@ -789,5 +806,5 @@ "Страница справки отсутствует. Создайте её на английском." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 #, java-format msgid "" @@ -804,18 +821,15 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 -#, fuzzy msgid "Display history information about OSM ways, nodes, or relations." -msgstr "Открыть в браузере историю изменений выделенного объекта." +msgstr "Показать информацию истории о OSM линиях, точках или связях." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 -#, fuzzy msgid "Info about Element" -msgstr "История элемента" +msgstr "Информация об Элементе" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 -#, fuzzy msgid "Display object information about OSM nodes, ways, or relations." -msgstr "Открыть в браузере историю изменений выделенного объекта." +msgstr "Показать информацию об объектах о OSM линиях, точках или связях." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -878,5 +892,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 msgid "Mirror" msgstr "Зеркало" @@ -915,10 +929,10 @@ msgstr "вправо" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 #, java-format msgid "Move {0}" msgstr "Переместить {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Moves Objects {0}" @@ -926,5 +940,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 msgid "Cannot move objects outside of the world." msgstr "Невозможно переместить объекты за пределы мира." @@ -1124,5 +1138,5 @@ msgstr "Файл {0} существует. Перезаписать?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1132,26 +1146,25 @@ "создайте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 msgid "No document open so nothing to save." msgstr "Нет открытых документов. Нечего сохранять." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 msgid "Empty document" msgstr "Пустой документ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 msgid "The document contains no data." msgstr "В документе не содержиться данных" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 msgid "Save anyway" msgstr "Сохранить в любом случае" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "Conflicts" msgstr "Конфликты" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1161,36 +1174,36 @@ "будут обработаны, как будто вы отменили их все. Продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 msgid "Reject Conflicts and Save" msgstr "Отказаться от конфликтов и сохранить" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 msgid "Save OSM file" msgstr "Сохранить файл OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Save GPX file" msgstr "Сохранить файл GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "Save Layer" msgstr "Сохранить слой" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 msgid "Could not back up file." msgstr "Невозможно создать резервную копию." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 msgid "Unknown file extension." msgstr "Неизвестное расширение файла." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 msgid "An error occurred while saving." msgstr "При сохранении возникла ошибка." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 msgid "An error occurred while restoring backup file." msgstr "При восстановлении из резервной копии возникла ошибка." @@ -1243,6 +1256,7 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 msgid "Close" msgstr "Закрыть" @@ -1320,11 +1334,10 @@ #: ../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" -"Проверьте, и при необходимости внесите корректировки." +"Отношения членства были скопированы на все новые линии. \n" +"Вы должны проверить и исправить, если это необходимо." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 @@ -1504,68 +1517,68 @@ msgstr "Выборка пуста" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 msgid "Upload to OSM..." msgstr "Загрузить на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 msgid "Upload all changes to the OSM server." msgstr "Загрузить все изменения на OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 msgid "Objects to add:" msgstr "Новые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 msgid "Objects to modify:" msgstr "Изменённые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Objects to delete:" msgstr "Удаляемые объекты:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Опишите изменения для закачиваемых данных:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 msgid "Upload these changes?" msgstr "Загрузить эти изменения?" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 msgid "Upload Changes" msgstr "Загрузить изменения" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 msgid "No changes to upload." msgstr "Нет изменений для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 msgid "Uploading" msgstr "Выгрузка" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 msgid "Updating primitive" msgstr "Обновление примитива" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Синхронизированы только {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 msgid "Synchronize entire dataset" msgstr "Синхронизировать весь набор данных" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 #, java-format msgid "" @@ -1587,17 +1600,17 @@ "редактирование.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 msgid "Conflict detected" msgstr "Обнаружен конфликт" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 #, java-format msgid "unexpected return value. Got {0}" msgstr "неожиданное возвращённое значение. Получено {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 #, java-format msgid "" @@ -1613,5 +1626,5 @@ "редактирования.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1620,5 +1633,5 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 #, java-format msgid "" @@ -1631,9 +1644,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 msgid "Precondition violation" msgstr "Нарушение предварительного условия" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 #, java-format msgid "" @@ -1646,18 +1659,18 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 msgid "Primitive already deleted" msgstr "Примитив уже удален" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546 msgid "Upload to OSM API failed" msgstr "Ошибка выгрузки в OSM API" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559 #, java-format msgid "" @@ -1764,24 +1777,15 @@ msgstr "Данные GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 msgid "Downloading data" msgstr "Загрузка данных" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 msgid "No data imported." msgstr "Данные не импортированы" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71 -#, java-format -msgid "Data Layer {0}" -msgstr "Слой данных {0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 msgid "OpenStreetMap data" msgstr "Данные OpenStreetMap" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44 -msgid "Data Layer" -msgstr "Слой данных" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54 @@ -1807,4 +1811,9 @@ " to ignore.
" msgstr "" +"{0} примитив(ов) в вашем наборе данных которые
могут быть удалены " +"на сервере. В дальнейшем, если вы попытаетесь удалить или
обновить их, " +"сервер скорее всего сообщит о
конфликте.

Нажмите {1} что бы проверить состояние этих примитивов
на сервере.
Нажмите " +"{2} что бы проигнорировать.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150 @@ -1823,5 +1832,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 #, java-format @@ -1926,5 +1935,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." @@ -1935,5 +1944,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 msgid "Release the mouse button to stop rotating." msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." @@ -1952,7 +1961,7 @@ "этой точке" -#: ../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:51 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 @@ -1960,9 +1969,9 @@ msgstr "Выбор" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 msgid "Select, move and rotate objects" msgstr "Выбирать, двигать и вращать объекты" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 #, java-format msgid "Add and move a virtual new node to way" @@ -1972,5 +1981,28 @@ msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 +#, fuzzy +msgid "Move elements" +msgstr "Переместить влево" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 +#, fuzzy +msgid "Move them" +msgstr "Переместить влево" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 +#, fuzzy +msgid "Undo move" +msgstr "Отмена" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -1979,5 +2011,5 @@ "объединения с ближайшей точкой." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -1997,5 +2029,5 @@ msgstr "Изменять масштаб и двигать карту" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2060,5 +2092,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" +msgstr "type=route - ключ 'type' с точным значением 'route'." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 @@ -2067,4 +2099,6 @@ "type=, *=*, *=" msgstr "" +"type=* - ключ 'type' с любым значением. Также попробуйте *=value, type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 @@ -2267,35 +2301,27 @@ msgstr "Ошибка связи с сервером." -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54 -#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 -msgid "Add" -msgstr "Добавить" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45 -msgid "Change" -msgstr "Изменить" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96 +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 +#, fuzzy, java-format +msgid "Add {0} {1}" +msgstr "Удалить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 +#, fuzzy, java-format +msgid "Change {0} {1}" +msgstr "Изменить {0} объект" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 #, java-format msgid "Remove \"{0}\" for {1} ''{2}''" msgstr "Удалить \"{0}\" для {1} ''{2}''" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 #, java-format msgid "Set {0}={1} for {2} ''{3}''" msgstr "Установить {0}={1} для {2} ''{3}''" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 @@ -2306,19 +2332,26 @@ msgstr[2] "объектов" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 #, java-format msgid "Remove \"{0}\" for {1} {2}" msgstr "Удалить \"{0}\" для {1} {2}" -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 #, java-format msgid "Set {0}={1} for {2} {3}" msgstr "Установить {0}={1} для {2} {3}" -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69 -msgid "ChangeRelationMemberRole" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 +#, fuzzy, java-format +msgid "ChangeRelationMemberRole {0} {1}" +msgstr "Изменить роль участника отношений" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2326,25 +2359,25 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81 +msgstr "не могу устранить нерешенный конфликт" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 #, java-format msgid "Delete {1} {0}" msgstr "Удалить {1} {0}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 #, java-format msgid "Delete {0} {1}" msgstr "Удалить {0} {1}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 msgid "Conflicting relation" msgstr "Конфликтующее отношение" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 #, java-format msgid "" @@ -2355,11 +2388,11 @@ "Удалить из отношения?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 msgid "Delete from relation" msgstr "Удалить из связи" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 #, java-format msgid "" @@ -2370,10 +2403,10 @@ "Удалить из отношения?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 msgid "Split way segment" msgstr "Разделить сегмент линии" #. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2385,20 +2418,20 @@ "использовать их.
Вы действительно хотите удалить их?" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Разрешить конфликт при удалении {0}" -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 msgid "Move" msgstr "Переместить" -#: ../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:134 +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 msgid "node" @@ -2410,10 +2443,10 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 msgid "Purging 1 primitive" -msgstr "" +msgstr "Очистка 1 примитива" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 #, java-format msgid "removing reference from way {0}" -msgstr "" +msgstr "удаление ссылки из линии {0}" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 @@ -2423,45 +2456,53 @@ "{1}" msgstr "" +"Внимание: Удаление линии {0}, так как количество точек стало меньше 2. " +"Текущее значение {1}" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 +#, java-format +msgid "removing reference from relation {0}" +msgstr "удаление ссылки из связи {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +msgstr "Устранить конфликты в списке участников отношения {0}" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 #, fuzzy, java-format -msgid "removing reference from relation {0}" -msgstr "Удалить Элементы из Отношений" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -msgid "RemoveRelationMember" +msgid "RemoveRelationMember {0} {1}" msgstr "Удалить Участника Отношения" -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 -msgid "Rotate" -msgstr "Вращать" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#, fuzzy, java-format +msgid "Rotate {0} {1}" +msgstr "Удалить {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 msgid "Sequence" msgstr "Последовательность" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69 +msgstr "Устранить конфликты тега {0} в {1}{2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 #, java-format msgid "Undelete {0} primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 +msgstr "Отменить удаление {0} примитивов" + +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 #, java-format msgid "Resolve version conflicts for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +msgstr "Устранить конфликты версии для {0}{1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format msgid "Resolve conflicts in node list of of way {0}" +msgstr "Устранить конфликты в списке точек линии {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +msgid "Main.ds doesn't include node {0}" msgstr "" @@ -2559,25 +2600,51 @@ msgstr "Невозможно скачать параметры с сервера." -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#, java-format +msgid "parameter ''{0}'' must not be null" +msgstr "параметр ''{0}'' не должен быть null" + +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 msgid "Decimal Degrees" msgstr "Десятичные градусы" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32 msgid "Degrees Minutes Seconds" msgstr "Градусы, минуты, секунды" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 msgid "S" msgstr "Ю" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62 msgid "N" msgstr "С" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "W" msgstr "З" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "E" msgstr "В" @@ -2586,7 +2653,7 @@ #, java-format msgid "parameter {0} > 0 required. Got {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130 +msgstr "параметр {0} должен быть > 0. Текущее значение {1}." + +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128 @@ -2611,5 +2678,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483 msgid "way" @@ -2621,5 +2688,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 msgid "ways" -msgstr "" +msgstr "линии" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 @@ -2640,19 +2707,19 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "changeset" -msgstr "" +msgstr "набор изменений" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "changesets" -msgstr "" +msgstr "наборы изменений" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "" +msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" -msgstr "" +msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118 @@ -2697,5 +2764,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162 msgid "There's no version valid at date ''{0}'' in this history" -msgstr "" +msgstr "Нет версии действительной для даты \"{0}\" в этой истории" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 @@ -2712,17 +2779,13 @@ msgstr "более поздняя версия не найдена. История пуста." -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 msgid "Didn't find an primitive with id {0} in this dataset" msgstr "Примитив с id {0} не был найден в этом наборе данных" -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36 msgid "Didn't find an primitive with id {0} and version {1} in this dataset" msgstr "Примитив с id {0} и версией {1} не был найден в этом наборе данных" -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46 -msgid "Didn't find an historized primitive with id {0} in this dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33 #, java-format @@ -2730,16 +2793,5 @@ 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 "параметр ''{0}'' не должен быть null" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102 +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''" @@ -2751,127 +2803,127 @@ msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 msgid "Area style way is not closed." msgstr "Путь, обозначающий границу области, не закрыт." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "многополигональная линия ''{0}'' не замкнута" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787 msgid "Empty member in relation." msgstr "В отношении имеется пустой член." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В отношении «{0}» имеется член, который был удален." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Путь «{0}» имеет меньше двух точек." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560 msgid "More than one \"from\" way found." msgstr "Найден больше чем один \"from\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 msgid "More than one \"to\" way found." msgstr "Найден больше чем один \"to\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 msgid "More than one \"via\" found." msgstr "Найден больше чем один \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестная роль «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестный тип членства для «{0}»." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 msgid "No \"from\" way found." msgstr "Не найден путь \"from\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"to\" way found." msgstr "Не найден путь \"to\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"via\" node or way found." msgstr "Не найдена \"via\" точка или путь" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753 #, java-format msgid "Style for restriction {0} not found." msgstr "Стиль для ограничения {0} не найден." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Нет полезного значения ''{0}'' для пути ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "не-линия ''{0}'' в мультиполигональном отношении" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Для мультиполигона «{0}» отсутствует внешний путь." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Внутренний путь «{0}» находится снаружи." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Стиль для внешней границы ''{0}'' отсутствует." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239 msgid "untagged" msgstr "без тэга" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240 msgid "text" msgstr "текст" @@ -2879,5 +2931,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234 #, java-format msgid "" @@ -2886,4 +2938,7 @@ "Keeping my primitive. " msgstr "" +"Мой примитив с id {0} и версией {1} видим, хотя их примитив с более низкой " +"версией {2} невидим. Не могут справиться с этой непоследовательности. " +"Сохраняю мой примитив. " #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 @@ -2905,6 +2960,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 msgid "background" msgstr "фон" @@ -2914,24 +2969,9 @@ msgstr "подсветка" -#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23 -msgid "EPSG:4326" -msgstr "EPSG:4326" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#, java-format -msgid "" -"The projection \"{0}\" is designed for\n" -"latitudes between 46.1° and 57° only.\n" -"Use another projection system if you are not using\n" -"a French WMS server.\n" -"Do not upload any data after this message." -msgstr "" -"Проекция \"{0}\" разработана только\n" -"для широт между 46.1° и 57°.\n" -"Используйте другую проекцию, если не пользуетесь\n" -"французским сервером WMS. Не загружайте \n" -"никаких данных на сервер после этого сообщения." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126 +#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 +msgid "WGS84 Geographisch" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2947,36 +2987,24 @@ "и начните новый слой в новой зоне." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 msgid "Lambert Zone (France)" msgstr "Зоны Ламберта (Франция)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98 msgid "Lambert Zone (Estonia)" msgstr "Lambert Зона (Эстония)" -#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36 +#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38 msgid "Mercator" msgstr "Проекция Меркатора" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45 -#, java-format -msgid "" -"The projection \"{0}\" is designed for\n" -"latitudes between 45.7° and 47.9°\n" -"and longitutes between 5.7° and 10.6° only.\n" -"Use another projection system if you are not working\n" -"on a data set of Switzerland or Liechtenstein.\n" -"Do not upload any data after this message." -msgstr "" -"Проекция \"{0}\" разработана только для\n" -"широт между 45.7° и 47.9° и долгот между 5.7° и 10.6°.\n" -"Если Вы не работаете над данными,\n" -"относящимися к Швейцарии либо Лихтенштену, \n" -"воспользуйтесь другой системой проекции .\n" -"Не делайте выгрузку данных после данного сообщения." - -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138 +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92 msgid "Swiss Grid (Switzerland)" msgstr "Швейцарская проекция" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339 +#, fuzzy, java-format +msgid "UTM Zone {0}" +msgstr "Переместить {0}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 @@ -2988,14 +3016,14 @@ msgstr "Невозможно записать закладки" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 msgid "Message of the day not available" msgstr "Сообщение дня недоступно" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 #, java-format msgid "- running version is {0}" msgstr "- сейчас запущена версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 msgid "Downloading \"Message of the day\"" msgstr "Загружается \"Сообщение дня\"" @@ -3190,5 +3218,4 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 #, java-format msgid "Menu: {0}" @@ -3250,5 +3277,5 @@ msgstr "Уменьшить масштаб" -#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47 +#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44 msgid "scale" msgstr "масштаб" @@ -3282,8 +3309,13 @@ msgstr "(нет объекта)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 msgid "layer not in list." msgstr "слоя нет в списке." + +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 +#, java-format +msgid "Layer {0} must be in list of layers" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 @@ -3291,9 +3323,9 @@ msgstr "Соединение с OSM сервером..." -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 msgid "Error while parsing" msgstr "Ошибка разбора" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 msgid "File not found" msgstr "Файл не найден" @@ -3344,5 +3376,5 @@ #, java-format msgid "role {0} is not participating in compare pair {1}" -msgstr "" +msgstr "роль {0} не участвует в паре сравнения {1}" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 @@ -3353,4 +3385,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 @@ -3360,4 +3393,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Точки" @@ -3365,5 +3400,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Участники" @@ -3371,5 +3407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 msgid "No pending tag conflicts to be resolved" -msgstr "" +msgstr "Нет неразрешённых конфликтов тегов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 @@ -3381,5 +3417,5 @@ #, java-format msgid "{0} pending tag conflicts to be resolved" -msgstr "" +msgstr "{0} неразрешённых конфликтов тегов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 @@ -3391,16 +3427,18 @@ "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +"Сведённый список узлов заморожен. Нет неразрешённых конфликтов в списке " +"узлов этого пути" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 msgid "Nodes(with conflicts)" -msgstr "" +msgstr "Узлы(с конфликтами)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 msgid "Pending conflicts in the node list of this way" -msgstr "" +msgstr "Неустранённые конфликты в списке узлов этого пути" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 msgid "Members(resolved)" -msgstr "" +msgstr "Члены(разрешённые)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 @@ -3412,9 +3450,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 msgid "Members(with conflicts)" -msgstr "" +msgstr "Участники отношений(с конфликтами)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 msgid "Pending conflicts in the member list of this relation" -msgstr "" +msgstr "Неразрешённые конфликты в списке участников этого отношения" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 @@ -3424,5 +3462,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 msgid "Properties(with conflicts)" -msgstr "" +msgstr "Свойства (с конфликтами)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 @@ -3432,5 +3470,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 msgid "Conflict Resolution" -msgstr "" +msgstr "Разрешение конфликтов" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 @@ -3449,10 +3487,10 @@ #, java-format msgid "unexpected value of parameter \"index\". Got {0}" -msgstr "" +msgstr "недопустимое значение параметра \"index\". Текущее значение {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 #, java-format msgid "item {0} not found in list" -msgstr "" +msgstr "пункт {0} не найден в списке" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 @@ -3462,14 +3500,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 msgid "Compare " -msgstr "" +msgstr "Сравнить " #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 msgid "My version" -msgstr "" +msgstr "Моя версия" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 msgid "List of elements in my dataset, i.e. the local dataset" -msgstr "" +msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 @@ -3488,5 +3526,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 msgid "Their version" -msgstr "" +msgstr "Их версия" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 @@ -3496,5 +3534,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 msgid "> top" -msgstr "" +msgstr "> наверх" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 @@ -3504,5 +3542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 msgid "> bottom" -msgstr "" +msgstr "> вниз" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438 @@ -3544,22 +3582,22 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 msgid "Up" -msgstr "" +msgstr "Вверх" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 msgid "Move up the selected elements by one position" -msgstr "" +msgstr "Поднять выделенные элементы на одну позицию" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 msgid "Down" -msgstr "" +msgstr "Вниз" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 msgid "Move down the selected entries by one position" -msgstr "" +msgstr "Опустить выделенные элементы на одну позицию" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3573,5 +3611,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 msgid "Freeze" -msgstr "" +msgstr "Зафиксировать" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728 @@ -3639,9 +3677,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 msgid "parameter '{0}' must not be null" -msgstr "" +msgstr "параметр '{0}' не должен быть null" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 #, java-format msgid "" @@ -3651,4 +3693,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 #, java-format msgid "adjustable {0} not registered yet" @@ -3657,5 +3700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 msgid "Node" -msgstr "" +msgstr "Узел" #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 @@ -3670,14 +3713,15 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 -#, fuzzy, java-format +#, java-format msgid "" "An error occurred while communicating with the server
Details: {0}" -msgstr "Ошибка связи с сервером." +msgstr "" +"Произошла ошибка во время соединения с сервером
Подробности: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 -#, fuzzy msgid "Communication with server failed" -msgstr "Ошибка связи с сервером." +msgstr "Связь с сервером прервана" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 @@ -3736,5 +3780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 msgid "Coordinates:" -msgstr "" +msgstr "Координаты:" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 @@ -3763,17 +3807,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 -#, fuzzy msgid "visible (on the server)" -msgstr "Примитив удаляется на сервере" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 -#, fuzzy msgid "not visible (on the server)" -msgstr "Примитив удаляется на сервере" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 -#, fuzzy msgid "Keep a clone of the local version" -msgstr "Пожалуйста, введите название места." +msgstr "Оставить клон локальной версии" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 @@ -3799,5 +3840,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 msgid "Keep their deleted state" -msgstr "" +msgstr "Оставить их состояние \"Удалён\"" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 @@ -3810,13 +3851,11 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 -#, fuzzy msgid "Yes, reset the id" -msgstr "Да, восстановить их тоже" +msgstr "Да, сбросить id" #: ../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 "Без даты" +msgstr "Нет, прервать" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 @@ -3830,5 +3869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 msgid "Reset id to 0" -msgstr "" +msgstr "Сбросить в 0" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608 @@ -3848,7 +3887,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633 -#, fuzzy msgid "Remove from dataset" -msgstr "убрать из выделения" +msgstr "Удалить из набора данных" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 @@ -3859,11 +3897,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" msgstr "Роль" #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25 msgid "Primitive" -msgstr "" +msgstr "Примитив" #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 @@ -3879,6 +3919,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51 msgid "" -msgstr "" +msgstr "<не определено>" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 @@ -3900,8 +3942,8 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 #: ../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 @@ -3912,7 +3954,8 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3942,5 +3985,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 msgid ">" -msgstr "" +msgstr ">" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 @@ -3968,5 +4011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66 msgid "Command Stack" msgstr "Список изменений" @@ -3977,6 +4020,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../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/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 @@ -3987,5 +4030,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 @@ -3994,10 +4037,27 @@ msgstr "Показать/Скрыть: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64 #, java-format msgid "Command Stack: {0}" msgstr "Стек команд: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +msgid "Conflict" +msgstr "Конфликт" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 +msgid "Merging conflicts." +msgstr "Разрешение конфликтов." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 +msgid "Resolve" +msgstr "Разрешить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +msgid "Open a merge dialog of all selected items in the list above." +msgstr "Открыть диалоговое окно для слияния выбранных объектов." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 @@ -4006,26 +4066,4 @@ msgstr "Выбрать на карте объекты, выбранные в списке вверху." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 -msgid "Resolve" -msgstr "Разрешить" - -#: ../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:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70 -msgid "Conflict" -msgstr "Конфликт" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69 -msgid "Merging conflicts." -msgstr "Разрешение конфликтов." - -#: ../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:130 msgid "Resolve conflicts" @@ -4061,44 +4099,48 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 -msgid "Click Reload to refresh list" -msgstr "Нажмите \"Обновить\" для обновления списка" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 msgid "History" msgstr "Журнал" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 msgid "Display the history of all selected items." msgstr "Отобразить журнал по всем выделенным объектам." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103 -msgid "Object" -msgstr "Объект" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103 -msgid "Date" -msgstr "Дата" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252 +#, java-format +msgid "Failed to load history from the server. Details:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#, java-format +msgid "index out of bounds Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +msgid "History item" +msgstr "Пункт истории" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +msgid "Load history" +msgstr "Загрузить историю" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#, java-format +msgid "Loading history for {0} with id {1}" +msgstr "Загрузка истории для {0} с id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 msgid "Reload all currently selected objects and refresh the list." msgstr "Перегрузить все выбранные объекты, и обновить список." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135 -msgid "Revert" -msgstr "Откатить" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136 -msgid "" -"Revert the state of all currently selected objects to the version selected " -"in the history list." -msgstr "" -"Откатить состояние выбранных объектов до версии, указанной в списке правок." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181 -msgid "Not implemented yet." -msgstr "Ещё не реализовано." +#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +msgid "Show" +msgstr "Показать" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +msgid "Display the history of the selected primitive" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 @@ -4233,4 +4275,18 @@ msgid "Add Properties" msgstr "Добавить параметры" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +msgid "Add" +msgstr "Добавить" #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612 @@ -4345,9 +4401,9 @@ msgstr "Выбор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160 msgid "Undock the panel" msgstr "Отсоединить панель" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4356,5 +4412,5 @@ "панели." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 msgid "Click to minimize/maximize the panel content" msgstr "Щёлкните для уменьшения/увеличения содержимого панели" @@ -4384,179 +4440,102 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72 msgid "Apply Changes" msgstr "Применить изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147 msgid "Basic" msgstr "Основной" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193 msgid "Occupied By" msgstr "Объект" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193 msgid "linked" msgstr "присоединенный" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232 msgid "Tags (empty value deletes tag)" msgstr "Тэги (пустое значение удаляет тэг)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271 msgid "Move Up" msgstr "Переместить вверх" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271 msgid "Move the currently selected members up" msgstr "Переместить выбранных членов отношения вверх" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277 msgid "Add Selected" msgstr "Добавить выбранное" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278 msgid "Add all currently selected objects as members" msgstr "Сделать все выбранные объекты участниками отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284 msgid "Remove Selected" msgstr "Удалить выбранные" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285 msgid "Remove all currently selected objects from relation" msgstr "Удалить все выделенные объекты из связей" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 +#, fuzzy +msgid "Sort" +msgstr "Спорт" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#, fuzzy +msgid "Sort the selected relation members or the whole list" +msgstr "Удалить источник из списка." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Move Down" msgstr "Переместить вниз" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Move the currently selected members down" msgstr "Переместить выбранных членов отношения вниз" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305 msgid "Remove the member in the current table row from this relation" msgstr "Удалить текущего участника из отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319 msgid "Download all incomplete ways and nodes in relation" msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" -#. end of section to determine linkedness. -#. item "Streets/Road Restrictions" combo "Access" -#. item "Streets/Road Restrictions" combo "Bicycle" -#. item "Streets/Road Restrictions" combo "Foot" -#. item "Streets/Road Restrictions" combo "Goods" -#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" -#. item "Streets/Road Restrictions" combo "Horse" -#. item "Streets/Road Restrictions" combo "Motorcycle" -#. item "Streets/Road Restrictions" combo "Motorcar" -#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)" -#. item "Streets/Road Restrictions" combo "Motorboat" -#. item "Streets/Road Restrictions" combo "Boat" -#. item "Ways/Track" combo "Access" -#. item "Ways/Track" combo "Motorcycle" -#. item "Ways/Track" combo "Motorcar" -#. item "Ways/Track Grade 1" combo "Access" -#. item "Ways/Track Grade 1" combo "Motorcycle" -#. item "Ways/Track Grade 1" combo "Motorcar" -#. item "Ways/Track Grade 2" combo "Access" -#. item "Ways/Track Grade 2" combo "Motorcycle" -#. item "Ways/Track Grade 2" combo "Motorcar" -#. item "Ways/Track Grade 3" combo "Access" -#. item "Ways/Track Grade 3" combo "Motorcycle" -#. item "Ways/Track Grade 3" combo "Motorcar" -#. item "Ways/Track Grade 4" combo "Access" -#. item "Ways/Track Grade 4" combo "Motorcycle" -#. item "Ways/Track Grade 4" combo "Motorcar" -#. item "Ways/Track Grade 5" combo "Access" -#. item "Ways/Track Grade 5" combo "Motorcycle" -#. item "Ways/Track Grade 5" combo "Motorcar" -#. item "Ways/Path" combo "Motorcar" -#. item "Ways/Path" combo "Snowmobile" -#. item "Ways/Path" combo "Horse" -#. item "Ways/Path" combo "Bicycle" -#. item "Ways/Path" combo "Ski" -#. item "Ways/Path" combo "Foot" -#. item "Car/Parking" combo "Spaces for Disabled" -#. item "Amenities/Toilets" combo "Fee" -#. item "Health/Pharmacy" combo "Dispensing" -#: ../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 -#: build/trans_presets.java:316 build/trans_presets.java:317 -#: build/trans_presets.java:318 build/trans_presets.java:319 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:516 -#: build/trans_presets.java:517 build/trans_presets.java:518 -#: build/trans_presets.java:537 build/trans_presets.java:538 -#: build/trans_presets.java:539 build/trans_presets.java:558 -#: build/trans_presets.java:559 build/trans_presets.java:560 -#: build/trans_presets.java:579 build/trans_presets.java:580 -#: build/trans_presets.java:581 build/trans_presets.java:600 -#: build/trans_presets.java:601 build/trans_presets.java:602 -#: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_presets.java:636 -#: build/trans_presets.java:637 build/trans_presets.java:638 -#: build/trans_presets.java:639 build/trans_presets.java:640 -#: build/trans_presets.java:641 build/trans_presets.java:1368 -#: build/trans_presets.java:2309 build/trans_presets.java:2573 -msgid "yes" -msgstr "да" - -#: ../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 -#: build/trans_presets.java:316 build/trans_presets.java:317 -#: build/trans_presets.java:318 build/trans_presets.java:319 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:516 -#: build/trans_presets.java:517 build/trans_presets.java:518 -#: build/trans_presets.java:537 build/trans_presets.java:538 -#: build/trans_presets.java:539 build/trans_presets.java:558 -#: build/trans_presets.java:559 build/trans_presets.java:560 -#: build/trans_presets.java:579 build/trans_presets.java:580 -#: build/trans_presets.java:581 build/trans_presets.java:600 -#: build/trans_presets.java:601 build/trans_presets.java:602 -#: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_presets.java:636 -#: build/trans_presets.java:637 build/trans_presets.java:638 -#: build/trans_presets.java:639 build/trans_presets.java:640 -#: build/trans_presets.java:641 build/trans_presets.java:758 -#: build/trans_presets.java:773 build/trans_presets.java:1306 -#: build/trans_presets.java:1368 build/trans_presets.java:2309 -#: build/trans_presets.java:2573 -msgid "no" -msgstr "нет" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424 -#, java-format -msgid "Members: {0}" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 +#, fuzzy, java-format +msgid "Members: {0} (linked: {1})" msgstr "Участники: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "Relation Editor: {0}" msgstr "Редактор отношений: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 msgid "There were conflicts during import." msgstr "При импортировании возникли конфликтные ситуации." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762 msgid "Error parsing server response." msgstr "Ошибка при разборе ответа от сервера." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765 msgid "Cannot connect to server." msgstr "Невозможно связаться с сервером." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "Error when communicating with server." msgstr "" @@ -4591,21 +4570,21 @@ msgstr "Сначала выберите закладку." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "min lat" msgstr "мин. широта" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112 msgid "min lon" msgstr "мин. долгота" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114 msgid "max lat" msgstr "макс. широта" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116 msgid "max lon" msgstr "макс. долгота" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -4615,5 +4594,5 @@ "область)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131 msgid "Bounding Box" msgstr "Рамка" @@ -4764,696 +4743,41 @@ msgstr "Номера квадратов" -#: ../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:284 -msgid "Read GPX..." -msgstr "Прочесть GPX" - -#: ../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: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:306 -msgid "No images with readable timestamps found." -msgstr "Не найдено изображений с информацией о времени." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136 -#, java-format -msgid "Reading {0}..." -msgstr "Чтение {0}..." - -#: ../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:562 -#, java-format -msgid "GPS start: {0}" -msgstr "Начало GPS: {0}" - -#: ../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:565 -#, java-format -msgid "current delta: {0}s" -msgstr "текущая разница: {0} с." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 -msgid "timezone difference: " -msgstr "разница в часовых поясах: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278 -msgid "image" -msgid_plural "images" -msgstr[0] "изображение" -msgstr[1] "изображения" -msgstr[2] "изображений" - -#: ../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:648 -msgid "Sync clock" -msgstr "Синхронизация часов" - -#: ../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 -msgid "JPEG images (*.jpg)" -msgstr "Изображения JPEG (*.jpg)" - -#: ../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: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:715 -msgid "Image" -msgstr "Изображение" - -#: ../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:720 -msgid "GPS unit timezone (difference to photo)" -msgstr "Часовой пояс GPS объекта (отличается от фотографии)" - -#: ../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:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 -msgid "Time entered could not be parsed." -msgstr "Введённое время невозможно использовать" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 -msgid "gps point" -msgstr "точка GPS" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 -msgid "Customize line drawing" -msgstr "Настроить отрисовку линий" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 -msgid "Use global settings." -msgstr "Использовать глобальные настройки." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 -msgid "Draw lines between points for this layer." -msgstr "Отображать линии между точками для этого слоя." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 -msgid "Do not draw lines between points for this layer." -msgstr "Не отображать линии между точками для этого слоя." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 -msgid "Select line drawing options" -msgstr "Выбрать варианты отрисовки линий" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 -msgid "Customize Color" -msgstr "Выбрать цвет" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -msgid "Default" -msgstr "По умолчанию" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/grid/src/grid/GridLayer.java:163 -msgid "Choose a color" -msgstr "Выбор цвета" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 -msgid "Markers From Named Points" -msgstr "Маркеры из именованых точек" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 -#, java-format -msgid "Named Trackpoints from {0}" -msgstr "Назвать маршрутные точки из {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 -msgid "Import Audio" -msgstr "Импортировать аудиофайлы" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 -msgid "Wave Audio files (*.wav)" -msgstr "Аудиофайлы Wave (*.wav)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 -#, java-format -msgid "Audio markers from {0}" -msgstr "Аудиомаркеры из {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 -msgid "Import images" -msgstr "Импорт изображений" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 -#, java-format -msgid "{0} track, " -msgid_plural "{0} tracks, " -msgstr[0] "{0} дорожка, " -msgstr[1] "{0} дорожки, " -msgstr[2] "{0} дорожек, " - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 -#, java-format -msgid "{0} route, " -msgid_plural "{0} routes, " -msgstr[0] "{0} маршрут, " -msgstr[1] "{0} маршрута, " -msgstr[2] "{0} маршрутов, " - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 -#, java-format -msgid "{0} waypoint" -msgid_plural "{0} waypoints" -msgstr[0] "{0} путевая точка" -msgstr[1] "{0} путевые точки" -msgstr[2] "{0} путевых точек" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 -#, java-format -msgid "Name: {0}" -msgstr "Название: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#, java-format -msgid "Description: {0}" -msgstr "Описание: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 -msgid "Timespan: " -msgstr "Временной интервал: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 -msgid "Length: " -msgstr "Длина: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 -msgid "Convert to data layer" -msgstr "Преобразовать в слой данных" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 -msgid "" -"Upload of unprocessed GPS data as map data is considered harmful." -"
If you want to upload traces, look here:" -msgstr "" -"Загрузка на карту необработанных данных GPS считается вредоносной." -"
Если хотите загрузить трэк, сделайте это по ссылке:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 -msgid "http://www.openstreetmap.org/traces" -msgstr "http://www.openstreetmap.org/traces" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698 -#: ../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 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 -#, java-format -msgid "Converted from: {0}" -msgstr "Преобразовано из: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 -msgid "Download from OSM along this track" -msgstr "Скачать с JSM данные вдоль трэка" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 -msgid "Download everything within:" -msgstr "Скачать всё в пределах:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724 -#, java-format -msgid "{0} meters" -msgstr "{0} метров" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727 -msgid "Maximum area per request:" -msgstr "Максимальная область для одного запроса:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730 -#, java-format -msgid "{0} sq km" -msgstr "{0} кв. км." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 -#, java-format -msgid "" -"This action will require {0} individual
download requests. Do you " -"wish
to continue?" -msgstr "" -"Это действие потребует {0} отдельных
запросов на скачивание. " -"Продолжить?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896 -msgid "No GPX track available in layer to associate audio with." -msgstr "На слое отсутствует трек GPX, чтобы наложить звук." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043 -msgid "" -"Some waypoints with timestamps from before the start of the track or after " -"the end were omitted or moved to the start." -msgstr "" -"Некоторые маршрутные точки созданы до начала трека или после его окончания и " -"будут пропущены или перенесены в начало трека." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047 -msgid "" -"Some waypoints which were too far from the track to sensibly estimate their " -"time were omitted." -msgstr "" -"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать " -"их время, были проигнорированы." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148 -msgid "outside downloaded area" -msgstr "вне области для скачивания" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226 -#, java-format -msgid "version {0}" -msgstr "версия {0}" - -#: ../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:277 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../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:389 -#, java-format -msgid " ({0} deleted.)" -msgstr " ({0} удалено)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 -msgid "unset" -msgstr "отключено" - -#: ../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:489 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 -msgid "Convert to GPX layer" -msgstr "Преобразовать в слой GPX" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 -#: build/trans_presets.java:1837 build/trans_presets.java:1843 -#: build/trans_presets.java:1849 build/trans_presets.java:1855 -#: build/trans_presets.java:1861 build/trans_presets.java:1867 -#: build/trans_presets.java:1873 build/trans_presets.java:1879 -#: build/trans_presets.java:1885 build/trans_presets.java:1891 -#: build/trans_presets.java:1897 build/trans_presets.java:1903 -#: build/trans_presets.java:1909 build/trans_presets.java:1915 -#: build/trans_presets.java:1921 build/trans_presets.java:1930 -#: build/trans_presets.java:1937 build/trans_presets.java:1945 -#: build/trans_presets.java:1951 build/trans_presets.java:1957 -#: build/trans_presets.java:1963 build/trans_presets.java:1969 -#: build/trans_presets.java:1975 build/trans_presets.java:1981 -#: build/trans_presets.java:1987 build/trans_presets.java:1993 -#: build/trans_presets.java:1999 build/trans_presets.java:2005 -#: build/trans_presets.java:2011 build/trans_presets.java:2017 -#: build/trans_presets.java:2023 build/trans_presets.java:2029 -#: build/trans_presets.java:2035 build/trans_presets.java:2041 -msgid "track" -msgid_plural "tracks" -msgstr[0] "трек" -msgstr[1] "треки" -msgstr[2] "треков" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 -msgid "point" -msgid_plural "points" -msgstr[0] "точка" -msgstr[1] "точки" -msgstr[2] "точек" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 -#, java-format -msgid "a track with {0} point" -msgid_plural "a track with {0} points" -msgstr[0] "трек с {0} точкой" -msgstr[1] "трек с {0} точками" -msgstr[2] "трек с {0} точками" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 -#, java-format -msgid "{0} consists of {1} track" -msgid_plural "{0} consists of {1} tracks" -msgstr[0] "{0} состоит из {1} трека" -msgstr[1] "{0} состоит из {1} треков" -msgstr[2] "{0} состоит из {1} треков" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 -#, java-format -msgid "{0} point" -msgid_plural "{0} points" -msgstr[0] "{0} точка" -msgstr[1] "{0} точки" -msgstr[2] "{0} точек" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151 -msgid "gps marker" -msgstr "маркер GPS" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172 -msgid "marker" -msgid_plural "markers" -msgstr[0] "маркер" -msgstr[1] "маркера" -msgstr[2] "маркеров" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 -#, java-format -msgid "{0} consists of {1} marker" -msgid_plural "{0} consists of {1} markers" -msgstr[0] "{0} состоит из {1} маркера" -msgstr[1] "{0} состоит из {1} маркеров" -msgstr[2] "{0} состоит из {1} маркеров" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 -msgid "Synchronize Audio" -msgstr "Синхронизировать аудио" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 -msgid "" -"You need to pause audio at the moment when you hear your synchronization cue." -msgstr "" -"Вам необходимо приостановить звуковой файл в момент воспроизведения реплик." - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 -#, java-format -msgid "Audio synchronized at point {0}." -msgstr "Аудио синхронизировано на точке {0}." - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232 -msgid "Unable to synchronize in layer being played." -msgstr "Невозможно синхронизировать слой который используется" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 -msgid "Make Audio Marker at Play Head" -msgstr "Установить маркер аудио на позиции проигрывания" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 -msgid "" -"You need to have paused audio at the point on the track where you want the " -"marker." -msgstr "" -"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить " -"маркер." - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 -msgid "No existing audio markers in this layer to offset from." -msgstr "Нет существующих аудио маркеров на этом слое" - -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166 -msgid "" -"You need to drag the play head near to the GPX track whose associated sound " -"track you were playing (after the first marker)." -msgstr "" -"Вам необходимо перетащить значёк играющей головы рядом с от GPX трэком с " -"которым связана звуковая дорожка (после первого маркера)." - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214 -msgid "" -"You need to SHIFT-drag the play head onto an audio marker or onto the track " -"point where you want to synchronize." -msgstr "" -"Нужно удерживать Shift и перетащить значек играющей головы на аудио маркера " -"или на точку трека, где вы хотите синхронизировать." - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224 -msgid "Unable to create new audio marker." -msgstr "Невозможно создать новый аудио-маркер." - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 -msgid "There was an error while trying to display the URL for this marker" -msgstr "Произошла ошибка при попытке показать URL для этого маркера" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 -msgid "(URL was: " -msgstr "(по ссылке: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 -msgid "Error displaying URL" -msgstr "Невозможно отобразить URL" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43 -msgid "Advanced Preferences" -msgstr "Дополнительные параметры" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44 -msgid "Setting Preference entries directly. Use with caution!" -msgstr "Установка параметров напрямую. Пользоваться с осторожностью!" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 -msgid "Search: " -msgstr "Поиск: " - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83 -msgid "Current value is default." -msgstr "Текущее значение - по умолчанию" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85 -#, java-format -msgid "Default value is ''{0}''." -msgstr "Текущее значение - ''{0}''." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88 -msgid "Default value currently unknown (setting has not been used yet)." -msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 -msgid "Please select the row to edit." -msgstr "Пожалуйста, выберите ряд для редактирования." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 -#, java-format -msgid "New value for {0}" -msgstr "Новое значение для {0}" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80 -#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 -msgid "Please select the row to delete." -msgstr "Пожалуйста, выберите ряд для удаления." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 -msgid "Enter a new key/value pair" -msgstr "Введите новый ключ и значение" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26 -msgid "Display the Audio menu." -msgstr "Показать меню Аудио." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27 -msgid "Label audio (and image and web) markers." -msgstr "Подписывать маркеры аудио, картинок и веба." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28 -msgid "Display live audio trace." -msgstr "Показать звуковые подсказки в реальном времени" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29 -msgid "Create non-audio markers when reading GPX." -msgstr "Создать не звуковые маркеры при обработке GPX данных" - -#. various methods of making markers on import audio -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32 -msgid "Explicit waypoints with valid timestamps." -msgstr "Точные маршрутные точки с правильными временными метками" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33 -msgid "Explicit waypoints with time estimated from track position." -msgstr "Точные маршрутные точки с приблизительным временем из позиции на треке" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34 -msgid "Named trackpoints." -msgstr "Именованые точки пути." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35 -msgid "Modified times (time stamps) of audio files." -msgstr "Изменить время (метку времени) звукового файла" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 -msgid "Start of track (will always do this if no other markers available)." -msgstr "Начать трек (всегда делать это, если другие метки недоступны)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46 -msgid "Show or hide the audio menu entry on the main menu bar." -msgstr "Отобразить или спрятать меню работы со звуком на панели Главного меню" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51 -msgid "" -"Display a moving icon representing the point on the synchronized track where " -"the audio currently playing was recorded." -msgstr "" -"Показать анимированную иконку в точке трека, где был записан проигрываемый в " -"данный момент звук." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56 -msgid "" -"Put text labels against audio (and image and web) markers as well as their " -"button icons." -msgstr "" -"Поставьте текстовую надпись напротив аудио (и изображения и веб-сайта) " -"маркеров, а также их кнопок." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61 -msgid "" -"Automatically make a marker layer from any waypoints when opening a GPX " -"layer." -msgstr "" -"Автоматически создавать слой меток из маршрутных точек при открытии GPX слоя" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64 -msgid "When importing audio, make markers from..." -msgstr "Когда импортируется звук, применять метки из..." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73 -msgid "When importing audio, apply it to any waypoints in the GPX layer." -msgstr "" -"Когда импортируется звук, применять его для любых маршрутных точек из слоя " -"GPX." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88 -msgid "" -"Automatically create audio markers from trackpoints (rather than explicit " -"waypoints) with names or descriptions." -msgstr "" -"Автоматически создавать звуковые метки из узлов трека (вместо точных " -"маршрутных точек) с именами или описаниями" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83 -msgid "" -"Create audio markers at the position on the track corresponding to the " -"modified time of each audio WAV file imported." -msgstr "" -"Создать звуковые метки в положении на треке, соответствующем времени " -"изменения каждого импортированного звукового файла WAV." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92 -msgid "" -"The number of seconds to jump forward or back when the relevant button is " -"pressed" -msgstr "" -"Показывает, на сколько секунд вперёд или назад нужно перейти при нажатии " -"соответствующей кнопки" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93 -msgid "Forward/back time (seconds)" -msgstr "Время перемотки (секунд)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97 -msgid "The amount by which the speed is multiplied for fast forwarding" -msgstr "" -"Показывает, во сколько раз увеличивается скорость при быстром проигрывании" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98 -msgid "Fast forward multiplier" -msgstr "Множитель быстрого проигрывания" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102 -msgid "" -"Playback starts this number of seconds before (or after, if negative) the " -"audio track position requested" -msgstr "" -"Воспроизведение начнется через это количество секунд до (или после, в случае " -"отрицательного) звуковой дорожки у запрошенной позиции" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103 -msgid "Lead-in time (seconds)" -msgstr "Продолжительность вступления (в секундах)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107 -msgid "The ratio of voice recorder elapsed time to true elapsed time" -msgstr "" -"Соотношение времени диктофонной записи соответствует прошедшему времени" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108 -msgid "Voice recorder calibration" -msgstr "Калибровка звукозаписи" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63 -msgid "Color" -msgstr "Цвет" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37 +#, java-format +msgid "History for {0} {1}" +msgstr "История для {0}{1}" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +msgid "Close the dialog" +msgstr "Закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179 +msgid "history not initialized yet. Failed to set reference primitive." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200 +#, java-format +msgid "failed to set reference. reference id {0} doesn't match history id {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184 +#, java-format +msgid "failed to set reference. reference version {0} not available in history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198 +msgid "history not initialized yet. Failed to set current primitive." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203 +#, java-format +msgid "failed to set current. current version {0} not available in history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#, java-format +msgid "Node {0}" +msgstr "Узел {0}" #. item "Streets/Motorway" text "Reference" @@ -6163,5 +5487,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64 +#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 #: build/trans_presets.java:56 build/trans_presets.java:92 #: build/trans_presets.java:132 build/trans_presets.java:169 @@ -6312,40 +5637,757 @@ msgstr "Название" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45 +#, java-format +msgid "" +"Version {0} created on {1} by " +"{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 +#, java-format +msgid "Version {0} created on {1} by {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 +msgid "Version" +msgstr "Версия" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#, java-format +msgid "Images for {0}" +msgstr "Изображения для {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +msgid "Read GPX..." +msgstr "Прочесть GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#, java-format +msgid "No time for point {0} x {1}" +msgstr "Нет указания времени для точки {0} x {1}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#, 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:305 +msgid "No images with readable timestamps found." +msgstr "Не найдено изображений с информацией о времени." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#, java-format +msgid "Reading {0}..." +msgstr "Чтение {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +msgid "Geotagged Images" +msgstr "Изображения с данными о местоположении" + +#: ../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:563 +#, java-format +msgid "GPS end: {0}" +msgstr "Конец GPS: {0}" + +#: ../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:566 +msgid "timezone difference: " +msgstr "разница в часовых поясах: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +msgid "image" +msgid_plural "images" +msgstr[0] "изображение" +msgstr[1] "изображения" +msgstr[2] "изображений" + +#: ../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:648 +msgid "Sync clock" +msgstr "Синхронизация часов" + +#: ../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 +msgid "JPEG images (*.jpg)" +msgstr "Изображения JPEG (*.jpg)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#, java-format +msgid "The date in file \"{0}\" could not be parsed." +msgstr "Невозможно прочесть дату из файла \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#, java-format +msgid "There is no EXIF time within the file \"{0}\"." +msgstr "EXIF файла \"{0}\" не содержит информации о времени." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +msgid "Image" +msgstr "Изображение" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +msgid "GPS unit timezone (difference to photo)" +msgstr "Часовой пояс GPS объекта (отличается от фотографии)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +msgid "Synchronize Time with GPS Unit" +msgstr "Синхронизировать время с GPS приёмником" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +msgid "Time entered could not be parsed." +msgstr "Введённое время невозможно использовать" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +msgid "gps point" +msgstr "точка GPS" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +msgid "Customize line drawing" +msgstr "Настроить отрисовку линий" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +msgid "Use global settings." +msgstr "Использовать глобальные настройки." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +msgid "Draw lines between points for this layer." +msgstr "Отображать линии между точками для этого слоя." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +msgid "Do not draw lines between points for this layer." +msgstr "Не отображать линии между точками для этого слоя." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +msgid "Select line drawing options" +msgstr "Выбрать варианты отрисовки линий" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +msgid "Customize Color" +msgstr "Выбрать цвет" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../plugins/grid/src/grid/GridLayer.java:162 +msgid "Default" +msgstr "По умолчанию" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:163 +msgid "Choose a color" +msgstr "Выбор цвета" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +msgid "Markers From Named Points" +msgstr "Маркеры из именованых точек" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#, java-format +msgid "Named Trackpoints from {0}" +msgstr "Назвать маршрутные точки из {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +msgid "Import Audio" +msgstr "Импортировать аудиофайлы" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +msgid "Wave Audio files (*.wav)" +msgstr "Аудиофайлы Wave (*.wav)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#, java-format +msgid "Audio markers from {0}" +msgstr "Аудиомаркеры из {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +msgid "Import images" +msgstr "Импорт изображений" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#, java-format +msgid "{0} track, " +msgid_plural "{0} tracks, " +msgstr[0] "{0} дорожка, " +msgstr[1] "{0} дорожки, " +msgstr[2] "{0} дорожек, " + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#, java-format +msgid "{0} route, " +msgid_plural "{0} routes, " +msgstr[0] "{0} маршрут, " +msgstr[1] "{0} маршрута, " +msgstr[2] "{0} маршрутов, " + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#, java-format +msgid "{0} waypoint" +msgid_plural "{0} waypoints" +msgstr[0] "{0} путевая точка" +msgstr[1] "{0} путевые точки" +msgstr[2] "{0} путевых точек" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#, java-format +msgid "Name: {0}" +msgstr "Название: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#, java-format +msgid "Description: {0}" +msgstr "Описание: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +msgid "Timespan: " +msgstr "Временной интервал: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +msgid "Length: " +msgstr "Длина: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +msgid "Convert to data layer" +msgstr "Преобразовать в слой данных" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +msgid "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" +msgstr "" +"Загрузка на карту необработанных данных GPS считается вредоносной." +"
Если хотите загрузить трэк, сделайте это по ссылке:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +msgid "http://www.openstreetmap.org/traces" +msgstr "http://www.openstreetmap.org/traces" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#, java-format +msgid "Converted from: {0}" +msgstr "Преобразовано из: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +msgid "Download from OSM along this track" +msgstr "Скачать с JSM данные вдоль трэка" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +msgid "Download everything within:" +msgstr "Скачать всё в пределах:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#, java-format +msgid "{0} meters" +msgstr "{0} метров" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +msgid "Maximum area per request:" +msgstr "Максимальная область для одного запроса:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#, java-format +msgid "{0} sq km" +msgstr "{0} кв. км." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#, java-format +msgid "" +"This action will require {0} individual
download requests. Do you " +"wish
to continue?" +msgstr "" +"Это действие потребует {0} отдельных
запросов на скачивание. " +"Продолжить?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +msgid "No GPX track available in layer to associate audio with." +msgstr "На слое отсутствует трек GPX, чтобы наложить звук." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +msgid "" +"Some waypoints with timestamps from before the start of the track or after " +"the end were omitted or moved to the start." +msgstr "" +"Некоторые маршрутные точки созданы до начала трека или после его окончания и " +"будут пропущены или перенесены в начало трека." + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +msgid "" +"Some waypoints which were too far from the track to sensibly estimate their " +"time were omitted." +msgstr "" +"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать " +"их время, были проигнорированы." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#, java-format +msgid "Data Layer {0}" +msgstr "Слой данных {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +msgid "outside downloaded area" +msgstr "вне области для скачивания" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#, java-format +msgid "version {0}" +msgstr "версия {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#, java-format +msgid "{0} consists of:" +msgstr "{0} состоит из:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#, java-format +msgid " ({0} deleted.)" +msgstr " ({0} удалено)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +msgid "unset" +msgstr "отключено" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#, java-format +msgid "API version: {0}" +msgstr "Версия API: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +msgid "Convert to GPX layer" +msgstr "Преобразовать в слой GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: build/trans_presets.java:1837 build/trans_presets.java:1843 +#: build/trans_presets.java:1849 build/trans_presets.java:1855 +#: build/trans_presets.java:1861 build/trans_presets.java:1867 +#: build/trans_presets.java:1873 build/trans_presets.java:1879 +#: build/trans_presets.java:1885 build/trans_presets.java:1891 +#: build/trans_presets.java:1897 build/trans_presets.java:1903 +#: build/trans_presets.java:1909 build/trans_presets.java:1915 +#: build/trans_presets.java:1921 build/trans_presets.java:1930 +#: build/trans_presets.java:1937 build/trans_presets.java:1945 +#: build/trans_presets.java:1951 build/trans_presets.java:1957 +#: build/trans_presets.java:1963 build/trans_presets.java:1969 +#: build/trans_presets.java:1975 build/trans_presets.java:1981 +#: build/trans_presets.java:1987 build/trans_presets.java:1993 +#: build/trans_presets.java:1999 build/trans_presets.java:2005 +#: build/trans_presets.java:2011 build/trans_presets.java:2017 +#: build/trans_presets.java:2023 build/trans_presets.java:2029 +#: build/trans_presets.java:2035 build/trans_presets.java:2041 +msgid "track" +msgid_plural "tracks" +msgstr[0] "трек" +msgstr[1] "треки" +msgstr[2] "треков" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +msgid "point" +msgid_plural "points" +msgstr[0] "точка" +msgstr[1] "точки" +msgstr[2] "точек" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#, java-format +msgid "a track with {0} point" +msgid_plural "a track with {0} points" +msgstr[0] "трек с {0} точкой" +msgstr[1] "трек с {0} точками" +msgstr[2] "трек с {0} точками" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#, java-format +msgid "{0} consists of {1} track" +msgid_plural "{0} consists of {1} tracks" +msgstr[0] "{0} состоит из {1} трека" +msgstr[1] "{0} состоит из {1} треков" +msgstr[2] "{0} состоит из {1} треков" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#, java-format +msgid "{0} point" +msgid_plural "{0} points" +msgstr[0] "{0} точка" +msgstr[1] "{0} точки" +msgstr[2] "{0} точек" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151 +msgid "gps marker" +msgstr "маркер GPS" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172 +msgid "marker" +msgid_plural "markers" +msgstr[0] "маркер" +msgstr[1] "маркера" +msgstr[2] "маркеров" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#, java-format +msgid "{0} consists of {1} marker" +msgid_plural "{0} consists of {1} markers" +msgstr[0] "{0} состоит из {1} маркера" +msgstr[1] "{0} состоит из {1} маркеров" +msgstr[2] "{0} состоит из {1} маркеров" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +msgid "Synchronize Audio" +msgstr "Синхронизировать аудио" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +msgid "" +"You need to pause audio at the moment when you hear your synchronization cue." +msgstr "" +"Вам необходимо приостановить звуковой файл в момент воспроизведения реплик." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#, java-format +msgid "Audio synchronized at point {0}." +msgstr "Аудио синхронизировано на точке {0}." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +msgid "Unable to synchronize in layer being played." +msgstr "Невозможно синхронизировать слой который используется" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +msgid "Make Audio Marker at Play Head" +msgstr "Установить маркер аудио на позиции проигрывания" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +msgid "" +"You need to have paused audio at the point on the track where you want the " +"marker." +msgstr "" +"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить " +"маркер." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +msgid "No existing audio markers in this layer to offset from." +msgstr "Нет существующих аудио маркеров на этом слое" + +#. Not close enough to track, or no audio marker found for some other reason +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +msgid "" +"You need to drag the play head near to the GPX track whose associated sound " +"track you were playing (after the first marker)." +msgstr "" +"Вам необходимо перетащить значёк играющей головы рядом с от GPX трэком с " +"которым связана звуковая дорожка (после первого маркера)." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +msgid "" +"You need to SHIFT-drag the play head onto an audio marker or onto the track " +"point where you want to synchronize." +msgstr "" +"Нужно удерживать Shift и перетащить значек играющей головы на аудио маркера " +"или на точку трека, где вы хотите синхронизировать." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +msgid "Unable to create new audio marker." +msgstr "Невозможно создать новый аудио-маркер." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +msgid "There was an error while trying to display the URL for this marker" +msgstr "Произошла ошибка при попытке показать URL для этого маркера" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +msgid "(URL was: " +msgstr "(по ссылке: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +msgid "Error displaying URL" +msgstr "Невозможно отобразить URL" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +msgid "Advanced Preferences" +msgstr "Дополнительные параметры" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +msgid "Setting Preference entries directly. Use with caution!" +msgstr "Установка параметров напрямую. Пользоваться с осторожностью!" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 +msgid "Search: " +msgstr "Поиск: " + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +msgid "Current value is default." +msgstr "Текущее значение - по умолчанию" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#, java-format +msgid "Default value is ''{0}''." +msgstr "Текущее значение - ''{0}''." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +msgid "Default value currently unknown (setting has not been used yet)." +msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588 +msgid "Please select the row to edit." +msgstr "Пожалуйста, выберите ряд для редактирования." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 +#, java-format +msgid "New value for {0}" +msgstr "Новое значение для {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +msgid "Please select the row to delete." +msgstr "Пожалуйста, выберите ряд для удаления." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +msgid "Enter a new key/value pair" +msgstr "Введите новый ключ и значение" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33 +msgid "Display the Audio menu." +msgstr "Показать меню Аудио." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34 +msgid "Label audio (and image and web) markers." +msgstr "Подписывать маркеры аудио, картинок и веба." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35 +msgid "Display live audio trace." +msgstr "Показать звуковые подсказки в реальном времени" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 +msgid "Create non-audio markers when reading GPX." +msgstr "Создать не звуковые маркеры при обработке GPX данных" + +#. various methods of making markers on import audio +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39 +msgid "Explicit waypoints with valid timestamps." +msgstr "Точные маршрутные точки с правильными временными метками" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40 +msgid "Explicit waypoints with time estimated from track position." +msgstr "Точные маршрутные точки с приблизительным временем из позиции на треке" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41 +msgid "Named trackpoints." +msgstr "Именованые точки пути." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42 +msgid "Modified times (time stamps) of audio files." +msgstr "Изменить время (метку времени) звукового файла" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43 +msgid "Start of track (will always do this if no other markers available)." +msgstr "Начать трек (всегда делать это, если другие метки недоступны)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53 +msgid "Show or hide the audio menu entry on the main menu bar." +msgstr "Отобразить или спрятать меню работы со звуком на панели Главного меню" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58 +msgid "" +"Display a moving icon representing the point on the synchronized track where " +"the audio currently playing was recorded." +msgstr "" +"Показать анимированную иконку в точке трека, где был записан проигрываемый в " +"данный момент звук." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63 +msgid "" +"Put text labels against audio (and image and web) markers as well as their " +"button icons." +msgstr "" +"Поставьте текстовую надпись напротив аудио (и изображения и веб-сайта) " +"маркеров, а также их кнопок." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68 +msgid "" +"Automatically make a marker layer from any waypoints when opening a GPX " +"layer." +msgstr "" +"Автоматически создавать слой меток из маршрутных точек при открытии GPX слоя" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71 +msgid "When importing audio, make markers from..." +msgstr "Когда импортируется звук, применять метки из..." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80 +msgid "When importing audio, apply it to any waypoints in the GPX layer." +msgstr "" +"Когда импортируется звук, применять его для любых маршрутных точек из слоя " +"GPX." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95 +msgid "" +"Automatically create audio markers from trackpoints (rather than explicit " +"waypoints) with names or descriptions." +msgstr "" +"Автоматически создавать звуковые метки из узлов трека (вместо точных " +"маршрутных точек) с именами или описаниями" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90 +msgid "" +"Create audio markers at the position on the track corresponding to the " +"modified time of each audio WAV file imported." +msgstr "" +"Создать звуковые метки в положении на треке, соответствующем времени " +"изменения каждого импортированного звукового файла WAV." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99 +msgid "" +"The number of seconds to jump forward or back when the relevant button is " +"pressed" +msgstr "" +"Показывает, на сколько секунд вперёд или назад нужно перейти при нажатии " +"соответствующей кнопки" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100 +msgid "Forward/back time (seconds)" +msgstr "Время перемотки (секунд)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104 +msgid "The amount by which the speed is multiplied for fast forwarding" +msgstr "" +"Показывает, во сколько раз увеличивается скорость при быстром проигрывании" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105 +msgid "Fast forward multiplier" +msgstr "Множитель быстрого проигрывания" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109 +msgid "" +"Playback starts this number of seconds before (or after, if negative) the " +"audio track position requested" +msgstr "" +"Воспроизведение начнется через это количество секунд до (или после, в случае " +"отрицательного) звуковой дорожки у запрошенной позиции" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110 +msgid "Lead-in time (seconds)" +msgstr "Продолжительность вступления (в секундах)" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114 +msgid "The ratio of voice recorder elapsed time to true elapsed time" +msgstr "" +"Соотношение времени диктофонной записи соответствует прошедшему времени" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115 +msgid "Voice recorder calibration" +msgstr "Калибровка звукозаписи" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +msgid "Color" +msgstr "Цвет" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Стиль точки {0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Слой: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Выбрать" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 #, java-format msgid "Choose a color for {0}" msgstr "Выберите цвет для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 msgid "Set to default" msgstr "Задать в значение по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 msgid "Set all to default" msgstr "Задать все значения по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 msgid "Colors used by different objects in JOSM." msgstr "Цвета, используемые разными объектами в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 msgid "Colors" msgstr "Цвета" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -6354,25 +6396,25 @@ msgstr "Все" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 msgid "Local files" msgstr "Локальные файлы" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 msgid "None" msgstr "Нет" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 msgid "Force lines if no segments imported." msgstr "Отображать линии, даже если не импортировано сегментов." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 msgid "Draw large GPS points." msgstr "Отображать крупные точки GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 msgid "Velocity (red = slow, green = fast)" msgstr "Скорость (красный = медленно, зелёный = быстро)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 msgid "Dilution of Position (red = high, green = low, if available)" msgstr "" @@ -6380,5 +6422,5 @@ "имеются)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Single Color (can be customized for named layers)" msgstr "Одним цетом (может быть определено для именованных слоев" @@ -6386,5 +6428,5 @@ #. item "Aerialway/Station" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 #: build/trans_presets.java:1350 msgid "Car" @@ -6405,5 +6447,5 @@ #. item "Car/Sharing" text "Operator" #. item "Public Transport/Subway Entrance" check "Wheelchair" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 #: build/trans_presets.java:313 build/trans_presets.java:639 #: build/trans_presets.java:842 build/trans_presets.java:861 @@ -6441,5 +6483,5 @@ #. item "Barriers/Sally Port" label "Allowed traffic:" #. -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 #: build/trans_presets.java:314 build/trans_presets.java:641 #: build/trans_presets.java:841 build/trans_presets.java:860 @@ -6452,16 +6494,16 @@ msgstr "Пешком" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50 msgid "Draw Direction Arrows" msgstr "Отображать стрелки направления" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51 msgid "Fast drawing (looks uglier)" msgstr "Быстрая отрисовка (выглядит хуже)" #. only interesting directions -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" @@ -6470,34 +6512,34 @@ #. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225 msgid "Only on the head of a way." msgstr "Только в начале пути" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 msgid "Draw segment order numbers" msgstr "Отображать порядковые номера сегментов" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 msgid "Draw boundaries of downloaded data" msgstr "Отображать границы скачанных данных" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57 msgid "Draw virtual nodes in select mode" msgstr "Отображать виртуальные точки в режиме выделения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58 msgid "Draw inactive layers in other color" msgstr "Отображать неактивные слои другим цветом" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59 msgid "Smooth map graphics (antialiasing)" msgstr "Сглаженные линии (антиалиасинг)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81 msgid "Draw lines between raw GPS points" msgstr "Рисовать линии между точками GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103 msgid "" "Maximum length (in meters) to draw lines for local files. Set to '-1' to " @@ -6507,9 +6549,9 @@ "чтобы рисовать все линии." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105 msgid "Maximum length for local files (meters)" msgstr "Максимальная длина для локальных файлов (в метрах)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110 msgid "" "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -6518,20 +6560,20 @@ "чтобы отображать все линии." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112 msgid "Maximum length (meters)" msgstr "Максимальная длина (в метрах)" #. forceRawGpsLines -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "Отображать линии, даже если не импортировано информации о линиях." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 msgid "Draw direction arrows for lines, connecting GPS points." msgstr "Отображать стрелки на линиях, соединяющих точки GPS." #. drawGpsArrowsFast -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134 msgid "Draw the direction arrows using table lookups instead of complex math." msgstr "" @@ -6540,5 +6582,5 @@ #. drawGpsArrowsMinDist -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140 msgid "" "Don't draw arrows if they are not at least this distance away from the last " @@ -6547,13 +6589,13 @@ "Не изображать стрелки, если их нет на этом расстоянии от последних стрелок" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143 msgid "Minimum distance (pixels)" msgstr "Минимальное расстояние (в пикселях)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148 msgid "Draw larger dots for the GPS points." msgstr "Отображать точки GPS более жирно" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175 msgid "" "All points and track segments will have the same color. Can be customized in " @@ -6563,9 +6605,9 @@ "Менеджере Слоев." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176 msgid "Colors points and track segments by velocity." msgstr "Цвета точек и сегментов треков по скорости." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177 msgid "" "Colors points and track segments by dilution of position (HDOP). Your " @@ -6575,54 +6617,54 @@ "(HDOP). Ваше устройство должно журналировать эту информацию." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182 msgid "Allows to tune the track coloring for different average speeds." msgstr "Позволяет настраивать окраску трека для различных средних скоростей." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187 msgid "Track and Point Coloring" msgstr "Разцветить трэки и точки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196 msgid "GPS Points" msgstr "Точки GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214 msgid "Draw direction hints for way segments." msgstr "Показывать направление на сегментах путей." #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231 msgid "Draw the order numbers of all segments within their way." msgstr "Показывать порядковые номера на всех сегментах пути." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Применить сглаживание карты." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Draw the boundaries of data loaded from the server." msgstr "Отображать границы области, скачанной с сервера." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251 msgid "Draw the inactive data layers in a different color." msgstr "Отображать неактивные слои данных другим цветом." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258 msgid "OSM Data" msgstr "Данные OSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21 +#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27 msgid "Keep backup files" msgstr "Сохранять резервные копии" -#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26 +#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32 msgid "When saving, keep backup files ending with a ~" msgstr "" @@ -6631,82 +6673,103 @@ #. Show splash screen on startup -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78 msgid "Show splash screen at startup" msgstr "Показывать заставку при запуске" #. Show ID in selection -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83 msgid "Show object ID in selection lists" msgstr "Показывать ID объектов в списке выбора" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87 msgid "Draw rubber-band helper line" msgstr "Рисовать «резиновую» вспомогательную линию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 msgid "Modeless working (Potlatch style)" msgstr "Безрежимная работа (в стиле Potlatch)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 msgid "Do not require to switch modes (potlatch style workflow)" msgstr "Не требует переключения режимов (рабочий стиль potlatch)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103 msgid "Look and Feel" msgstr "Оформление" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58 msgid "Default (Auto determined)" msgstr "По умолчанию (Автоопределение)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65 msgid "Language" msgstr "Язык" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40 +msgid "Enable built-in defaults" +msgstr "Использовать настройки по умолчанию" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34 +#, fuzzy +msgid "Enable built-in icon defaults" +msgstr "Использовать настройки по умолчанию" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#, fuzzy +msgid "Used style" +msgstr "Тип лыжня" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 msgid "Configure available plugins." msgstr "Настроить доступные модули." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 msgid "Download List" msgstr "Скачать список" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 msgid "Update" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 msgid "Configure Sites..." msgstr "Настроить сайты..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 msgid "Please select an entry." msgstr "Пожалуйста, выберите запись." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 msgid "Configure Plugin Sites" msgstr "Настроить сайты с модулями" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "Display Settings" msgstr "Настройки экрана" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 msgid "" "Various settings that influence the visual representation of the whole " @@ -6714,98 +6777,98 @@ msgstr "Различные настройки, влияющие на внешний вид программы." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Connection Settings" msgstr "Параметры соединения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Connection Settings for the OSM server." msgstr "Параметры соединения с сервером OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Map Settings" msgstr "Настройки карты" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Settings for the map projection and data interpretation." msgstr "Параметры проекции карты и отображения данных" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Audio Settings" msgstr "Параметры Аудио" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the audio player and audio markers." msgstr "Параметры звукового проигрывателя, и звуковых маркеров." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 msgid "You have to restart JOSM for some settings to take effect." msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56 +msgid "Display coordinates as" +msgstr "Отображать координаты как" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59 +msgid "Projection method" +msgstr "Тип проекции" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64 msgid "Map Projection" msgstr "Картографическая проекция" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46 -msgid "Projection method" -msgstr "Тип проекции" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49 -msgid "Display coordinates as" -msgstr "Отображать координаты как" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 msgid "Enable proxy server" msgstr "Использовать прокси-сервер" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38 msgid "Anonymous" msgstr "Анонимный" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71 msgid "Proxy Settings" msgstr "Параметры прокси-сервера" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73 msgid "Proxy server host" msgstr "Адрес" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75 msgid "Proxy server port" msgstr "Порт" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 msgid "Proxy server username" msgstr "Имя пользователя" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 msgid "Proxy server password" msgstr "Пароль" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41 msgid "The base URL for the OSM server (REST API)" msgstr "Основной адрес сервера OSM (REST API)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42 msgid "Login name (e-mail) to the OSM account." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43 msgid "" "Login password to the OSM account. Leave blank to not store any password." msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 msgid "Base Server URL" msgstr "Основной адрес сервера" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47 msgid "OSM username (e-mail)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49 msgid "OSM password" msgstr "OSM пароль" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51 msgid "" "WARNING: The password is stored in plain text in the preferences file." @@ -6813,4 +6876,7 @@ "URL.
Do not use a valuable Password." msgstr "" +"ВНИМАНИЕ: Пароль хранится открытым текстом в файле настроек.
Пароль " +"передаётся на сервер открытым текстом составной частью URL.
Не " +"используйте ценные Пароли." #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -6820,77 +6886,108 @@ #. icon original size: 128x128 #. modifications: icon was cropped, then resized -#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29 msgid "Shortcut Preferences" msgstr "Настройки клавиш" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30 msgid "Changing keyboard shortcuts manually." msgstr "Изменить сочетания клавиш вручную" #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")}; -#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44 msgid "Action" msgstr "Действие" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44 msgid "Shortcut" msgstr "Горячая клвиша" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, fuzzy, java-format +msgid "Short Description: {0}" +msgstr "Описание: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#, fuzzy, java-format +msgid "URL: {0}" +msgstr "Слой: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#, fuzzy, java-format +msgid "Author: {0}" +msgstr "Авторы: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#, fuzzy, java-format +msgid "Webpage: {0}" +msgstr "Справка: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#, fuzzy, java-format +msgid "Version: {0}" +msgstr "Версия {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +msgid "Icon paths" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#, fuzzy +msgid "Copy defaults" +msgstr "Копия поумолчанию" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +msgid "Please select the row to copy." +msgstr "Пожалуйста, выберите ряд для копирования." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#, java-format +msgid "The XML source (URL or filename) for {0} definition files." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#, fuzzy +msgid "Add a new XML source to the list." +msgstr "Добавить в список новый источник." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616 +msgid "Delete the selected source from the list." +msgstr "Удалить источник из списка." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +msgid "Defaults (See tooltip for detailed information)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38 msgid "Sort presets menu" msgstr "Сортировать меню предустановок" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46 -msgid "Enable built-in defaults" -msgstr "Использовать настройки по умолчанию" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69 -msgid "Tagging preset source" -msgstr "Источник предустановок тегов" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88 -msgid "" -"The sources (URL or filename) of tagging preset definition files. See http://" -"josm.openstreetmap.de/wiki/TaggingPresets for help." -msgstr "" -"Источник (URL или имя файла) файла с предустановками тегов. См. http://josm." -"openstreetmap.de/wiki/TaggingPresets для большей информации." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89 -msgid "Add a new tagging preset source to the list." -msgstr "Добавить новый источник предустановки тегов в список." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554 -msgid "Delete the selected source from the list." -msgstr "Удалить источник из списка." - -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51 msgid "Tagging Presets" msgstr "Предустановки тегов" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97 -msgid "Tagging preset sources" -msgstr "Источники предустановок тегов" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204 msgid "Separator" msgstr "Разделитель" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350 msgid "Toolbar" msgstr "Панель инструментов" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354 msgid "Available" msgstr "Доступно" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393 msgid "Toolbar customization" msgstr "Настройка панели инструментов" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394 msgid "Customize the elements on the toolbar." msgstr "Настроить элементы панели инструментов." @@ -7163,6 +7260,6 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 #, java-format msgid "Markers from {0}" @@ -7171,7 +7268,7 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 -#, fuzzy, java-format +#, java-format msgid "File \"{0}\" does not exist" -msgstr "Файл {0} существует. Перезаписать?" +msgstr "Файл \"{0}\" не существует" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 @@ -7333,5 +7430,5 @@ #, java-format msgid "mandatory attribute ''{0}'' missing" -msgstr "" +msgstr "обязательный атрибут ''{0}'' отсутствует" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74 @@ -7339,4 +7436,6 @@ msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''" msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа long, текущее значение " +"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77 @@ -7345,4 +7444,6 @@ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''" msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее " +"значение ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91 @@ -7350,4 +7451,6 @@ msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " +"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94 @@ -7356,4 +7459,6 @@ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''" msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа int (>=0), текущее " +"значение ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114 @@ -7362,4 +7467,6 @@ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''" msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа boolean, текущее " +"значение ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174 @@ -7369,4 +7476,6 @@ "''{1}''" msgstr "" +"неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, " +"текущее значение ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -7440,5 +7549,5 @@ #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" +msgstr "Отсутствует атрибут \"version\" OSM примитива с id {0}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336 @@ -7465,9 +7574,9 @@ #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" -msgstr "" +msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 msgid "Downloading history..." -msgstr "" +msgstr "Загрузка истории..." #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 @@ -7478,5 +7587,5 @@ #, java-format msgid "Failed to open connection to API {0}" -msgstr "" +msgstr "Не удалось установить соединение с API {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 @@ -7491,5 +7600,5 @@ msgid "" "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " -"use changesets, but API is not handle them. Ignoring changesets." +"use changesets, but API is not able to handle them. Ignoring changesets." msgstr "" @@ -7499,15 +7608,15 @@ msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 msgid "Update Plugins" msgstr "Обновить модули" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 msgid "Download Plugins" msgstr "Скачать модули" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 #, java-format msgid "" @@ -7520,32 +7629,33 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 +msgstr[0] "{0} Плагин успешно загружен. Пожалуйста, перезагрузите JOSM." +msgstr[1] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM." +msgstr[2] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 #, java-format msgid "Downloading Plugin {0}..." -msgstr "" +msgstr "Загрузка Плагина {0}..." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +msgid "Skip download" +msgstr "Пропустить загрузку" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 -msgid "Skip download" -msgstr "" +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "JOSM версии {0} требует плагин {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 -#, java-format -msgid "JOSM version {0} required for plugin {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 msgid "Download Plugin" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119 +msgstr "Загрузить Плагин" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 msgid "Skip Download" -msgstr "" +msgstr "Пропустить Загрузку" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -7566,5 +7676,5 @@ #, java-format msgid "Plugin {0} requires JOSM update to version {1}." -msgstr "" +msgstr "Плагин {0} требует обновление JOSM до версии {1}." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 @@ -7593,6 +7703,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 msgid "Disable plugin" msgstr "Отключить модуль" @@ -7607,5 +7717,5 @@ msgstr "Сохранение плагина" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7615,5 +7725,5 @@ "разрешение переписывать существующие модули." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 #, java-format msgid "" @@ -7621,10 +7731,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Согласно информации в модуле, автором является {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7633,9 +7743,9 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 msgid "Should the plugin be disabled?" msgstr "Отключить модуль?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7645,5 +7755,5 @@ "модуль." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 msgid "" "The plugin could not be removed. Please tell the people you got JOSM from " @@ -7652,19 +7762,19 @@ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 msgid "Information" msgstr "Информация" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135 msgid "no description available" msgstr "описание отсутствует" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137 msgid "More details" msgstr "Подробнее" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7674,13 +7784,13 @@ msgstr[2] "Скачать информацию о модуле с {0} сайтов" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 msgid "No plugin information found." msgstr "Информации о модулях не найдено." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 msgid "All installed plugins are up to date." msgstr "Все установленные модули имеют последнюю версию." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 #, java-format msgid "" @@ -7693,9 +7803,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 msgid "Download missing plugins" msgstr "Скачивание недостающих модулей" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 #, java-format msgid "" @@ -7708,6 +7818,6 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -7730,14 +7840,14 @@ msgstr "неизвестный" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191 msgid "Plugin bundled with JOSM" msgstr "Модуль из поставки JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 #, java-format msgid "Error reading plugin information file: {0}" @@ -7998,45 +8108,45 @@ "{0} км/ч" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107 msgid "Extracting GPS locations from EXIF" msgstr "Извлечение GPS координат из EXIF" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113 msgid "Starting directory scan" msgstr "Запуск сканирования каталога" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118 msgid "One of the selected files was null !!!" msgstr "Один из выбранных файлов пуст!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 msgid "Read photos..." msgstr "Загрузка фото..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Не удалось получить канонический путь к каталогу {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 #, java-format msgid "Scanning directory {0}" msgstr "Скнирование каталога {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 #, java-format msgid "Found null file in directory {0}\n" msgstr "Найден пустой файл в каталоге {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Ошибка чтения файлов в каталоге {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 msgid "Correlate to GPX" msgstr "Коррелируют с GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 #, java-format msgid "{0} were found to be gps tagged." @@ -8246,20 +8356,20 @@ msgstr "Секунды: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Совпавшие {0} из {1} фотографий с GPX треком." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 #, java-format msgid "(Time difference of {0} days)" msgstr "(Разница во времени {0} дней)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Смещение между треком и фотографией: {0}м {1}с" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8267,13 +8377,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 msgid "Matching photos to track failed" msgstr "Сопоставление фотографий треку прервано" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 msgid "Adjust timezone and offset" msgstr "Настройка часового пояса и смещения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 msgid "Default Values" msgstr "Значения по умолчанию" @@ -8295,5 +8405,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 msgid "Error loading file" msgstr "Ошибка при загрузке файла" @@ -8650,5 +8760,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 msgid "Blank Layer" msgstr "Пустой слой" @@ -8750,20 +8860,22 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 msgid "TangoGPS Files (*.log)" -msgstr "" +msgstr "TangoGPS Файлы (*.log)" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 +msgid "Format errors: " +msgstr "Ошибки формата: " + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112 +msgid "TangoGPS import success" +msgstr "Импорт TangoGPS успешно окончен" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 +msgid "TangoGPS import faliure!" +msgstr "Импорт TangoGPS окончен ошибкой!" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 #, 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!" +msgid "TCX Files (*.tcx)" +msgstr "TangoGPS Файлы (*.log)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8788,5 +8900,5 @@ msgstr "Создать копию линии" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 msgid "Layer for editing GPX tracks" msgstr "Слой для редактирования GPX трэков" @@ -8807,11 +8919,11 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101 -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259 -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302 msgid "Import path from GPX layer" msgstr "Импортировать путь из слоя данных GPX" #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91 -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292 msgid "Drop existing path" msgstr "Очистить существующий путь" @@ -8820,6 +8932,6 @@ #. TODO: register a listener and show menu entry only if gps layers are available #. no gps layer -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135 -#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132 +#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328 msgid "No GPX data layer found." msgstr "Не найдено слоя данных GPX" @@ -8882,6 +8994,6 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 msgid "Refresh" msgstr "Обновить" @@ -9113,5 +9225,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10 msgid "An unknown error has occurred" -msgstr "" +msgstr "Произошла неизвестная ошибка" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 @@ -9190,7 +9302,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:947 build/trans_style.java:964 -#: build/trans_style.java:980 build/trans_style.java:3333 -#: build/trans_style.java:3341 +#: build/trans_style.java:952 build/trans_style.java:969 +#: build/trans_style.java:985 build/trans_style.java:3344 +#: build/trans_style.java:3352 msgid "water" msgstr "вода" @@ -9507,8 +9619,11 @@ "new server? (Strongly recommended)" msgstr "" +"Плагин openstreetbus использует старый сервер appspot.com.
Новый " +"сервер доступен на schokokeks.org.
Хотите переключится на новый сервер? " +"(Строго рекомендуется)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100 msgid "Switch to new openstreetbugs server?" -msgstr "" +msgstr "Переключится на новый сервер openstreetbugs?" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51 @@ -9537,14 +9652,14 @@ "строкой." -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 msgid "Open OpenStreetBugs" msgstr "Открытые OpenStreetBugs" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 msgid "Opens the OpenStreetBugs window and activates the automatic download" -msgstr "" - -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123 +msgstr "Открывает окно OpenStreetBugs и активирует автоматическую загрузку" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125 msgid "" "The visible area is either too small or too big to download data from " @@ -9678,20 +9793,20 @@ msgstr "Разрешённые действия" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 msgid "Remote Control has been asked to load data from the API." msgstr "" "модуль дистанционного управления получил запрос на загрузку данных из API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 #, java-format msgid "Request details: {0}" msgstr "Подробности запроса: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 msgid "Do you want to allow this?" msgstr "Разрешить действие?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 msgid "Confirm Remote Control action" @@ -9817,7 +9932,6 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -#, fuzzy msgid "image loading..." -msgstr "Закачка..." +msgstr "изображение загружается..." #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10012,13 +10126,4 @@ msgid "You have to specify tagging preset sources in the preferences first." msgstr "В первую очередь Вы должны указать источник настроек тегов." - -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37 -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38 -msgid "Import TCX File..." -msgstr "Импортировать файл TCX..." - -#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37 -msgid "Import TCX file as GPS track" -msgstr "Импортировать файл TCX как трек GPS" #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 @@ -10174,5 +10279,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180 msgid "No intersection found. Nothing was changed." -msgstr "" +msgstr "Пересечений не найдено. Изменений сделано не было." #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202 @@ -10237,29 +10342,29 @@ "Открывает диалоговое окно, которое позволяет перейти к определенной местности" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53 msgid "Enter Lat/Lon to jump to position." msgstr "Введите Lat / Lon, чтобы перейти к позиции." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Вы также можете вставить URL из www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87 msgid "Zoom (in metres)" msgstr "Приближение (в метрах)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 msgid "Jump there" msgstr "Перейти туда" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100 msgid "Jump to Position" msgstr "Перейти к позиции" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" @@ -10267,5 +10372,5 @@ "проверьте." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112 msgid "Unable to parse Lon/Lat" msgstr "Невозможно разобрать широту/долготу" @@ -10587,24 +10692,24 @@ "Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148 msgid "Properties checker :" msgstr "Проверка параметров:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 msgid "This plugin checks for errors in property keys and values." msgstr "" "Этот плагин проверяет на наличие ошибок в названиях ключей и их значений." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Неправильно просталенныех тегов линиий - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ошибка проверки правописания строки: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291 #, java-format msgid "" @@ -10615,5 +10720,5 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381 msgid "Illegal tag/value combinations" msgstr "Неправильная комбинация тегов/значений тегов" @@ -10621,78 +10726,78 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394 msgid "Painting problem" msgstr "Проблемы отображения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403 #, java-format msgid "Key ''{0}'' invalid." msgstr "Неправильный ключ {0}." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408 msgid "Tags with empty values" msgstr "Пустые значения тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414 msgid "Invalid property key" msgstr "Неверный ключ свойств" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420 msgid "Invalid white space in property key" msgstr "Неправильный пробел в названии ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 msgid "Property values start or end with white space" msgstr "Значение начинается или заканчивается пробелом" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 msgid "Property values contain HTML entity" msgstr "Значения содержат HTML разметку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Ключа ''{0}'' нет в настройках." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Presets do not contain property key" msgstr "Установки не содержат собственно ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477 msgid "Presets do not contain property value" msgstr "Не содержит зарание устанвленного значения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534 msgid "Check property keys." msgstr "Проверьте ключи свойств." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 msgid "Validate that property keys are valid checking against list of words." msgstr "Проверьте, что ключ действителен проверен в отношении списка слов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542 msgid "Use complex property checker." msgstr "Использовать сложную проверку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543 msgid "Validate property values and tags using complex rules." msgstr "Проверка собственных значений и использование сложных правил тегов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592 msgid "TagChecker source" msgstr "Исходники TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10702,21 +10807,21 @@ "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 msgid "Add a new source to the list." msgstr "Добавить в список новый источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 msgid "Edit the selected source." msgstr "Править выбранный источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Data sources" msgstr "Источники данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638 msgid "Check property values." msgstr "Проверьте правильно значений" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -10724,33 +10829,43 @@ "установок проверки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 msgid "Check for FIXMES." msgstr "Проверить для FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Ищет узлы или линии с FIXME в свойствах какого-либо значения." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654 msgid "Check for paint notes." msgstr "Проверить заметки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Check if map painting found data errors." msgstr "Проверить содержит ли нарисованная карта ошибки данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 msgid "Use default data file." msgstr "Использовать файл данных по умолчанию." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 msgid "Use the default data file (recommended)." msgstr "Используется файл данных установленный по умолчанию" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666 +#, fuzzy +msgid "Use default tag ignore file." +msgstr "Использовать файл данных по умолчанию." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#, fuzzy +msgid "Use the default tag ignore file (recommended)." +msgstr "Используется файл данных установленный по умолчанию" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Use default spellcheck file." msgstr "Использовать установленный по умолчанию файл проверки правописания" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 msgid "Use the default spellcheck file (recommended)." msgstr "" @@ -10758,22 +10873,22 @@ "(рекомендуется)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765 msgid "Fix properties" msgstr "Исправить параметры" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879 msgid "Could not find element type" msgstr "Не удалось найти тип элемента" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896 msgid "Could not find warning level" msgstr "Не удалось найти уровень предупреждения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905 #, java-format msgid "Illegal expression ''{0}''" msgstr "Недопустимое выражение ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10918,7 +11033,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4068 build/trans_style.java:4075 -#: build/trans_style.java:4082 build/trans_style.java:4089 -#: build/trans_style.java:4096 +#: build/trans_style.java:4079 build/trans_style.java:4086 +#: build/trans_style.java:4093 build/trans_style.java:4100 +#: build/trans_style.java:4107 msgid "building" msgstr "здание" @@ -10932,5 +11047,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4103 +#: build/trans_style.java:4114 msgid "area" msgstr "область" @@ -10940,26 +11055,26 @@ msgstr "Незамкнутая линия" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45 msgid "Unconnected ways." msgstr "Несоединённые линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46 msgid "This test checks if a way has an endpoint very near to another way." msgstr "" "Этот тест ищет линии, край которых расположен очень близко к другой линии." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83 msgid "Way end node near other highway" msgstr "Последний узел линии рядом с существующим шоссе" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109 msgid "Way end node near other way" msgstr "Последний узел линии рядом с другой линией" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130 msgid "Way node near other way" msgstr "Узел линии рядом с другой линией" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148 msgid "Connected way end node near other way" msgstr "Конечный узел связной линии возле другой линии" @@ -10982,17 +11097,22 @@ msgstr "Данный тест ищет линии без тегов, пустые, и линии из одной точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88 msgid "Unnamed ways" msgstr "Безымянные линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90 +#, fuzzy +msgid "Unnamed Junction" +msgstr "Править перекрёсток" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97 msgid "Untagged ways" msgstr "Линии без тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102 msgid "Empty ways" msgstr "Пустые линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 msgid "One node ways" msgstr "Линии из одной точки" @@ -11030,14 +11150,14 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 msgid "Reached the end of the line" -msgstr "" +msgstr "Достигнут конец линии" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 msgid "Reached a junction" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57 msgid "Exception occurred" msgstr "Произошла ошибка." @@ -11094,5 +11214,5 @@ #, java-format msgid "WMS: {0}" -msgstr "" +msgstr "WMS: {0}" #. This service serves the purpose of "just this once" without forcing the user @@ -11110,9 +11230,9 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 msgid "Visit Homepage" -msgstr "" +msgstr "Домашняя страница" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 msgid "WMS URL or Image ID:" -msgstr "" +msgstr "WMS URL или ID Изображения:" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 @@ -11126,8 +11246,10 @@ "again." msgstr "" +"Не могу сопоставить введённую ссылку или id с выделенным сервисом. " +"Пожалуйста попробуйте ещё раз." #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "No valid WMS URL or id" -msgstr "" +msgstr "Нет верных WMS URL или ID" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -11135,5 +11257,5 @@ msgstr "Отрегулируйте положение выбранного слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 #, java-format msgid "" @@ -11148,15 +11270,15 @@ msgstr "Автоматическое скачивание" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11165,37 +11287,37 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "Download visible tiles" msgstr "Скачать видимые квадраты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "Reload erroneous tiles" msgstr "Перезагрузить ошибочные фрагменты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 msgid "Save WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +msgstr "Сохраниеть WMS слой" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 msgid "Load WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334 +msgstr "Загрузить WMS слой" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -11203,65 +11325,54 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 msgid "Open a blank WMS layer to load data from a file" msgstr "Открыть пустой WMS-слой для загрузки данных из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 msgid "WMS Plugin Preferences" msgstr "Настройки модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 msgid "Menu Name" msgstr "Название меню" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 msgid "WMS URL" msgstr "Ссылка на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 msgid "Menu Name (Default)" msgstr "Имя пункта меню (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 msgid "WMS URL (Default)" msgstr "WMS URL (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "Enter a menu name and WMS URL" msgstr "Введите имя пункта меню и URL этого WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Copy Default" msgstr "Копия поумолчанию" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108 -msgid "Please select the row to copy." -msgstr "Пожалуйста, выберите ряд для копирования." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 -msgid "Overlap tiles" -msgstr "Накладывающиеся части" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 -msgid "% of lat:" -msgstr "% широты:" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122 -msgid "% of lon:" -msgstr "% долготы:" +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#, fuzzy +msgid "Downloader:" +msgstr "Скачать" #. * @@ -11299,5 +11410,5 @@ #: build/specialmessages.java:10 msgid "Audio Device Unavailable" -msgstr "" +msgstr "Аудиоустройство недоступно" #. Java message loading audio data @@ -11350,4 +11461,5 @@ msgid "Allows to import various file formats into JOSM directly." msgstr "" +"Позволяет импортировать файлы различных форматов непосредственно в JOSM" #. Plugin DirectUpload @@ -11508,16 +11620,11 @@ "режиме." -#. Plugin tcx-support +#. Plugin terracer #: build/trans_plugins.java:59 -msgid "Directly load TCX files from JOSM." -msgstr "Прямо загрузить TCX файлы из JOSM." - -#. Plugin terracer -#: build/trans_plugins.java:61 msgid "Make terraced houses out of single blocks." msgstr "Сделать ряд домов вдоль улицы из одного блока." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11529,5 +11636,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11538,5 +11645,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11548,10 +11655,10 @@ #. Plugin waydownloader +#: build/trans_plugins.java:67 +msgid "Easy downloading along a long set of interconnected ways" +msgstr "" + +#. Plugin wmsplugin #: build/trans_plugins.java:69 -msgid "Easy downloading along a long set of interconnected ways" -msgstr "" - -#. Plugin wmsplugin -#: build/trans_plugins.java:71 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12350,4 +12457,64 @@ msgstr "Доступ" +#. item "Streets/Road Restrictions" combo "Access" +#. item "Streets/Road Restrictions" combo "Bicycle" +#. item "Streets/Road Restrictions" combo "Foot" +#. item "Streets/Road Restrictions" combo "Goods" +#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)" +#. item "Streets/Road Restrictions" combo "Horse" +#. item "Streets/Road Restrictions" combo "Motorcycle" +#. item "Streets/Road Restrictions" combo "Motorcar" +#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)" +#. item "Streets/Road Restrictions" combo "Motorboat" +#. item "Streets/Road Restrictions" combo "Boat" +#. item "Ways/Track" combo "Access" +#. item "Ways/Track" combo "Motorcycle" +#. item "Ways/Track" combo "Motorcar" +#. item "Ways/Track Grade 1" combo "Access" +#. item "Ways/Track Grade 1" combo "Motorcycle" +#. item "Ways/Track Grade 1" combo "Motorcar" +#. item "Ways/Track Grade 2" combo "Access" +#. item "Ways/Track Grade 2" combo "Motorcycle" +#. item "Ways/Track Grade 2" combo "Motorcar" +#. item "Ways/Track Grade 3" combo "Access" +#. item "Ways/Track Grade 3" combo "Motorcycle" +#. item "Ways/Track Grade 3" combo "Motorcar" +#. item "Ways/Track Grade 4" combo "Access" +#. item "Ways/Track Grade 4" combo "Motorcycle" +#. item "Ways/Track Grade 4" combo "Motorcar" +#. item "Ways/Track Grade 5" combo "Access" +#. item "Ways/Track Grade 5" combo "Motorcycle" +#. item "Ways/Track Grade 5" combo "Motorcar" +#. item "Ways/Path" combo "Motorcar" +#. item "Ways/Path" combo "Snowmobile" +#. item "Ways/Path" combo "Horse" +#. item "Ways/Path" combo "Bicycle" +#. item "Ways/Path" combo "Ski" +#. item "Ways/Path" combo "Foot" +#. item "Car/Parking" combo "Spaces for Disabled" +#. item "Amenities/Toilets" combo "Fee" +#. item "Health/Pharmacy" combo "Dispensing" +#: build/trans_presets.java:312 build/trans_presets.java:313 +#: build/trans_presets.java:314 build/trans_presets.java:315 +#: build/trans_presets.java:316 build/trans_presets.java:317 +#: build/trans_presets.java:318 build/trans_presets.java:319 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:516 +#: build/trans_presets.java:517 build/trans_presets.java:518 +#: build/trans_presets.java:537 build/trans_presets.java:538 +#: build/trans_presets.java:539 build/trans_presets.java:558 +#: build/trans_presets.java:559 build/trans_presets.java:560 +#: build/trans_presets.java:579 build/trans_presets.java:580 +#: build/trans_presets.java:581 build/trans_presets.java:600 +#: build/trans_presets.java:601 build/trans_presets.java:602 +#: build/trans_presets.java:621 build/trans_presets.java:622 +#: build/trans_presets.java:623 build/trans_presets.java:636 +#: build/trans_presets.java:637 build/trans_presets.java:638 +#: build/trans_presets.java:639 build/trans_presets.java:640 +#: build/trans_presets.java:641 build/trans_presets.java:1368 +#: build/trans_presets.java:2309 build/trans_presets.java:2573 +msgid "yes" +msgstr "да" + #. color permissive #. @@ -12371,5 +12538,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:188 +#: build/trans_presets.java:623 build/trans_style.java:192 msgid "private" msgstr "частный" @@ -12417,5 +12584,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:195 +#: build/trans_presets.java:623 build/trans_style.java:199 msgid "destination" msgstr "назначение" @@ -12452,5 +12619,5 @@ #: build/trans_presets.java:601 build/trans_presets.java:602 #: build/trans_presets.java:621 build/trans_presets.java:622 -#: build/trans_presets.java:623 build/trans_style.java:181 +#: build/trans_presets.java:623 build/trans_style.java:185 msgid "permissive" msgstr "разрешающее" @@ -12469,4 +12636,28 @@ msgid "agricultural" msgstr "сельскохозяйственное" + +#: build/trans_presets.java:312 build/trans_presets.java:313 +#: build/trans_presets.java:314 build/trans_presets.java:315 +#: build/trans_presets.java:316 build/trans_presets.java:317 +#: build/trans_presets.java:318 build/trans_presets.java:319 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:516 +#: build/trans_presets.java:517 build/trans_presets.java:518 +#: build/trans_presets.java:537 build/trans_presets.java:538 +#: build/trans_presets.java:539 build/trans_presets.java:558 +#: build/trans_presets.java:559 build/trans_presets.java:560 +#: build/trans_presets.java:579 build/trans_presets.java:580 +#: build/trans_presets.java:581 build/trans_presets.java:600 +#: build/trans_presets.java:601 build/trans_presets.java:602 +#: build/trans_presets.java:621 build/trans_presets.java:622 +#: build/trans_presets.java:623 build/trans_presets.java:636 +#: build/trans_presets.java:637 build/trans_presets.java:638 +#: build/trans_presets.java:639 build/trans_presets.java:640 +#: build/trans_presets.java:641 build/trans_presets.java:758 +#: build/trans_presets.java:773 build/trans_presets.java:1306 +#: build/trans_presets.java:1368 build/trans_presets.java:2309 +#: build/trans_presets.java:2573 +msgid "no" +msgstr "нет" #: build/trans_presets.java:315 @@ -12682,6 +12873,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:512 -#: build/trans_style.java:520 +#: build/trans_presets.java:338 build/trans_style.java:516 +#: build/trans_style.java:524 msgid "motorway" msgstr "Автобан" @@ -12707,6 +12898,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:528 -#: build/trans_style.java:536 +#: build/trans_presets.java:338 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "trunk" msgstr "Автострада" @@ -12732,6 +12923,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:544 -#: build/trans_style.java:552 +#: build/trans_presets.java:338 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "primary" msgstr "Основная" @@ -12757,6 +12948,6 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:560 -#: build/trans_style.java:568 +#: build/trans_presets.java:338 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "secondary" msgstr "Вторичная" @@ -12770,5 +12961,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:576 +#: build/trans_presets.java:338 build/trans_style.java:580 msgid "tertiary" msgstr "Третичная" @@ -12786,5 +12977,5 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:3084 +#: build/trans_presets.java:338 build/trans_style.java:3095 msgid "residential" msgstr "местного значения" @@ -12802,5 +12993,22 @@ #. #. -#: build/trans_presets.java:338 build/trans_style.java:632 +#. color address +#. 1 +#. 40000 +#. +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_presets.java:338 build/trans_style.java:636 +#: build/trans_style.java:4172 msgid "service" msgstr "Служебная" @@ -12827,6 +13035,6 @@ #. #. color construction -#: build/trans_presets.java:338 build/trans_style.java:834 -#: build/trans_style.java:3149 build/trans_style.java:3150 +#: build/trans_presets.java:338 build/trans_style.java:839 +#: build/trans_style.java:3160 build/trans_style.java:3161 msgid "construction" msgstr "Строительство" @@ -12876,5 +13084,5 @@ #. #. -#: build/trans_presets.java:400 build/trans_style.java:852 +#: build/trans_presets.java:400 build/trans_style.java:857 msgid "roundabout" msgstr "Круг" @@ -13853,5 +14061,5 @@ #. #. -#: build/trans_presets.java:1111 build/trans_style.java:3325 +#: build/trans_presets.java:1111 build/trans_style.java:3336 msgid "marsh" msgstr "Болото" @@ -15582,27 +15790,27 @@ #: build/trans_presets.java:1792 build/trans_presets.java:1801 #: build/trans_presets.java:1810 build/trans_presets.java:1819 -#: build/trans_style.java:3505 build/trans_style.java:3513 -#: build/trans_style.java:3521 build/trans_style.java:3529 -#: build/trans_style.java:3537 build/trans_style.java:3545 -#: build/trans_style.java:3553 build/trans_style.java:3561 -#: build/trans_style.java:3569 build/trans_style.java:3577 -#: build/trans_style.java:3585 build/trans_style.java:3593 -#: build/trans_style.java:3601 build/trans_style.java:3609 -#: build/trans_style.java:3617 build/trans_style.java:3625 -#: build/trans_style.java:3633 build/trans_style.java:3641 -#: build/trans_style.java:3649 build/trans_style.java:3657 -#: build/trans_style.java:3665 build/trans_style.java:3673 -#: build/trans_style.java:3681 build/trans_style.java:3689 -#: build/trans_style.java:3697 build/trans_style.java:3705 -#: build/trans_style.java:3713 build/trans_style.java:3721 -#: build/trans_style.java:3729 build/trans_style.java:3737 -#: build/trans_style.java:3745 build/trans_style.java:3753 -#: build/trans_style.java:3761 build/trans_style.java:3769 -#: build/trans_style.java:3777 build/trans_style.java:3785 -#: build/trans_style.java:3793 build/trans_style.java:3801 -#: build/trans_style.java:3809 build/trans_style.java:3817 -#: build/trans_style.java:3825 build/trans_style.java:3833 -#: build/trans_style.java:3841 build/trans_style.java:3849 -#: build/trans_style.java:3857 +#: build/trans_style.java:3516 build/trans_style.java:3524 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 msgid "sport" msgstr "спорт" @@ -17359,5 +17567,5 @@ #: build/trans_presets.java:2439 msgid "Edit Beverages Shop" -msgstr "" +msgstr "Редактировать магазин напитков" #. item "Shops/Beverages" text "Name" @@ -18440,8 +18648,8 @@ #. #. -#: build/trans_presets.java:2994 build/trans_style.java:209 -#: build/trans_style.java:648 build/trans_style.java:863 -#: build/trans_style.java:871 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 +#: build/trans_presets.java:2994 build/trans_style.java:213 +#: build/trans_style.java:652 build/trans_style.java:868 +#: build/trans_style.java:876 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 msgid "bicycle" msgstr "велосипедный" @@ -18510,8 +18718,8 @@ #. #. -#: build/trans_presets.java:2994 build/trans_style.java:223 -#: build/trans_style.java:656 build/trans_style.java:664 -#: build/trans_style.java:672 build/trans_style.java:673 -#: build/trans_style.java:681 +#: build/trans_presets.java:2994 build/trans_style.java:227 +#: build/trans_style.java:660 build/trans_style.java:668 +#: build/trans_style.java:676 build/trans_style.java:677 +#: build/trans_style.java:685 msgid "foot" msgstr "пеший" @@ -18537,5 +18745,5 @@ #. #. -#: build/trans_presets.java:2994 build/trans_style.java:1163 +#: build/trans_presets.java:2994 build/trans_style.java:1168 msgid "subway" msgstr "метро" @@ -18665,4 +18873,5 @@ #. #. +#. #. 1 #. 40000 @@ -18671,4 +18880,5 @@ #. #. +#. #. 1 #. 40000 @@ -18677,4 +18887,5 @@ #. #. +#. #. 1 #. 40000 @@ -18683,4 +18894,5 @@ #. #. +#. #. 1 #. 40000 @@ -18744,7 +18956,7 @@ #. #. -#: build/trans_style.java:108 build/trans_style.java:122 -#: build/trans_style.java:129 build/trans_style.java:136 -#: build/trans_style.java:143 +#: build/trans_style.java:112 build/trans_style.java:126 +#: build/trans_style.java:133 build/trans_style.java:140 +#: build/trans_style.java:147 msgid "bridge" msgstr "мост" @@ -18802,4 +19014,5 @@ #. #. +#. #. 1 #. 50000 @@ -18925,7 +19138,7 @@ #. #. -#. color address -#. 1 -#. 40000 +#. color service +#. 1 +#. 50000 #. #. @@ -19008,15 +19221,15 @@ #. #. -#: build/trans_style.java:115 build/trans_style.java:150 -#: build/trans_style.java:157 build/trans_style.java:164 -#: build/trans_style.java:592 build/trans_style.java:788 -#: build/trans_style.java:1113 build/trans_style.java:2364 -#: build/trans_style.java:3316 build/trans_style.java:3317 -#: build/trans_style.java:3871 build/trans_style.java:4155 -#: build/trans_style.java:4164 build/trans_style.java:4173 -#: build/trans_style.java:4182 build/trans_style.java:4191 -#: build/trans_style.java:4200 build/trans_style.java:4209 -#: build/trans_style.java:4210 build/trans_style.java:4219 -#: build/trans_style.java:4228 +#: build/trans_style.java:119 build/trans_style.java:154 +#: build/trans_style.java:161 build/trans_style.java:168 +#: build/trans_style.java:596 build/trans_style.java:793 +#: build/trans_style.java:1118 build/trans_style.java:2375 +#: build/trans_style.java:3327 build/trans_style.java:3328 +#: build/trans_style.java:3882 build/trans_style.java:4182 +#: build/trans_style.java:4191 build/trans_style.java:4200 +#: build/trans_style.java:4209 build/trans_style.java:4218 +#: build/trans_style.java:4227 build/trans_style.java:4236 +#: build/trans_style.java:4237 build/trans_style.java:4246 +#: build/trans_style.java:4255 msgid "deprecated" msgstr "уменьшать" @@ -19058,5 +19271,5 @@ #. #. -#: build/trans_style.java:251 build/trans_style.java:640 +#: build/trans_style.java:255 build/trans_style.java:644 msgid "horse" msgstr "лошадь" @@ -19266,11 +19479,11 @@ #. #. color barrier -#: build/trans_style.java:358 build/trans_style.java:371 -#: build/trans_style.java:372 build/trans_style.java:385 -#: build/trans_style.java:386 build/trans_style.java:405 -#: build/trans_style.java:406 build/trans_style.java:413 -#: build/trans_style.java:426 build/trans_style.java:427 -#: build/trans_style.java:440 build/trans_style.java:441 -#: build/trans_style.java:454 build/trans_style.java:455 +#: build/trans_style.java:362 build/trans_style.java:375 +#: build/trans_style.java:376 build/trans_style.java:389 +#: build/trans_style.java:390 build/trans_style.java:409 +#: build/trans_style.java:410 build/trans_style.java:417 +#: build/trans_style.java:430 build/trans_style.java:431 +#: build/trans_style.java:444 build/trans_style.java:445 +#: build/trans_style.java:458 build/trans_style.java:459 msgid "barrier" msgstr "ограждение" @@ -19308,6 +19521,6 @@ #. #. -#: build/trans_style.java:584 build/trans_style.java:600 -#: build/trans_style.java:616 build/trans_style.java:624 +#: build/trans_style.java:588 build/trans_style.java:604 +#: build/trans_style.java:620 build/trans_style.java:628 msgid "street" msgstr "улица" @@ -19363,7 +19576,7 @@ #. #. -#: build/trans_style.java:608 build/trans_style.java:905 -#: build/trans_style.java:913 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 +#: build/trans_style.java:612 build/trans_style.java:910 +#: build/trans_style.java:918 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 msgid "highway_track" msgstr "шоссе" @@ -19419,8 +19632,8 @@ #. #. color rail -#: build/trans_style.java:689 build/trans_style.java:1137 -#: build/trans_style.java:1195 build/trans_style.java:1203 -#: build/trans_style.java:1212 build/trans_style.java:1220 -#: build/trans_style.java:1221 +#: build/trans_style.java:693 build/trans_style.java:1142 +#: build/trans_style.java:1206 build/trans_style.java:1214 +#: build/trans_style.java:1223 build/trans_style.java:1231 +#: build/trans_style.java:1232 msgid "rail" msgstr "железная дорога" @@ -19441,5 +19654,5 @@ #. #. -#: build/trans_style.java:803 +#: build/trans_style.java:808 msgid "services" msgstr "услуги" @@ -19453,5 +19666,5 @@ #. #. -#: build/trans_style.java:811 +#: build/trans_style.java:816 msgid "ford" msgstr "брод" @@ -19472,5 +19685,5 @@ #. #. -#: build/trans_style.java:826 +#: build/trans_style.java:831 msgid "turningcircle" msgstr "кольцо" @@ -19485,5 +19698,5 @@ #. #. -#: build/trans_style.java:843 +#: build/trans_style.java:848 msgid "emergency_access_point" msgstr "пункт неотложной помощи" @@ -19498,5 +19711,5 @@ #. #. color riverbank -#: build/trans_style.java:955 build/trans_style.java:956 +#: build/trans_style.java:960 build/trans_style.java:961 msgid "riverbank" msgstr "берег реки" @@ -19510,5 +19723,5 @@ #. #. -#: build/trans_style.java:972 +#: build/trans_style.java:977 msgid "stream" msgstr "поток" @@ -19522,5 +19735,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "dock" msgstr "док" @@ -19548,5 +19761,5 @@ #. #. -#: build/trans_style.java:1010 +#: build/trans_style.java:1015 msgid "aqueduct" msgstr "акведук" @@ -19714,13 +19927,13 @@ #. #. -#: build/trans_style.java:1019 build/trans_style.java:1048 -#: build/trans_style.java:1056 build/trans_style.java:1057 -#: build/trans_style.java:1065 build/trans_style.java:1499 -#: build/trans_style.java:1506 build/trans_style.java:1515 -#: build/trans_style.java:1523 build/trans_style.java:1548 -#: build/trans_style.java:1556 build/trans_style.java:1564 -#: build/trans_style.java:1572 build/trans_style.java:1579 -#: build/trans_style.java:1588 build/trans_style.java:1596 -#: build/trans_style.java:1604 build/trans_style.java:1612 +#: build/trans_style.java:1024 build/trans_style.java:1053 +#: build/trans_style.java:1061 build/trans_style.java:1062 +#: build/trans_style.java:1070 build/trans_style.java:1510 +#: build/trans_style.java:1517 build/trans_style.java:1526 +#: build/trans_style.java:1534 build/trans_style.java:1559 +#: build/trans_style.java:1567 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1590 +#: build/trans_style.java:1599 build/trans_style.java:1607 +#: build/trans_style.java:1615 build/trans_style.java:1623 msgid "manmade" msgstr "искусственный" @@ -19782,7 +19995,7 @@ #. #. -#: build/trans_style.java:1075 build/trans_style.java:1090 -#: build/trans_style.java:1105 build/trans_style.java:1121 -#: build/trans_style.java:1129 +#: build/trans_style.java:1080 build/trans_style.java:1095 +#: build/trans_style.java:1110 build/trans_style.java:1126 +#: build/trans_style.java:1134 msgid "railwaypoint" msgstr "железнодорожная станция" @@ -19805,10 +20018,10 @@ #. #. -#: build/trans_style.java:1146 build/trans_style.java:1155 +#: build/trans_style.java:1151 build/trans_style.java:1160 msgid "otherrail" msgstr "другая жд дорога" #. color otherrail -#: build/trans_style.java:1147 +#: build/trans_style.java:1152 msgid "railover" msgstr "жд дорога сверху" @@ -19828,7 +20041,10 @@ #. #. +#. +#. #. #. #. color oldrail +#. color oldrail #. #. 1 @@ -19836,8 +20052,12 @@ #. #. +#. +#. #. #. -#: build/trans_style.java:1171 build/trans_style.java:1179 -#: build/trans_style.java:1187 +#. color oldrail +#: build/trans_style.java:1176 build/trans_style.java:1186 +#: build/trans_style.java:1187 build/trans_style.java:1197 +#: build/trans_style.java:1198 msgid "oldrail" msgstr "Старая жд дорога" @@ -19882,6 +20102,6 @@ #. #. -#: build/trans_style.java:1251 build/trans_style.java:1252 -#: build/trans_style.java:1284 +#: build/trans_style.java:1262 build/trans_style.java:1263 +#: build/trans_style.java:1295 msgid "aeroway" msgstr "воздушная трасса" @@ -19895,5 +20115,5 @@ #. #. -#: build/trans_style.java:1260 +#: build/trans_style.java:1271 msgid "terminal" msgstr "пассажирский терминал" @@ -19915,5 +20135,5 @@ #. #. -#: build/trans_style.java:1268 build/trans_style.java:1276 +#: build/trans_style.java:1279 build/trans_style.java:1287 msgid "aeroway_dark" msgstr "воздушная трасса темная" @@ -19927,5 +20147,5 @@ #. #. -#: build/trans_style.java:1292 +#: build/trans_style.java:1303 msgid "aeroway_light" msgstr "воздушная трасса светлая" @@ -19973,7 +20193,7 @@ #. #. -#: build/trans_style.java:1302 build/trans_style.java:1310 -#: build/trans_style.java:1318 build/trans_style.java:1326 -#: build/trans_style.java:1334 +#: build/trans_style.java:1313 build/trans_style.java:1321 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 msgid "aerialway" msgstr "воздушная трасса" @@ -19990,5 +20210,5 @@ #. #. color piste_easy -#: build/trans_style.java:1344 build/trans_style.java:1345 +#: build/trans_style.java:1355 build/trans_style.java:1356 msgid "piste_easy" msgstr "легкая трасси" @@ -20003,5 +20223,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1353 build/trans_style.java:1354 +#: build/trans_style.java:1364 build/trans_style.java:1365 msgid "piste_intermediate" msgstr "промежуточная трасса" @@ -20016,5 +20236,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1362 build/trans_style.java:1363 +#: build/trans_style.java:1373 build/trans_style.java:1374 msgid "piste_advanced" msgstr "продвинутая трасса" @@ -20029,5 +20249,5 @@ #. #. color piste_expert -#: build/trans_style.java:1371 build/trans_style.java:1372 +#: build/trans_style.java:1382 build/trans_style.java:1383 msgid "piste_expert" msgstr "специалист лыжной трассы" @@ -20042,5 +20262,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1380 build/trans_style.java:1381 +#: build/trans_style.java:1391 build/trans_style.java:1392 msgid "piste_freeride" msgstr "бесплатная трасса" @@ -20055,5 +20275,5 @@ #. #. color piste_novice -#: build/trans_style.java:1389 build/trans_style.java:1390 +#: build/trans_style.java:1400 build/trans_style.java:1401 msgid "piste_novice" msgstr "трасса для новичков" @@ -20158,10 +20378,10 @@ #. #. -#: build/trans_style.java:1401 build/trans_style.java:1408 -#: build/trans_style.java:1417 build/trans_style.java:1425 -#: build/trans_style.java:1433 build/trans_style.java:1441 -#: build/trans_style.java:1449 build/trans_style.java:1457 -#: build/trans_style.java:1465 build/trans_style.java:1473 -#: build/trans_style.java:1481 build/trans_style.java:1489 +#: build/trans_style.java:1412 build/trans_style.java:1419 +#: build/trans_style.java:1428 build/trans_style.java:1436 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 msgid "power" msgstr "энергия" @@ -20175,5 +20395,5 @@ #. #. color pier -#: build/trans_style.java:1530 build/trans_style.java:1531 +#: build/trans_style.java:1541 build/trans_style.java:1542 msgid "pier" msgstr "плотина" @@ -20187,5 +20407,5 @@ #. #. -#: build/trans_style.java:1539 +#: build/trans_style.java:1550 msgid "pipeline" msgstr "трубопровод" @@ -20313,12 +20533,12 @@ #. #. -#: build/trans_style.java:1622 build/trans_style.java:1630 -#: build/trans_style.java:1638 build/trans_style.java:1646 -#: build/trans_style.java:1654 build/trans_style.java:1662 -#: build/trans_style.java:1678 build/trans_style.java:1686 -#: build/trans_style.java:1694 build/trans_style.java:1702 -#: build/trans_style.java:1710 build/trans_style.java:1718 -#: build/trans_style.java:1726 build/trans_style.java:1734 -#: build/trans_style.java:1742 +#: build/trans_style.java:1633 build/trans_style.java:1641 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1689 build/trans_style.java:1697 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 msgid "leisure" msgstr "свободное время" @@ -20332,5 +20552,5 @@ #. #. -#: build/trans_style.java:1670 +#: build/trans_style.java:1681 msgid "marina" msgstr "гавань" @@ -20402,8 +20622,8 @@ #. #. -#: build/trans_style.java:1752 build/trans_style.java:1760 -#: build/trans_style.java:1768 build/trans_style.java:1776 -#: build/trans_style.java:1784 build/trans_style.java:1792 -#: build/trans_style.java:1800 build/trans_style.java:1808 +#: build/trans_style.java:1763 build/trans_style.java:1771 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 msgid "amenity" msgstr "использование" @@ -20505,10 +20725,10 @@ #. #. -#: build/trans_style.java:1816 build/trans_style.java:1824 -#: build/trans_style.java:1832 build/trans_style.java:1840 -#: build/trans_style.java:1848 build/trans_style.java:1856 -#: build/trans_style.java:1864 build/trans_style.java:1872 -#: build/trans_style.java:1880 build/trans_style.java:1887 -#: build/trans_style.java:1896 build/trans_style.java:1904 +#: build/trans_style.java:1827 build/trans_style.java:1835 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1898 +#: build/trans_style.java:1907 build/trans_style.java:1915 msgid "amenity_traffic" msgstr "режим использования" @@ -20894,22 +21114,22 @@ #. #. -#: build/trans_style.java:1912 build/trans_style.java:1920 -#: build/trans_style.java:1928 build/trans_style.java:1936 -#: build/trans_style.java:1944 build/trans_style.java:1952 -#: build/trans_style.java:1960 build/trans_style.java:1968 -#: build/trans_style.java:2083 build/trans_style.java:2091 -#: build/trans_style.java:2098 build/trans_style.java:2107 -#: build/trans_style.java:2115 build/trans_style.java:2123 -#: build/trans_style.java:2131 build/trans_style.java:2139 -#: build/trans_style.java:2147 build/trans_style.java:2155 -#: build/trans_style.java:2218 build/trans_style.java:2226 -#: build/trans_style.java:2234 build/trans_style.java:2243 -#: build/trans_style.java:2251 build/trans_style.java:2258 -#: build/trans_style.java:2266 build/trans_style.java:2274 -#: build/trans_style.java:2282 build/trans_style.java:2290 -#: build/trans_style.java:2298 build/trans_style.java:2306 -#: build/trans_style.java:2314 build/trans_style.java:2322 -#: build/trans_style.java:2330 build/trans_style.java:2338 -#: build/trans_style.java:2347 build/trans_style.java:2355 +#: build/trans_style.java:1923 build/trans_style.java:1931 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:2094 build/trans_style.java:2102 +#: build/trans_style.java:2109 build/trans_style.java:2118 +#: build/trans_style.java:2126 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2229 build/trans_style.java:2237 +#: build/trans_style.java:2245 build/trans_style.java:2254 +#: build/trans_style.java:2262 build/trans_style.java:2269 +#: build/trans_style.java:2277 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2358 build/trans_style.java:2366 msgid "amenity_light" msgstr "легкое использование" @@ -20941,6 +21161,6 @@ #. #. -#: build/trans_style.java:1976 build/trans_style.java:1984 -#: build/trans_style.java:3235 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:3246 msgid "light_water" msgstr "легкая вода" @@ -21001,8 +21221,8 @@ #. #. -#: build/trans_style.java:2162 build/trans_style.java:2170 -#: build/trans_style.java:2178 build/trans_style.java:2187 -#: build/trans_style.java:2194 build/trans_style.java:2202 -#: build/trans_style.java:2210 +#: build/trans_style.java:2173 build/trans_style.java:2181 +#: build/trans_style.java:2189 build/trans_style.java:2198 +#: build/trans_style.java:2205 build/trans_style.java:2213 +#: build/trans_style.java:2221 msgid "health" msgstr "здоровье" @@ -21355,26 +21575,26 @@ #. #. -#: build/trans_style.java:2374 build/trans_style.java:2382 -#: build/trans_style.java:2390 build/trans_style.java:2398 -#: build/trans_style.java:2406 build/trans_style.java:2414 -#: build/trans_style.java:2422 build/trans_style.java:2430 -#: build/trans_style.java:2438 build/trans_style.java:2446 -#: build/trans_style.java:2454 build/trans_style.java:2462 -#: build/trans_style.java:2470 build/trans_style.java:2478 -#: build/trans_style.java:2486 build/trans_style.java:2494 -#: build/trans_style.java:2502 build/trans_style.java:2510 -#: build/trans_style.java:2518 build/trans_style.java:2526 -#: build/trans_style.java:2534 build/trans_style.java:2542 -#: build/trans_style.java:2550 build/trans_style.java:2558 -#: build/trans_style.java:2566 build/trans_style.java:2574 -#: build/trans_style.java:2582 build/trans_style.java:2590 -#: build/trans_style.java:2598 build/trans_style.java:2606 -#: build/trans_style.java:2614 build/trans_style.java:2622 -#: build/trans_style.java:2630 build/trans_style.java:2638 -#: build/trans_style.java:2646 build/trans_style.java:2654 -#: build/trans_style.java:2662 build/trans_style.java:2670 -#: build/trans_style.java:2678 build/trans_style.java:2686 -#: build/trans_style.java:2694 build/trans_style.java:2702 -#: build/trans_style.java:2711 +#: build/trans_style.java:2385 build/trans_style.java:2393 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2722 msgid "shop" msgstr "Магазин" @@ -21446,8 +21666,8 @@ #. #. -#: build/trans_style.java:2721 build/trans_style.java:2729 -#: build/trans_style.java:2737 build/trans_style.java:2745 -#: build/trans_style.java:2753 build/trans_style.java:2761 -#: build/trans_style.java:2769 build/trans_style.java:2777 +#: build/trans_style.java:2732 build/trans_style.java:2740 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 msgid "hotel" msgstr "отель" @@ -21597,9 +21817,9 @@ #. #. -#: build/trans_style.java:2785 build/trans_style.java:2793 -#: build/trans_style.java:2801 build/trans_style.java:2809 -#: build/trans_style.java:2817 build/trans_style.java:2825 -#: build/trans_style.java:2826 build/trans_style.java:2834 -#: build/trans_style.java:2850 build/trans_style.java:2921 +#: build/trans_style.java:2796 build/trans_style.java:2804 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2837 build/trans_style.java:2845 +#: build/trans_style.java:2861 build/trans_style.java:2932 msgid "tourism" msgstr "туризм" @@ -21671,8 +21891,8 @@ #. #. -#: build/trans_style.java:2931 build/trans_style.java:2939 -#: build/trans_style.java:2947 build/trans_style.java:2955 -#: build/trans_style.java:2963 build/trans_style.java:2971 -#: build/trans_style.java:2979 build/trans_style.java:2987 +#: build/trans_style.java:2942 build/trans_style.java:2950 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 msgid "historic" msgstr "исторический" @@ -21743,8 +21963,8 @@ #. #. -#: build/trans_style.java:2996 build/trans_style.java:3004 -#: build/trans_style.java:3012 build/trans_style.java:3020 -#: build/trans_style.java:3068 build/trans_style.java:3076 -#: build/trans_style.java:3174 build/trans_style.java:3182 +#: build/trans_style.java:3007 build/trans_style.java:3015 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3079 build/trans_style.java:3087 +#: build/trans_style.java:3185 build/trans_style.java:3193 msgid "green" msgstr "зеленый" @@ -21758,5 +21978,5 @@ #. #. -#: build/trans_style.java:3028 +#: build/trans_style.java:3039 msgid "quarry" msgstr "карьер" @@ -21770,5 +21990,5 @@ #. #. -#: build/trans_style.java:3036 +#: build/trans_style.java:3047 msgid "landfill" msgstr "мусорная свалка" @@ -21790,5 +22010,5 @@ #. #. -#: build/trans_style.java:3044 build/trans_style.java:3052 +#: build/trans_style.java:3055 build/trans_style.java:3063 msgid "basin" msgstr "водоём" @@ -21802,5 +22022,5 @@ #. #. -#: build/trans_style.java:3060 +#: build/trans_style.java:3071 msgid "forest" msgstr "лес" @@ -21814,5 +22034,5 @@ #. #. -#: build/trans_style.java:3092 +#: build/trans_style.java:3103 msgid "farmyard" msgstr "двор фермы" @@ -21835,5 +22055,5 @@ #. #. -#: build/trans_style.java:3101 build/trans_style.java:3109 +#: build/trans_style.java:3112 build/trans_style.java:3120 msgid "retail" msgstr "розничная продажа" @@ -21847,5 +22067,5 @@ #. #. -#: build/trans_style.java:3117 +#: build/trans_style.java:3128 msgid "industrial" msgstr "промышленный" @@ -21859,5 +22079,5 @@ #. #. -#: build/trans_style.java:3125 +#: build/trans_style.java:3136 msgid "brownfield" msgstr "заброшенная застройка" @@ -21871,5 +22091,5 @@ #. #. -#: build/trans_style.java:3133 +#: build/trans_style.java:3144 msgid "greenfield" msgstr "участок для застройки" @@ -21883,5 +22103,5 @@ #. #. -#: build/trans_style.java:3141 +#: build/trans_style.java:3152 msgid "railland" msgstr "жд разъезд" @@ -21938,7 +22158,7 @@ #. #. -#: build/trans_style.java:3158 build/trans_style.java:3193 -#: build/trans_style.java:3201 build/trans_style.java:3209 -#: build/trans_style.java:3217 build/trans_style.java:3225 +#: build/trans_style.java:3169 build/trans_style.java:3204 +#: build/trans_style.java:3212 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 msgid "military" msgstr "военный" @@ -21952,5 +22172,5 @@ #. #. -#: build/trans_style.java:3166 +#: build/trans_style.java:3177 msgid "cemetery" msgstr "кладбище" @@ -21963,5 +22183,5 @@ #. #. -#: build/trans_style.java:3242 +#: build/trans_style.java:3253 msgid "peak" msgstr "пик" @@ -21976,5 +22196,5 @@ #. #. -#: build/trans_style.java:3251 +#: build/trans_style.java:3262 msgid "glacier" msgstr "ледник" @@ -21988,5 +22208,5 @@ #. #. -#: build/trans_style.java:3259 +#: build/trans_style.java:3270 msgid "volcano" msgstr "вулкан" @@ -22041,8 +22261,8 @@ #. #. -#: build/trans_style.java:3267 build/trans_style.java:3268 -#: build/trans_style.java:3276 build/trans_style.java:3292 -#: build/trans_style.java:3365 build/trans_style.java:3373 -#: build/trans_style.java:3381 +#: build/trans_style.java:3278 build/trans_style.java:3279 +#: build/trans_style.java:3287 build/trans_style.java:3303 +#: build/trans_style.java:3376 build/trans_style.java:3384 +#: build/trans_style.java:3392 msgid "natural" msgstr "природный" @@ -22056,5 +22276,5 @@ #. #. -#: build/trans_style.java:3284 +#: build/trans_style.java:3295 msgid "scrub" msgstr "кустарник" @@ -22068,5 +22288,5 @@ #. #. -#: build/trans_style.java:3300 +#: build/trans_style.java:3311 msgid "heath" msgstr "здоровье" @@ -22080,5 +22300,5 @@ #. #. -#: build/trans_style.java:3308 +#: build/trans_style.java:3319 msgid "wood" msgstr "лес" @@ -22092,5 +22312,5 @@ #. #. -#: build/trans_style.java:3349 +#: build/trans_style.java:3360 msgid "mud" msgstr "грязь" @@ -22104,5 +22324,5 @@ #. #. -#: build/trans_style.java:3357 +#: build/trans_style.java:3368 msgid "beach" msgstr "пляж" @@ -22180,8 +22400,8 @@ #. #. -#: build/trans_style.java:3397 build/trans_style.java:3405 -#: build/trans_style.java:3413 build/trans_style.java:3421 -#: build/trans_style.java:3429 build/trans_style.java:3437 -#: build/trans_style.java:3445 build/trans_style.java:3453 +#: build/trans_style.java:3408 build/trans_style.java:3416 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 msgid "route" msgstr "маршрут" @@ -22229,7 +22449,7 @@ #. #. -#: build/trans_style.java:3463 build/trans_style.java:3471 -#: build/trans_style.java:3479 build/trans_style.java:3487 -#: build/trans_style.java:3495 +#: build/trans_style.java:3474 build/trans_style.java:3482 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 msgid "boundary" msgstr "граница" @@ -22371,10 +22591,10 @@ #. #. -#: build/trans_style.java:3919 build/trans_style.java:3927 -#: build/trans_style.java:3935 build/trans_style.java:3943 -#: build/trans_style.java:3951 build/trans_style.java:3959 -#: build/trans_style.java:3967 build/trans_style.java:3975 -#: build/trans_style.java:3983 build/trans_style.java:3991 -#: build/trans_style.java:3999 build/trans_style.java:4007 +#: build/trans_style.java:3930 build/trans_style.java:3938 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 msgid "place" msgstr "место" @@ -22422,6 +22642,6 @@ #. #. -#: build/trans_style.java:4124 build/trans_style.java:4131 -#: build/trans_style.java:4138 build/trans_style.java:4145 +#: build/trans_style.java:4135 build/trans_style.java:4142 +#: build/trans_style.java:4149 build/trans_style.java:4156 msgid "address" msgstr "адрес" @@ -22652,10 +22872,10 @@ msgstr "Landsat" -#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& #: build/trans_wms.java:6 msgid "Open Aerial Map" msgstr "Открыте Воздушные Карты" -#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& #. fails with division by zero error #: build/trans_wms.java:8 @@ -22663,5 +22883,5 @@ msgstr "карты NPE" -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& #: build/trans_wms.java:9 msgid "NPE Maps (Tim)" @@ -22669,107 +22889,145 @@ #. http://dev.openstreetmap.org/~timsc/wms2/map.php? -#. different forms for Yahoo -#. must be yahoo:// -#. The {0} in the commandline is for the URL -#. output must be on stdout +#. +#. different forms for web access +#. must be html: +#: build/trans_wms.java:13 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? #: build/trans_wms.java:14 -msgid "YAHOO (GNOME)" -msgstr "YAHOO (GNOME)" - -#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout +#, fuzzy +msgid "OpenStreetMap" +msgstr "Данные OpenStreetMap" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 -msgid "YAHOO (GNOME Fix)" -msgstr "YAHOO (GNOME Fix)" - -#. yahoo://gnome-web-photo-fixed {0} +#, fuzzy +msgid "OpenCycleMap" +msgstr "Велодорожка" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 -msgid "YAHOO (WebKit)" -msgstr "YAHOO (WebKit)" - -#. yahoo://webkit-image {0} -#: build/trans_wms.java:17 -msgid "YAHOO (WebKit GTK)" -msgstr "YAHOO (WebKit GTK)" - -#. yahoo://webkit-image-gtk {0} +msgid "TilesAtHome" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? +#. +#. #. only for Germany -#: build/trans_wms.java:19 -msgid "Oberpfalz Geofabrik.de" -msgstr "подложка Geofabrik.de" - -#. http://oberpfalz.geofabrik.de/wms4josm? #: build/trans_wms.java:20 msgid "Streets NRW Geofabrik.de" msgstr "Улицы NRW Geofabrik.de" -#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms -#. Terraserver USCG- High resolution maps +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 msgid "Terraserver Topo" msgstr "" -#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg +#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& #: build/trans_wms.java:23 msgid "Terraserver Urban" -msgstr "" +msgstr "Terraserver Urban" + +#~ msgid "Data Layer" +#~ msgstr "Слой данных" + +#~ msgid "Change" +#~ msgstr "Изменить" + +#~ msgid "Rotate" +#~ msgstr "Вращать" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" #~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." #~ 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 "Удалить мои" +#~ "Проекция \"{0}\" разработана только\n" +#~ "для широт между 46.1° и 57°.\n" +#~ "Используйте другую проекцию, если не пользуетесь\n" +#~ "французским сервером WMS. Не загружайте \n" +#~ "никаких данных на сервер после этого сообщения." #~ 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.
" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." #~ msgstr "" -#~ "OSM примитив с id {0} был удален
с сервера " -#~ "другим картографом.

Нажмите {1} для сохранения " -#~ "вашего примитива и игнорирования попытки удаления.
Ваш примитив будет " -#~ "добавлен с новым id.
Нажмите {2} для согласия с " -#~ "удалением примитива, (ваш примитив будет удален).
Нажмите {3} для отмены.
" +#~ "Проекция \"{0}\" разработана только для\n" +#~ "широт между 45.7° и 47.9° и долгот между 5.7° и 10.6°.\n" +#~ "Если Вы не работаете над данными,\n" +#~ "относящимися к Швейцарии либо Лихтенштену, \n" +#~ "воспользуйтесь другой системой проекции .\n" +#~ "Не делайте выгрузку данных после данного сообщения." + +#~ msgid "Conflicts: {0}" +#~ msgstr "Конфликты: {0}" + +#~ msgid "Tagging preset source" +#~ msgstr "Источник предустановок тегов" #~ msgid "" -#~ "There are {0} primitives
selected for " -#~ "individual update. Please reduce the selection
to max. {1} primitives." -#~ "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Выбрано {0} примитивов
для индивидуального " -#~ "обновления. Пожалуйста, уменьшите выделение
до макс. {1} примитивов." - -#~ msgid "Selection too big" -#~ msgstr "Выборка слишком большая" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Картинка {0} не существует или произошла ошибка чтения." +#~ "Источник (URL или имя файла) файла с предустановками тегов. См. http://" +#~ "josm.openstreetmap.de/wiki/TaggingPresets для большей информации." + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Добавить новый источник предустановки тегов в список." + +#~ msgid "Tagging preset sources" +#~ msgstr "Источники предустановок тегов" + +#~ msgid "Import TCX File..." +#~ msgstr "Импортировать файл TCX..." + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Импортировать файл TCX как трек GPS" + +#~ msgid "Overlap tiles" +#~ msgstr "Накладывающиеся части" + +#~ msgid "% of lat:" +#~ msgstr "% широты:" + +#~ msgid "% of lon:" +#~ msgstr "% долготы:" + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Прямо загрузить TCX файлы из JOSM." + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "подложка Geofabrik.de" #~ msgid "Uploading data" #~ msgstr "Загрузка данных" +#~ msgid "Not implemented yet." +#~ msgstr "Ещё не реализовано." + #~ msgid "Email" #~ msgstr "Электронная почта" @@ -22777,4 +23035,7 @@ #~ msgid "Resolve Conflicts" #~ msgstr "Разрешить конфликты" + +#~ msgid "Object" +#~ msgstr "Объект" #~ msgid "{0} object has conflicts:" @@ -22816,4 +23077,20 @@ #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Разрешить {0} конфликтов в {1} объектах" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Нажмите \"Обновить\" для обновления списка" + +#~ msgid "Revert" +#~ msgstr "Откатить" + +#~ msgid "Date" +#~ msgstr "Дата" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Откатить состояние выбранных объектов до версии, указанной в списке " +#~ "правок." #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." @@ -22988,4 +23265,11 @@ #~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже " +#~ "загруженных элементов есть история." + +#~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" @@ -23041,2 +23325,50 @@ #~ msgid "Data upload failed for unknown reason" #~ msgstr "Выгрузка прервана по неизвестной причине" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Картинка {0} не существует или произошла ошибка чтения." + +#~ 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 "Выборка слишком большая"