Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 20704) +++ applications/editors/josm/i18n/po/ru.po (revision 20716) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-27 19:25+0100\n" -"PO-Revision-Date: 2010-03-27 17:32+0000\n" -"Last-Translator: Calibrator \n" +"POT-Creation-Date: 2010-03-28 16:10+0200\n" +"PO-Revision-Date: 2010-03-27 20:44+0000\n" +"Last-Translator: bastik \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-03-27 18:14+0000\n" +"X-Launchpad-Export-Date: 2010-03-28 13:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -3024,7 +3024,7 @@ #: ../core/src/org/openstreetmap/josm/command/ChangeNodesCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Changed nodes of {0}" -msgstr "Изменить точку {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 @@ -15052,5 +15052,5 @@ "

Сообщение об ошибке:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:354 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16342,12 +16342,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:42 -#, fuzzy msgid "Add a new municipality layer" -msgstr "Добавить новый слой" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44 -#, fuzzy msgid "Commune" -msgstr "коммуна" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 @@ -17734,7 +17732,6 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:511 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:833 -#, fuzzy msgid "Create Stops from GPX ..." -msgstr "Относятся к GPX" +msgstr "" #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:512 @@ -17743,12 +17740,11 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:525 -#, fuzzy msgid "Tracks" -msgstr "Грунтовка" +msgstr "" #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:1103 -#, fuzzy, java-format +#, java-format msgid "IOException \"{0}\" occurred" -msgstr "Произошла ошибка." +msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 @@ -18302,21 +18298,17 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:67 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:111 -#, fuzzy, java-format +#, java-format msgid "" "Warning: illegal value ''{0}'' for preference key ''{1}''. Falling back to " "default value ''shift ctrl T''." msgstr "" -"Неожиданное значение ''{0}'' для настройки ''{1}''. Принимается значение " -"''ask''." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90 -#, fuzzy msgid "Create/Edit turn restriction..." -msgstr "Создать новое ограничение на поворот" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92 -#, fuzzy msgid "Create or edit a turn restriction." -msgstr "Создать новое ограничение на поворот" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:41 @@ -18338,7 +18330,7 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:425 -#, fuzzy, java-format +#, java-format msgid "Cannot find object with id ''{0}'' in layer ''{1}''" -msgstr "Править ограничение на поворот #{0} в слое ''{1}''" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:428 @@ -18350,22 +18342,18 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102 -#, fuzzy msgid "Clear the selected roles or delete the selected members" -msgstr "Задать роль для выделенных участников" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:128 -#, fuzzy msgid "Insert new relation members from object in the clipboard" -msgstr "Вставить объект 'via' (через) из буфера обмена" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:167 -#, fuzzy msgid "Move the selected relation members down by one position" -msgstr "Передвинуть выделенный объект \"через\", вниз на одну позицию" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:194 -#, fuzzy msgid "Move the selected relation members up by one position" -msgstr "Передвинуть выделенный объект \"через\", вверх на одну позицию" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134 @@ -18374,12 +18362,10 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138 -#, fuzzy msgid "Edit the raw tags and members of this turn restriction" -msgstr "Править основные атрибуты ограничения на поворот" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141 -#, fuzzy msgid "Errors/Warnings" -msgstr "Предупреждения" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:142 @@ -18388,17 +18374,17 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:280 -#, fuzzy, java-format +#, java-format msgid "Create a new turn restriction in layer ''{0}''" -msgstr "Создать новое ограничение на поворот в слое ''{0}''" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:282 -#, fuzzy, java-format +#, java-format msgid "Edit a new turn restriction in layer ''{0}''" -msgstr "Править новое ограничение на поворот в слое ''{0}''" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:284 -#, fuzzy, java-format +#, java-format msgid "Edit turn restriction ''{0}'' in layer ''{1}''" -msgstr "Править ограничение на поворот #{0} в слое ''{1}''" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:398 @@ -18412,21 +18398,16 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:406 -#, fuzzy msgid "Do you want to save anyway?" -msgstr "Вы всё равно хотите удалить их?" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:409 -#, fuzzy msgid "Yes, save anyway" -msgstr "Сохранить в любом случае" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411 -#, fuzzy msgid "Save the turn restriction despite of errors and/or warnings" msgstr "" -"Вернуться в редактор ограничения на поворот и продолжить редактирование" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415 @@ -18516,23 +18497,20 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843 -#, fuzzy, java-format +#, java-format msgid "{0} warning" msgid_plural "{0} warnings" -msgstr[0] "{0} путевая точка" -msgstr[1] "{0} путевые точки" -msgstr[2] "{0} путевых точек" +msgstr[0] "" +msgstr[1] "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:847 -#, fuzzy, java-format +#, java-format msgid "{0} error" msgid_plural "{0} errors" -msgstr[0] "{0} участник" -msgstr[1] "{0} участника" -msgstr[2] "{0} участников" +msgstr[0] "" +msgstr[1] "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:860 -#, fuzzy msgid "no issues" -msgstr "Новая проблема" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147 @@ -18541,7 +18519,7 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:158 -#, fuzzy, java-format +#, java-format msgid "multiple objects with role ''{0}''" -msgstr "Очищеный объект ''{0}''" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245 @@ -18554,13 +18532,10 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:220 -#, fuzzy msgid "Create new turn restriction" -msgstr "Создать новое ограничение на поворот" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:221 -#, fuzzy msgid "Launch the turn restriction editor to create a new turn restriction" msgstr "" -"Вернуться в редактор ограничения на поворот и продолжить редактирование" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:11 @@ -18610,7 +18585,6 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82 -#, fuzzy msgid "Public Service Vehicles" -msgstr "Транспортные средства общего пользования" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83 @@ -18619,27 +18593,22 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95 -#, fuzzy msgid "Heavy Goods Vehicles" -msgstr "Грузовик (более 3.5т)" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:108 -#, fuzzy msgid "Motorcars" -msgstr "Автомобиль" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:122 -#, fuzzy msgid "Bicycles" -msgstr "Вело" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193 -#, fuzzy msgid "Use standard exceptions" -msgstr "Использовать стандартные настройки системы" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:203 -#, fuzzy msgid "Use non-standard exceptions" -msgstr "Использовать стандартные настройки системы" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:156 @@ -18673,8 +18642,7 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:125 -#, fuzzy msgctxt "turnrestrictions" msgid "From:" -msgstr "Из ..." +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:136 @@ -18778,16 +18746,13 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:131 -#, fuzzy msgid "Please select the set of road sign icons to be used in the plugin." -msgstr "Пожалуйста, выберите ряд для редактирования." +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:188 -#, fuzzy, java-format +#, java-format msgid "" "Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. " "Assuming the default value ''set-a''." msgstr "" -"Предупреждение: неожиданное значение для настройки ''{0}'', получено " -"''{1}''. Сброс к запросу по умолчанию." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48 @@ -18798,38 +18763,32 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64 -#, fuzzy msgctxt "keyboard-key" msgid "Key:" -msgstr "Клавиша:" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:75 -#, fuzzy msgctxt "keyboard-modifiers" msgid "Modifiers:" -msgstr "Группы модификаторов" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:78 -#, fuzzy msgctxt "keyboard-modifiers" msgid "Shift" -msgstr "белый" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:80 -#, fuzzy msgctxt "keyboard-modifiers" msgid "Ctrl" -msgstr "Замок" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:82 -#, fuzzy msgctxt "keyboard-modifiers" msgid "Alt" -msgstr "Все" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:85 -#, fuzzy msgctxt "keyboard-modifiers" msgid "Meta" -msgstr "Мета" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29 @@ -18843,22 +18802,18 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37 -#, fuzzy msgid "Delete ''from''" -msgstr "Удалить из отношения" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38 -#, fuzzy msgid "Removes the member with role ''from''" -msgstr "нет участника Линия с ролью ''from'' (от)" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47 -#, fuzzy msgid "Delete ''to''" -msgstr "Режим удаления" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48 -#, fuzzy msgid "Removes the member with role ''to''" -msgstr "Удалить этого участника из отношения" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57 @@ -18869,7 +18824,6 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:33 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:80 -#, fuzzy msgid "Fix in editor" -msgstr "Версия {0} в редакторе" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58 @@ -18903,7 +18857,6 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49 -#, fuzzy msgid "Set via-Object" -msgstr "кол-во объектов" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50 @@ -18924,7 +18877,6 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36 -#, fuzzy msgid "An OSM way with role from is required in a turn restriction." -msgstr "Модуль OSM для правки ограничений на поворот." +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39 @@ -18937,17 +18889,14 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48 -#, fuzzy msgid "Add in editor" -msgstr "Добавить новый слой" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51 -#, fuzzy msgid "Add an OSM way with role ''from''" -msgstr "нет участника Линия с ролью ''from'' (от)" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54 -#, fuzzy msgid "Add an OSM way with role ''to''" -msgstr "нет участника Линия с ролью ''to'' (куда)" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37 @@ -18986,7 +18935,6 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45 -#, fuzzy msgid "Add missing tag" -msgstr "Добавить новый тег" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46 @@ -19005,12 +18953,10 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75 -#, fuzzy msgid "Split now" -msgstr "Разделить линию" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76 -#, fuzzy msgid "Splits the way" -msgstr "Разделить линию" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45 @@ -19033,7 +18979,6 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63 -#, fuzzy msgid "Delete the member from the turn restriction" -msgstr "Удалить выделенное ограничение на поворот" +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81 @@ -19266,9 +19211,9 @@ "одном и том же слое." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:138 msgid "Crossing buildings" msgstr "Пересекающиеся здания" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:138 msgid "Crossing ways" msgstr "Пересекающиеся линии"