Index: trac/locale/ru/LC_MESSAGES/messages.po =================================================================== --- trac/locale/ru/LC_MESSAGES/messages.po (revision 9180) +++ trac/locale/ru/LC_MESSAGES/messages.po (working copy) @@ -8,309 +8,591 @@ msgstr "" "Project-Id-Version: Trac 0.12\n" "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n" -"POT-Creation-Date: 2007-07-15 21:01+0200\n" -"PO-Revision-Date: 2008-06-28 21:56+0200\n" -"Last-Translator: Alexey Kinyov \n" +"POT-Creation-Date: 2010-02-07 13:34+0300\n" +"PO-Revision-Date: 2010-02-14 12:09+0300\n" +"Last-Translator: Elnur Abdurrakhimov \n" "Language-Team: ru_RU \n" "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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.0dev-r404\n" +"Generated-By: Babel 0.9.4\n" -#: trac/about.py:43 trac/templates/about.html:9 trac/templates/about.html:26 +#: tracopt/mimeview/php.py:97 +msgid "" +"You appear to be using the PHP CGI binary. Trac requires the CLI version " +"for syntax highlighting." +msgstr "" + +#: trac/about.py:45 trac/templates/about.html:9 trac/templates/about.html:28 msgid "About Trac" -msgstr "О системе Trac" +msgstr "О Trac" -#: trac/attachment.py:144 -#, fuzzy, python-format +#: trac/attachment.py:148 +#, python-format msgid "Attachment '%(title)s' does not exist." msgstr "Вложение '%(title)s' не существует." -#: trac/attachment.py:145 -#, fuzzy +#: trac/attachment.py:149 msgid "Invalid Attachment" msgstr "Недопустимое вложение" -#: trac/attachment.py:187 -#, fuzzy +#: trac/attachment.py:191 msgid "Could not delete attachment" -msgstr "Ошибка удаления вложения" +msgstr "Не удалось удалить вложение" -#: trac/attachment.py:291 -#, fuzzy, python-format +#: trac/attachment.py:297 +#, python-format msgid "Attachment '%(filename)s' not found" msgstr "Вложение '%(filename)s' не найдено" -#: trac/attachment.py:365 +#: trac/attachment.py:371 msgid "Bad request" msgstr "Неправильный запрос" -#: trac/attachment.py:382 +#: trac/attachment.py:388 #, python-format msgid "Back to %(parent)s" msgstr "Вернуться к %(parent)s" -#: trac/attachment.py:474 -#, fuzzy +#: trac/attachment.py:480 msgid " attached to " msgstr " прикреплено к " -#: trac/attachment.py:513 +#: trac/attachment.py:541 #, python-format msgid "Attachment '%(id)s' in %(parent)s" msgstr "Вложение '%(id)s' в %(parent)s" -#: trac/attachment.py:516 +#: trac/attachment.py:544 #, python-format msgid "Attachments of %(parent)s" msgstr "Вложения для %(parent)s" -#: trac/attachment.py:529 trac/attachment.py:552 trac/admin/web_ui.py:403 -#: trac/admin/web_ui.py:406 trac/admin/web_ui.py:410 +#: trac/attachment.py:557 trac/attachment.py:580 trac/admin/web_ui.py:422 +#: trac/admin/web_ui.py:425 trac/admin/web_ui.py:429 msgid "No file uploaded" -msgstr "Файл не принят" +msgstr "Ни один файл не закачан" -#: trac/attachment.py:537 +#: trac/attachment.py:565 msgid "Can't upload empty file" -msgstr "Нельзя приложить пустой файл" +msgstr "Нельзя закачать пустой файл" -#: trac/attachment.py:542 +#: trac/attachment.py:570 #, python-format msgid "Maximum attachment size: %(num)s bytes" -msgstr "Максимальный размер вложения %(num)s байт" +msgstr "Максимальный размер вложения: %(num)s байт" -#: trac/attachment.py:543 +#: trac/attachment.py:571 msgid "Upload failed" msgstr "Ошибка загрузки" -#: trac/attachment.py:564 -#, fuzzy, python-format +#: trac/attachment.py:592 +#, python-format msgid "Attachment field %(field)s is invalid: %(message)s" -msgstr "Неверное значение поля %(field)s: %(message)s" +msgstr "Поле %(field)s вложения недопустимо: %(message)s" -#: trac/attachment.py:568 -#, fuzzy, python-format +#: trac/attachment.py:596 +#, python-format msgid "Invalid attachment: %(message)s" msgstr "Недопустимое вложение: %(message)s" -#: trac/attachment.py:602 -#, fuzzy, python-format +#: trac/attachment.py:607 +#, python-format +msgid "" +"You don't have permission to replace the attachment %(name)s. You can " +"only replace your own attachments. Replacing other's attachments requires" +" ATTACHMENT_DELETE permission." +msgstr "" +"У вас нет прав для замены вложения %(name)s. Вы можете заменять только " +"свои вложения. Для замены чужих вложений необходимо право " +"ATTACHMENT_DELETE." + +#: trac/attachment.py:639 +#, python-format msgid "%(attachment)s (delete)" msgstr "%(attachment)s (удалить)" -#: trac/attachment.py:664 trac/versioncontrol/web_ui/browser.py:511 -#: trac/wiki/web_ui.py:66 +#: trac/attachment.py:700 trac/versioncontrol/web_ui/browser.py:632 +#: trac/wiki/web_ui.py:69 msgid "Plain Text" msgstr "Простой текст" -#: trac/attachment.py:670 trac/versioncontrol/web_ui/browser.py:516 +#: trac/attachment.py:706 trac/versioncontrol/web_ui/browser.py:638 msgid "Original Format" msgstr "Исходный формат" -#: trac/env.py:404 -#, fuzzy -msgid "Can only backup sqlite databases" -msgstr "Может быть создана резервная копия только для баз sqlite" +#: trac/attachment.py:748 trac/attachment.py:754 +#: trac/ticket/templates/ticket.html:83 trac/ticket/templates/ticket.html:84 +msgid "Download" +msgstr "Скачать" -#: trac/env.py:489 -#, fuzzy +#: trac/attachment.py:848 +#, python-format +msgid "Invalid resource identifier '%(id)s'" +msgstr "Недопустимый идентификатор ресурса '%(id)s'" + +#: trac/attachment.py:884 trac/admin/templates/admin_components.html:80 +#: trac/admin/templates/admin_enums.html:47 +#: trac/admin/templates/admin_milestones.html:103 +#: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:83 +#: trac/templates/error.html:185 trac/ticket/admin.py:209 +#: trac/ticket/admin.py:400 trac/ticket/admin.py:559 +#: trac/versioncontrol/admin.py:106 +#: trac/versioncontrol/templates/admin_repositories.html:124 +msgid "Name" +msgstr "Имя" + +#: trac/attachment.py:884 +msgid "Size" +msgstr "Размер" + +#: trac/attachment.py:884 trac/templates/history_view.html:30 +#: trac/versioncontrol/templates/revisionlog.html:97 +msgid "Author" +msgstr "Автор" + +#: trac/attachment.py:884 trac/templates/history_view.html:29 +msgid "Date" +msgstr "Дата" + +#: trac/attachment.py:885 trac/templates/attachment.html:89 +#: trac/ticket/api.py:287 trac/ticket/templates/ticket.html:202 +msgid "Description" +msgstr "Описание" + +#: trac/attachment.py:910 trac/wiki/admin.py:101 +#, python-format +msgid "File '%(name)s' exists" +msgstr "Файл '%(name)s' существует" + +#: trac/config.py:391 +#, python-format +msgid "[%(section)s] %(entry)s: expected integer, got %(value)s" +msgstr "[%(section)s] %(entry)s: ожидалось целое число, получено %(value)s" + +#: trac/env.py:537 msgid "Database newer than Trac version" -msgstr "Версия базы данных новее нежели версия Trac" +msgstr "Версия базы данных новее версии Trac" -#: trac/env.py:501 +#: trac/env.py:551 #, fuzzy, python-format msgid "No upgrade module for version %(num)i (%(version)s.py)" msgstr "Не найден модуль обновления для версии %(num)i (%(version)s.py)" -#: trac/env.py:546 +#: trac/env.py:596 #, fuzzy msgid "" "Missing environment variable \"TRAC_ENV\". Trac requires this variable to" " point to a valid Trac environment." -msgstr "Пропущена переменная окружения \"TRAC_ENV\". Trac требуется, чтобы данная переменная" -" указывала на существующий путь к окружению Trac." +msgstr "" +"Пропущена переменная окружения \"TRAC_ENV\". Trac требуется, чтобы данная" +" переменная\"\n" +"\" указывала на существующий путь к окружению Trac." -#: trac/env.py:578 +#: trac/env.py:628 #, fuzzy, python-format msgid "" "The Trac Environment needs to be upgraded.\n" "\n" "Run \"trac-admin %(path)s upgrade\"" -msgstr "Требуется обновление окружения Trac.\n" -"\n" -"Выполните \"trac-admin %(path)s upgrade\"" +msgstr "" +"Требуется обновление окружения Trac.\n" +"\"\n" +"\"\n" +"\"\n" +"\"Выполните \"trac-admin %(path)s upgrade\"" -#: trac/notification.py:216 +#: trac/env.py:662 +msgid "Copying resources from:" +msgstr "Копирование ресурсов из:" + +#: trac/env.py:678 +msgid "Creating scripts." +msgstr "Создание скриптов." + +#: trac/env.py:693 #, fuzzy, python-format +msgid "hotcopy can't overwrite existing '%(dest)s'" +msgstr "hotcopy не может переписать существующую '%(dest)s'" + +#: trac/env.py:703 +#, python-format +msgid "Hotcopying %(src)s to %(dst)s ..." +msgstr "Создание горячей копии из %(src)s в %(dst)s ..." + +#: trac/env.py:718 +msgid "The following errors happened while copying the environment:" +msgstr "При копировании окружения произошли следующие ошибки:" + +#: trac/env.py:729 +msgid "Hotcopy done." +msgstr "Создание горячей копии завершено." + +#: trac/env.py:734 trac/admin/api.py:125 +msgid "Invalid arguments" +msgstr "Недопустимые аргументы" + +#: trac/env.py:737 +msgid "Database is up to date, no upgrade necessary." +msgstr "База данных актуальна: обновление не требуется." + +#: trac/env.py:745 +#, python-format +msgid "" +"Backup failed with '%(msg)s'.\n" +"Use '--no-backup' to upgrade without doing a backup." +msgstr "" + +#: trac/env.py:750 +msgid "Upgrade done." +msgstr "Обновление завершено." + +#: trac/notification.py:155 +msgid "TLS enabled but server does not support TLS" +msgstr "TLS включён, но сервер TLS не поддерживает" + +#: trac/notification.py:303 +#, python-format msgid "Invalid email encoding setting: %s" -msgstr "Неверная настройка кодировки email: %s" +msgstr "Недопустимая настройка кодировки email: %s" -#: trac/notification.py:248 -#, fuzzy +#: trac/notification.py:329 msgid "Header length is too short" msgstr "Слишком маленькая длина заголовка" -#: trac/notification.py:318 -#, fuzzy -msgid "TLS enabled but server does not support TLS" -msgstr "Включена опция TLS, однако сервер не поддерживает TLS" - -#: trac/notification.py:390 -#, fuzzy -msgid "Ticket contains non-ASCII chars. Please change encoding setting" -msgstr "Задача содержит символы в кодировке отличной от ASCII. Пожалуйста, измените настройку кодировки" - -#: trac/perm.py:47 +#: trac/perm.py:48 #, python-format -#, fuzzy msgid "%(perm)s privileges are required to perform this operation on %(resource)s" -msgstr "Для осуществления данной операции над %(resource)s требуются права доступа %(perm)s" +msgstr "" +"Для осуществления данной операции над %(resource)s требуются полномочия " +"%(perm)s" -#: trac/perm.py:49 +#: trac/perm.py:50 #, python-format msgid "%(perm)s privileges are required to perform this operation" -msgstr "Для данного действия требуются права доступа %(perm)s" +msgstr "Для данного действия требуются полномочия %(perm)s" -#: trac/perm.py:52 -#, fuzzy +#: trac/perm.py:55 msgid "Insufficient privileges to perform this operation." -msgstr "Для осуществления данной операции недостаточно прав доступа." +msgstr "Недостаточно полномочий для осуществления данной операции." -#: trac/perm.py:318 +#: trac/perm.py:319 #, python-format msgid "%(name)s is not a valid action." -msgstr "Недопустимое действие: %(name)s" +msgstr "%(name)s не является допустимым действием." -#: trac/resource.py:329 +#: trac/perm.py:615 +msgid "User" +msgstr "Пользователь" + +#: trac/perm.py:615 trac/admin/templates/admin_perms.html:69 +#: trac/ticket/templates/ticket.html:443 +msgid "Action" +msgstr "Действие" + +#: trac/perm.py:617 +msgid "Available actions:" +msgstr "Доступные действия:" + +#: trac/perm.py:630 +msgid "Group names must be in lower case and actions in upper case" +msgstr "Названия групп должны быть в нижнем регистре, а права — в верхнем" + +#: trac/resource.py:326 #, fuzzy, python-format msgid " at version %(version)s" msgstr " в версии %(version)s" -#: trac/admin/console.py:1143 -#, fuzzy, python-format -msgid "hotcopy can't overwrite existing '%(dest)s'" -msgstr "hotcopy не может переписать существующую '%(dest)s'" +#: trac/admin/api.py:129 +msgid "Command not found" +msgstr "Команда не найдена" -#: trac/admin/web_ui.py:66 +#: trac/admin/console.py:111 trac/ticket/templates/report_edit.html:34 +msgid "Error:" +msgstr "Ошибка:" + +#: trac/admin/console.py:129 +#, python-format +msgid "" +"Welcome to trac-admin %(version)s\n" +"Interactive Trac administration console.\n" +"Copyright (c) 2003-2009 Edgewall Software\n" +"\n" +"Type: '?' or 'help' for help on commands.\n" +" " +msgstr "" + +#: trac/admin/console.py:161 +msgid "Failed to open environment." +msgstr "Не удалось открыть окружение." + +#: trac/admin/console.py:230 +msgid "Completion error:" +msgstr "" + +#: trac/admin/console.py:281 +#, python-format +msgid "No documentation found for '%(cmd)s'" +msgstr "Документация для '%(cmd)s' не найдена" + +#: trac/admin/console.py:283 +#, python-format +msgid "trac-admin - The Trac Administration Console %(version)s" +msgstr "" + +#: trac/admin/console.py:287 +msgid "Usage: trac-admin [command [subcommand] [option ...]]\n" +msgstr "" + +#: trac/admin/console.py:290 +msgid "Invoking trac-admin without command starts interactive mode.\n" +msgstr "" + +#: trac/admin/console.py:330 +#, python-format +msgid "Creating a new Trac environment at %(envname)s" +msgstr "" + +#: trac/admin/console.py:332 +msgid "" +"\n" +"Trac will first ask a few questions about your environment \n" +"in order to initialize and prepare the project database.\n" +"\n" +" Please enter the name of your project.\n" +" This name will be used in page titles and descriptions.\n" +msgstr "" + +#: trac/admin/console.py:340 +#, python-format +msgid "Project Name [%(default)s]> " +msgstr "" + +#: trac/admin/console.py:342 +msgid "" +" \n" +" Please specify the connection string for the database to use.\n" +" By default, a local SQLite database is created in the environment\n" +" directory. It is also possible to use an already existing\n" +" PostgreSQL database (check the Trac documentation for the exact\n" +" connection string syntax).\n" +msgstr "" + +#: trac/admin/console.py:350 +#, python-format +msgid "Database connection string [%(default)s]> " +msgstr "Строка подключения к базе данных [%(default)s]> " + +#: trac/admin/console.py:357 +#, python-format +msgid "Initenv for '%(env)s' failed." +msgstr "" + +#: trac/admin/console.py:392 +msgid "Creating and Initializing Project" +msgstr "" + +#: trac/admin/console.py:415 +msgid " Installing default wiki pages" +msgstr " Установка страниц вики по умолчанию" + +#: trac/admin/console.py:426 +msgid " Indexing default repository" +msgstr " Индексирование репозитория по умолчанию" + +#: trac/admin/console.py:429 +msgid "" +"\n" +"---------------------------------------------------------------------\n" +"Warning: couldn't index the default repository.\n" +"\n" +"This can happen for a variety of reasons: wrong repository type, \n" +"no appropriate third party library for this repository type,\n" +"no actual repository at the specified repository path...\n" +"\n" +"You can nevertheless start using your Trac environment, but \n" +"you'll need to check again your trac.ini file and the [trac] \n" +"repository_type and repository_path settings.\n" +msgstr "" + +#: trac/admin/console.py:472 +#, python-format +msgid "" +"\n" +"---------------------------------------------------------------------\n" +"Project environment for '%(project_name)s' created.\n" +"\n" +"You may now configure the environment by editing the file:\n" +"\n" +" %(config_path)s\n" +"\n" +"If you'd like to take this new project environment for a test drive,\n" +"try running the Trac standalone web server `tracd`:\n" +"\n" +" tracd --port 8000 %(project_path)s\n" +"\n" +"Then point your browser to http://localhost:8000/%(project_dir)s.\n" +"There you can also browse the documentation for your installed\n" +"version of Trac, including information on further setup (such as\n" +"deploying Trac to a real web server).\n" +"\n" +"The latest documentation can also always be found on the project\n" +"website:\n" +"\n" +" http://trac.edgewall.org/\n" +"\n" +"Congratulations!\n" +msgstr "" + +#: trac/admin/console.py:532 +#, python-format +msgid "non-ascii environment path '%(path)s' not supported." +msgstr "" + +#: trac/admin/web_ui.py:64 msgid "Admin" -msgstr "Администрирование" +msgstr "Админка" -#: trac/admin/web_ui.py:67 trac/admin/templates/admin.html:16 +#: trac/admin/web_ui.py:65 trac/admin/templates/admin.html:16 msgid "Administration" msgstr "Администрирование" -#: trac/admin/web_ui.py:83 -#, fuzzy +#: trac/admin/web_ui.py:81 msgid "No administration panels available" -msgstr "Панель администрирования недоступна" +msgstr "Панели администрирования недоступны" -#: trac/admin/web_ui.py:105 -#, fuzzy +#: trac/admin/web_ui.py:107 trac/admin/web_ui.py:111 msgid "Unknown administration panel" msgstr "Неизвестная панель администрирования" -#: trac/admin/web_ui.py:180 trac/admin/web_ui.py:207 trac/admin/web_ui.py:296 -#: trac/admin/web_ui.py:379 trac/prefs/web_ui.py:89 +#: trac/admin/web_ui.py:184 trac/ticket/admin.py:65 trac/ticket/admin.py:90 +#: trac/ticket/admin.py:275 trac/ticket/admin.py:457 trac/ticket/admin.py:609 +#: trac/ticket/admin.py:697 trac/ticket/report.py:177 +#: trac/ticket/roadmap.py:684 trac/versioncontrol/admin.py:188 +#: trac/wiki/web_ui.py:289 +msgid "Your changes have been saved." +msgstr "Ваши изменения сохранены." + +#: trac/admin/web_ui.py:187 trac/ticket/admin.py:68 +msgid "" +"Error writing to trac.ini, make sure it is writable by the web server. " +"Your changes have not been saved." +msgstr "" +"Ошибка записи в trac.ini: убедитесь, что он доступен веб-серверу для " +"записи. Ваши изменения не были сохранены." + +#: trac/admin/web_ui.py:200 trac/admin/web_ui.py:228 trac/admin/web_ui.py:316 +#: trac/admin/web_ui.py:398 trac/prefs/web_ui.py:86 #: trac/prefs/templates/prefs_general.html:9 msgid "General" -msgstr "Общие" +msgstr "Общее" -#: trac/admin/web_ui.py:180 trac/admin/templates/admin_basics.html:13 +#: trac/admin/web_ui.py:200 trac/admin/templates/admin_basics.html:13 msgid "Basic Settings" -msgstr "Настройки" +msgstr "Основные настройки" -#: trac/admin/web_ui.py:207 trac/admin/templates/admin_logging.html:9 -#: trac/admin/templates/admin_logging.html:21 +#: trac/admin/web_ui.py:228 trac/admin/templates/admin_logging.html:10 +#: trac/admin/templates/admin_logging.html:22 msgid "Logging" msgstr "Ведение журнала" -#: trac/admin/web_ui.py:216 trac/ticket/templates/milestone_delete.html:29 -#: trac/ticket/templates/milestone_edit.html:73 +#: trac/admin/web_ui.py:237 trac/ticket/templates/milestone_delete.html:31 +#: trac/ticket/templates/milestone_edit.html:72 msgid "None" msgstr "Не установлено" -#: trac/admin/web_ui.py:217 -#, fuzzy +#: trac/admin/web_ui.py:238 msgid "Console" msgstr "Консоль" -#: trac/admin/web_ui.py:219 trac/templates/attachment.html:20 -#: trac/templates/attachment.html:81 trac/versioncontrol/api.py:105 +#: trac/admin/web_ui.py:240 trac/templates/attachment.html:29 msgid "File" msgstr "Файл" -#: trac/admin/web_ui.py:221 -#, fuzzy +#: trac/admin/web_ui.py:242 msgid "Syslog" msgstr "Системный журнал" -#: trac/admin/web_ui.py:223 +#: trac/admin/web_ui.py:244 msgid "Windows event log" -msgstr "Журнал событий windows" +msgstr "Журнал событий Windows" -#: trac/admin/web_ui.py:237 +#: trac/admin/web_ui.py:257 #, python-format msgid "Unknown log type %(type)s" msgstr "Неизвестный тип журнала %(type)s" -#: trac/admin/web_ui.py:238 +#: trac/admin/web_ui.py:258 msgid "Invalid log type" -msgstr "Недопустимый журнал" +msgstr "Недопустимый тип журнала" -#: trac/admin/web_ui.py:249 +#: trac/admin/web_ui.py:272 #, python-format msgid "Unknown log level %(level)s" msgstr "Неизвестный уровень сообщения %(level)s" -#: trac/admin/web_ui.py:250 +#: trac/admin/web_ui.py:273 msgid "Invalid log level" -msgstr "Недопустимый уровень сообщения" +msgstr "Недопустимый уровень журнала" -#: trac/admin/web_ui.py:266 +#: trac/admin/web_ui.py:286 msgid "You must specify a log file" -msgstr "Необходимо указать файл журнала" +msgstr "Вы должны указать файл журнала" -#: trac/admin/web_ui.py:267 +#: trac/admin/web_ui.py:287 msgid "Missing field" -msgstr "Отсутсвует поле" +msgstr "Отсутствующее поле" -#: trac/admin/web_ui.py:296 trac/admin/templates/admin_perms.html:9 +#: trac/admin/web_ui.py:316 trac/admin/templates/admin_perms.html:9 msgid "Permissions" msgstr "Права" -#: trac/admin/web_ui.py:310 -#, fuzzy +#: trac/admin/web_ui.py:330 msgid "All upper-cased tokens are reserved for permission names" -msgstr "Все слова в верхенм регистре зарезервированы под наименование прав доступа" +msgstr "Все слова в верхнем регистре зарезервированы под названия прав" -#: trac/admin/web_ui.py:317 +#: trac/admin/web_ui.py:337 msgid "Unknown action" msgstr "Неизвестное действие" -#: trac/admin/web_ui.py:324 +#: trac/admin/web_ui.py:341 #, python-format -msgid "Permission \"%(action)s\" was already granted to \"%(subject)s\"" -msgstr "\"%(subject)s\" уже имеет право \"%(action)s\" " +msgid "The subject %(subject)s has been granted the permission %(action)s." +msgstr "Субъект %(subject)s наделён правом %(action)s." -#: trac/admin/web_ui.py:343 +#: trac/admin/web_ui.py:346 #, python-format -msgid "\"%(subject)s\" was already added to group \"%(group)s\"" -msgstr "\"%(subject)s\" уже находится в группе \"%(group)s\"" +msgid "The permission %(action)s was already granted to %(subject)s." +msgstr "%(subject)s уже наделён правом %(action)s." -#: trac/admin/web_ui.py:379 trac/admin/templates/admin_plugins.html:9 +#: trac/admin/web_ui.py:362 +#, python-format +msgid "The subject %(subject)s has been added to the group %(group)s." +msgstr "Субъект %(subject)s добавлен в группу %(group)s." + +#: trac/admin/web_ui.py:367 +#, python-format +msgid "The subject %(subject)s was already added to the group %(group)s." +msgstr "Субъект %(subject)s уже добавлен в группу %(group)s." + +#: trac/admin/web_ui.py:380 +msgid "The selected permissions have been revoked." +msgstr "Выбранные права отозваны." + +#: trac/admin/web_ui.py:398 trac/admin/templates/admin_plugins.html:9 msgid "Plugins" msgstr "Плагины" -#: trac/admin/web_ui.py:413 +#: trac/admin/web_ui.py:432 msgid "Uploaded file is not a Python source file or egg" -msgstr "Принятый файле не является исходным кодом или яйцом Питона" +msgstr "Закачанный файл не является исходным кодом или яйцом Питона" -#: trac/admin/web_ui.py:418 +#: trac/admin/web_ui.py:437 #, python-format msgid "Plugin %(name)s already installed" -msgstr "Плагин %(name)s уже устанолен" +msgstr "Плагин %(name)s уже установлен" #: trac/admin/templates/admin.html:10 msgid "Administration:" @@ -318,7 +600,7 @@ #: trac/admin/templates/admin_basics.html:9 msgid "Basics" -msgstr "Основные" +msgstr "Основы" #: trac/admin/templates/admin_basics.html:17 msgid "Project" @@ -329,34 +611,37 @@ #: trac/admin/templates/admin_components.html:66 #: trac/admin/templates/admin_enums.html:20 #: trac/admin/templates/admin_enums.html:34 -#: trac/admin/templates/admin_milestones.html:21 -#: trac/admin/templates/admin_milestones.html:77 +#: trac/admin/templates/admin_milestones.html:22 +#: trac/admin/templates/admin_milestones.html:79 #: trac/admin/templates/admin_versions.html:21 #: trac/admin/templates/admin_versions.html:56 +#: trac/versioncontrol/templates/admin_repositories.html:49 +#: trac/versioncontrol/templates/admin_repositories.html:94 +#: trac/versioncontrol/templates/admin_repositories.html:111 msgid "Name:" -msgstr "Название:" +msgstr "Имя:" #: trac/admin/templates/admin_basics.html:24 +#: trac/versioncontrol/templates/admin_repositories.html:61 msgid "URL:" -msgstr "Ссылка:" +msgstr "URL:" #: trac/admin/templates/admin_basics.html:29 -#: trac/ticket/templates/ticket.html:291 +#: trac/ticket/templates/ticket.html:366 msgid "Description:" msgstr "Описание:" #: trac/admin/templates/admin_basics.html:36 #: trac/admin/templates/admin_components.html:99 #: trac/admin/templates/admin_enums.html:69 -#: trac/admin/templates/admin_logging.html:53 -#: trac/admin/templates/admin_milestones.html:124 -#: trac/admin/templates/admin_plugins.html:102 +#: trac/admin/templates/admin_logging.html:54 +#: trac/admin/templates/admin_milestones.html:128 +#: trac/admin/templates/admin_plugins.html:164 #: trac/admin/templates/admin_versions.html:94 -#, fuzzy msgid "Apply changes" -msgstr "Сохранить изменения" +msgstr "Применить изменения" -#: trac/admin/templates/admin_components.html:10 +#: trac/admin/templates/admin_components.html:10 trac/ticket/admin.py:76 msgid "Components" msgstr "Компоненты" @@ -378,28 +663,31 @@ " [1:WikiFormatting]\n" " here):" msgstr "" -"Описание (здесь можно использовать\n" -" [1:WikiFormatting])" +"Описание (здесь Вы можете использовать\n" +" [1:WikiFormatting]):" #: trac/admin/templates/admin_components.html:55 #: trac/admin/templates/admin_enums.html:23 -#: trac/admin/templates/admin_milestones.html:65 +#: trac/admin/templates/admin_milestones.html:67 #: trac/admin/templates/admin_versions.html:45 -#: trac/templates/attachment.html:49 trac/templates/attachment.html:62 -#: trac/ticket/templates/milestone_delete.html:33 -#: trac/ticket/templates/milestone_edit.html:91 -#: trac/ticket/templates/report_delete.html:20 +#: trac/templates/attachment.html:60 trac/templates/attachment.html:73 +#: trac/ticket/templates/milestone_delete.html:40 +#: trac/ticket/templates/milestone_edit.html:93 +#: trac/ticket/templates/report_delete.html:21 #: trac/ticket/templates/report_edit.html:42 +#: trac/ticket/templates/ticket.html:109 +#: trac/versioncontrol/templates/admin_repositories.html:83 #: trac/wiki/templates/wiki_delete.html:36 -#: trac/wiki/templates/wiki_edit.html:35 trac/wiki/templates/wiki_edit.html:45 -#: trac/wiki/templates/wiki_edit.html:133 +#: trac/wiki/templates/wiki_edit.html:81 +#: trac/wiki/templates/wiki_edit_form.html:77 msgid "Cancel" -msgstr "Отмена" +msgstr "Отменить" #: trac/admin/templates/admin_components.html:56 #: trac/admin/templates/admin_enums.html:24 -#: trac/admin/templates/admin_milestones.html:66 +#: trac/admin/templates/admin_milestones.html:68 #: trac/admin/templates/admin_versions.html:46 +#: trac/versioncontrol/templates/admin_repositories.html:84 msgid "Save" msgstr "Сохранить" @@ -410,67 +698,65 @@ #: trac/admin/templates/admin_components.html:70 #: trac/admin/templates/admin_enums.html:32 #: trac/admin/templates/admin_enums.html:37 -#: trac/admin/templates/admin_milestones.html:90 -#: trac/admin/templates/admin_perms.html:44 -#: trac/admin/templates/admin_perms.html:66 +#: trac/admin/templates/admin_milestones.html:92 +#: trac/admin/templates/admin_perms.html:38 +#: trac/admin/templates/admin_perms.html:60 #: trac/admin/templates/admin_versions.html:67 +#: trac/versioncontrol/templates/admin_repositories.html:101 +#: trac/versioncontrol/templates/admin_repositories.html:115 msgid "Add" msgstr "Добавить" -#: trac/admin/templates/admin_components.html:80 -#: trac/admin/templates/admin_enums.html:47 -#: trac/admin/templates/admin_milestones.html:100 -#: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:66 -#: trac/templates/error.html:162 -msgid "Name" -msgstr "Имя" - -#: trac/admin/templates/admin_components.html:80 +#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:209 +#: trac/ticket/api.py:281 trac/ticket/web_ui.py:1321 msgid "Owner" msgstr "Владелец" #: trac/admin/templates/admin_components.html:80 #: trac/admin/templates/admin_enums.html:47 -#: trac/admin/templates/admin_milestones.html:100 +#: trac/admin/templates/admin_milestones.html:103 #: trac/admin/templates/admin_versions.html:77 msgid "Default" msgstr "По умолчанию" #: trac/admin/templates/admin_components.html:98 #: trac/admin/templates/admin_enums.html:68 -#: trac/admin/templates/admin_milestones.html:123 -#: trac/admin/templates/admin_perms.html:93 +#: trac/admin/templates/admin_milestones.html:127 +#: trac/admin/templates/admin_perms.html:87 #: trac/admin/templates/admin_versions.html:93 +#: trac/versioncontrol/templates/admin_repositories.html:144 msgid "Remove selected items" -msgstr "Удалить выбранные пункты" +msgstr "Удалить выбранные элементы" #: trac/admin/templates/admin_components.html:101 #: trac/admin/templates/admin_enums.html:71 -#: trac/admin/templates/admin_milestones.html:126 +#: trac/admin/templates/admin_milestones.html:130 #: trac/admin/templates/admin_versions.html:96 msgid "" "You can remove all items from this list to completely hide this\n" " field from the user interface." msgstr "" -"Удалите все элементы списка чтобы скрыть данное поле из\n" -" интерфейса пользователя." +"Вы можете удалите все элементы списка, чтобы полностью скрыть данное\n" +" поле из интерфейса пользователя." #: trac/admin/templates/admin_components.html:107 #: trac/admin/templates/admin_enums.html:77 -#: trac/admin/templates/admin_milestones.html:132 +#: trac/admin/templates/admin_milestones.html:136 #: trac/admin/templates/admin_versions.html:102 msgid "" "As long as you don't add any items to the list, this field\n" " will remain completely hidden from the user interface." msgstr "" -"Пока в этом списке нет ни одного элемента, данное поле\n" -" не будет отображаться в интерфейсе пользователя." +"До тех пор, пока Вы не добавите хотя бы один элемент в этот список, " +"данное поле\n" +" останется полностью скрытым от интерфейса пользователя." #: trac/admin/templates/admin_enums.html:13 msgid "Manage" msgstr "Управлять" #: trac/admin/templates/admin_enums.html:18 +#: trac/ticket/templates/ticket.html:135 msgid "Modify" msgstr "Изменить" @@ -478,36 +764,34 @@ msgid "Order" msgstr "Порядок" -#: trac/admin/templates/admin_logging.html:25 trac/templates/about.html:61 +#: trac/admin/templates/admin_logging.html:26 trac/templates/about.html:78 msgid "Configuration" msgstr "Конфигурация" -#: trac/admin/templates/admin_logging.html:27 +#: trac/admin/templates/admin_logging.html:28 +#: trac/versioncontrol/templates/admin_repositories.html:18 msgid "Type:" msgstr "Тип:" -#: trac/admin/templates/admin_logging.html:36 +#: trac/admin/templates/admin_logging.html:37 msgid "Log level:" msgstr "Уровень сообщений:" -#: trac/admin/templates/admin_logging.html:44 +#: trac/admin/templates/admin_logging.html:45 msgid "Log file:" msgstr "Файл журнала:" -#: trac/admin/templates/admin_logging.html:47 -msgid "If you specify a relative path, the log file will be stored inside the" -msgstr "При указании относительного пути, журнал будет сохранен внутри" +#: trac/admin/templates/admin_logging.html:48 +#, python-format +msgid "" +"If you specify a relative path, the log file will be stored inside the\n" +" [1:log] directory of the project environment ([2:%(dir)s])." +msgstr "" +"Если Вы укажете относительный путь, файл журнала будет сохранён внутри\n" +" директории [1:log] окружения проекта ([2:%(dir)s])." -#: trac/admin/templates/admin_logging.html:49 -#, fuzzy -msgid "log" -msgstr "журнал" - -#: trac/admin/templates/admin_logging.html:49 -msgid "directory of the project environment (" -msgstr "директория окружения проекта" - -#: trac/admin/templates/admin_milestones.html:10 trac/ticket/roadmap.py:503 +#: trac/admin/templates/admin_milestones.html:10 trac/ticket/admin.py:241 +#: trac/ticket/roadmap.py:852 msgid "Milestones" msgstr "Этапы" @@ -515,131 +799,130 @@ msgid "Manage Milestones" msgstr "Управлять этапами" -#: trac/admin/templates/admin_milestones.html:19 +#: trac/admin/templates/admin_milestones.html:20 msgid "Modify Milestone:" msgstr "Изменить этапы:" -#: trac/admin/templates/admin_milestones.html:24 -#: trac/admin/templates/admin_milestones.html:82 -#: trac/ticket/templates/milestone_edit.html:51 +#: trac/admin/templates/admin_milestones.html:25 +#: trac/admin/templates/admin_milestones.html:84 +#: trac/ticket/templates/milestone_edit.html:50 msgid "Due:" msgstr "Срок:" -#: trac/admin/templates/admin_milestones.html:27 -#: trac/admin/templates/admin_milestones.html:41 -#: trac/admin/templates/admin_milestones.html:86 +#: trac/admin/templates/admin_milestones.html:29 +#: trac/admin/templates/admin_milestones.html:43 +#: trac/admin/templates/admin_milestones.html:88 #: trac/admin/templates/admin_versions.html:30 #: trac/admin/templates/admin_versions.html:63 -#: trac/ticket/templates/milestone_edit.html:54 -#: trac/ticket/templates/milestone_edit.html:66 +#: trac/ticket/templates/milestone_edit.html:53 +#: trac/ticket/templates/milestone_edit.html:65 msgid "Format:" msgstr "Формат:" -#: trac/admin/templates/admin_milestones.html:33 -#: trac/ticket/templates/milestone_edit.html:59 +#: trac/admin/templates/admin_milestones.html:35 +#: trac/ticket/templates/milestone_edit.html:58 msgid "Completed:" -msgstr "Завершен:" +msgstr "Выполнен:" -#: trac/admin/templates/admin_milestones.html:55 +#: trac/admin/templates/admin_milestones.html:57 #: trac/admin/templates/admin_versions.html:35 -#: trac/ticket/templates/milestone_edit.html:82 -#, fuzzy +#: trac/ticket/templates/milestone_edit.html:84 +#: trac/versioncontrol/templates/admin_repositories.html:72 msgid "Description (you may use [1:WikiFormatting] here):" -msgstr "Описание (можно использовать [1:WikiFormatting]):" +msgstr "Описание (здесь Вы можете использовать [1:WikiFormatting]):" -#: trac/admin/templates/admin_milestones.html:75 +#: trac/admin/templates/admin_milestones.html:77 msgid "Add Milestone:" msgstr "Добавить этап:" -#: trac/admin/templates/admin_milestones.html:100 +#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:400 msgid "Due" msgstr "Срок" -#: trac/admin/templates/admin_milestones.html:100 -#: trac/ticket/templates/milestone_view.html:25 -#: trac/ticket/templates/roadmap.html:38 +#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:400 msgid "Completed" -msgstr "Завершен" +msgstr "Выполнен" +#: trac/admin/templates/admin_milestones.html:103 trac/ticket/web_ui.py:183 +msgid "Tickets" +msgstr "Тикеты" + #: trac/admin/templates/admin_perms.html:13 msgid "Manage Permissions" -msgstr "Управление правами" +msgstr "Управлять правами" -#: trac/admin/templates/admin_perms.html:15 -msgid "Note that" -msgstr "Обратите внимание, что" - -#: trac/admin/templates/admin_perms.html:16 -#: trac/admin/templates/admin_perms.html:75 -#, fuzzy -msgid "Subject" -msgstr "Субьект:" - -#: trac/admin/templates/admin_perms.html:16 trac/ticket/templates/query.html:60 -msgid "or" -msgstr "или" - -#: trac/admin/templates/admin_perms.html:16 -msgid "Group" -msgstr "Группа" - -#: trac/admin/templates/admin_perms.html:16 -msgid "names can't be all upper cased," -msgstr "Имена не могут быть в верхнем регистре," - -#: trac/admin/templates/admin_perms.html:16 -msgid "as this is reserved for permission names." -msgstr "так как он зарезервирован для названий прав." - -#: trac/admin/templates/admin_perms.html:24 +#: trac/admin/templates/admin_perms.html:18 msgid "Grant Permission:" msgstr "Дать право:" -#: trac/admin/templates/admin_perms.html:27 -#: trac/admin/templates/admin_perms.html:54 +#: trac/admin/templates/admin_perms.html:21 +#: trac/admin/templates/admin_perms.html:48 msgid "Subject:" -msgstr "Субьект:" +msgstr "Субъект:" -#: trac/admin/templates/admin_perms.html:31 +#: trac/admin/templates/admin_perms.html:25 msgid "Action:" msgstr "Действие:" -#: trac/admin/templates/admin_perms.html:39 +#: trac/admin/templates/admin_perms.html:33 msgid "" "Grant permission for an action to a subject, which can be either a user\n" " or a group." -msgstr "Дать право на заданное действе субьекту: пользователю или группе" +msgstr "" +"Дать право на действие субъекту, который может быть либо пользователем,\n" +" либо группой." -#: trac/admin/templates/admin_perms.html:51 +#: trac/admin/templates/admin_perms.html:45 msgid "Add Subject to Group:" -msgstr "Добавить субъекта в группу:" +msgstr "Добавить субъект в группу:" -#: trac/admin/templates/admin_perms.html:58 +#: trac/admin/templates/admin_perms.html:52 msgid "Group:" msgstr "Группа:" -#: trac/admin/templates/admin_perms.html:62 +#: trac/admin/templates/admin_perms.html:56 msgid "Add a user or group to an existing permission group." -msgstr "Добавить пользователя или группу к существующей группе." +msgstr "Добавить пользователя или группу к существующей группе прав." -#: trac/admin/templates/admin_perms.html:75 -#: trac/ticket/templates/ticket.html:365 -msgid "Action" -msgstr "Действие" +#: trac/admin/templates/admin_perms.html:69 +#: trac/admin/templates/admin_perms.html:92 +msgid "Subject" +msgstr "Субъект" -#: trac/admin/templates/admin_plugins.html:17 +#: trac/admin/templates/admin_perms.html:91 +msgid "Note that" +msgstr "Обратите внимание, что названия понятий" + +#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:73 +msgid "or" +msgstr "или" + +#: trac/admin/templates/admin_perms.html:92 +msgid "Group" +msgstr "Группа" + +#: trac/admin/templates/admin_perms.html:92 +msgid "" +"names can't be all upper-case,\n" +" as that is reserved for permission names." +msgstr "" +"не могут быть полностью в верхнем регистре,\n" +" так как он зарезервирован под названия прав." + +#: trac/admin/templates/admin_plugins.html:41 msgid "Manage Plugins" -msgstr "Управление плагинами" +msgstr "Управлять плагинами" -#: trac/admin/templates/admin_plugins.html:21 +#: trac/admin/templates/admin_plugins.html:45 msgid "Install Plugin:" msgstr "Установить плагин:" -#: trac/admin/templates/admin_plugins.html:23 +#: trac/admin/templates/admin_plugins.html:47 msgid "File:" msgstr "Файл:" -#: trac/admin/templates/admin_plugins.html:28 +#: trac/admin/templates/admin_plugins.html:52 +#, fuzzy msgid "" "The web server does not have sufficient permissions to store files in\n" " the environment plugins directory." @@ -647,49 +930,60 @@ "Веб сервер не имеет достаточных прав для сохранения файлов в директории " "проекта." -#: trac/admin/templates/admin_plugins.html:32 +#: trac/admin/templates/admin_plugins.html:56 +#, fuzzy msgid "Upload a plugin packaged as Python egg." msgstr "Загрузить плагин в формате .egg" -#: trac/admin/templates/admin_plugins.html:37 -#, fuzzy +#: trac/admin/templates/admin_plugins.html:61 msgid "Install" msgstr "Установить" -#: trac/admin/templates/admin_plugins.html:49 -#, fuzzy -msgid "Uninstall" -msgstr "Удалить" - -#: trac/admin/templates/admin_plugins.html:59 trac/templates/diff_view.html:43 -#: trac/versioncontrol/templates/changeset.html:97 +#: trac/admin/templates/admin_plugins.html:84 trac/templates/diff_view.html:46 +#: trac/versioncontrol/templates/changeset.html:107 msgid "Author:" msgstr "Автор:" -#: trac/admin/templates/admin_plugins.html:68 +#: trac/admin/templates/admin_plugins.html:93 msgid "Home page:" msgstr "Домашняя страница:" -#: trac/admin/templates/admin_plugins.html:75 +#: trac/admin/templates/admin_plugins.html:100 msgid "License:" msgstr "Лицензия:" -#: trac/admin/templates/admin_plugins.html:82 +#: trac/admin/templates/admin_plugins.html:110 +msgid "Show all descriptions" +msgstr "Показать все описания" + +#: trac/admin/templates/admin_plugins.html:112 +msgid "Hide all descriptions" +msgstr "Скрыть все описания" + +#: trac/admin/templates/admin_plugins.html:114 trac/ticket/admin.py:76 +#: trac/ticket/api.py:294 msgid "Component" msgstr "Компонент" -#: trac/admin/templates/admin_plugins.html:82 -#, fuzzy +#: trac/admin/templates/admin_plugins.html:117 msgid "Enabled" -msgstr "Включен" +msgstr "Включён" -#: trac/admin/templates/admin_versions.html:10 +#: trac/admin/templates/admin_plugins.html:126 +msgid "Toggle the module description" +msgstr "Переключить описание модуля" + +#: trac/admin/templates/admin_plugins.html:142 +msgid "Toggle the component description" +msgstr "Переключить описание компонента" + +#: trac/admin/templates/admin_versions.html:10 trac/ticket/admin.py:440 msgid "Versions" msgstr "Версии" #: trac/admin/templates/admin_versions.html:14 msgid "Manage Versions" -msgstr "Управление версиями" +msgstr "Управлять версиями" #: trac/admin/templates/admin_versions.html:19 msgid "Modify Version:" @@ -704,104 +998,135 @@ msgstr "Добавить версию:" #: trac/admin/templates/admin_versions.html:59 -#, fuzzy msgid "Released:" msgstr "Выпущена:" #: trac/admin/templates/admin_versions.html:77 -#, fuzzy msgid "Released" msgstr "Выпущена" -#: trac/db/api.py:98 +#: trac/db/api.py:132 #, fuzzy, python-format msgid "Unsupported database type \"%(scheme)s\"" msgstr "Неподдерживаемый тип базы данных \"%(scheme)s\"" -#: trac/db/api.py:121 -#, fuzzy -msgid "Database connection string must start with scheme:/" -msgstr "Строка соединения с базой данных должна начинаться с имени схемы (scheme:/)" +#: trac/db/api.py:160 +#, fuzzy, python-format +msgid "" +"Unknown scheme \"%(scheme)s\"; database connection string must start with" +" {scheme}:/" +msgstr "" +"Строка соединения с базой данных должна начинаться с имени схемы " +"(scheme:/)" -#: trac/db/pool.py:113 +#: trac/db/mysql_backend.py:75 +msgid "Cannot load Python bindings for MySQL" +msgstr "" + +#: trac/db/pool.py:122 #, fuzzy, python-format msgid "Unable to get database connection within %(time)d seconds" msgstr "Невозможно соединиться с базой данных в течении %(time)d секунд" -#: trac/db/sqlite_backend.py:133 +#: trac/db/postgres_backend.py:68 +msgid "Cannot load Python bindings for PostgreSQL" +msgstr "" + +#: trac/db/sqlite_backend.py:147 +msgid "Cannot load Python bindings for SQLite" +msgstr "" + +#: trac/db/sqlite_backend.py:151 +msgid "Need at least PySqlite 2.0.7 or higher" +msgstr "" + +#: trac/db/sqlite_backend.py:174 #, fuzzy, python-format msgid "Database already exists at %(path)s" msgstr "База данных по пути %(path)s уже существует" -#: trac/db/sqlite_backend.py:161 -#, fuzzy, python-format +#: trac/db/sqlite_backend.py:220 +#, python-format msgid "Database \"%(path)s\" not found." -msgstr "Не найден путь к базе данных \"%(path)s\"" +msgstr "База данных \"%(path)s\" не найдена." -#: trac/db/sqlite_backend.py:170 +#: trac/db/sqlite_backend.py:229 #, fuzzy, python-format msgid "" -"The user %(user)s requires read _and_ write permission to the database " +"The user %(user)s requires read _and_ write permissions to the database " "file %(path)s and the directory it is located in." -msgstr "Пользователю %(user)s трубуются права на чтение _и_ на запись к файлу базы данных " -"%(path)s и директории, в которой она находится." +msgstr "" +"Пользователю %(user)s трубуются права на чтение _и_ на запись к файлу " +"базы данных \"\n" +"\"%(path)s и директории, в которой она находится." -#: trac/mimeview/api.py:553 trac/mimeview/api.py:563 +#: trac/mimeview/api.py:663 trac/mimeview/api.py:673 #, fuzzy, python-format msgid "No available MIME conversions from %(old)s to %(new)s" msgstr "Нет доступного MIME преобразования из %(old)s в %(new)s" -#: trac/mimeview/patch.py:55 +#: trac/mimeview/api.py:781 +#, python-format +msgid "HTML preview using %(renderer)s failed (%(err)s)" +msgstr "" + +#: trac/mimeview/patch.py:53 msgid "Invalid unified diff content" +msgstr "Недопустимое содержание унифицированного diff'а" + +#: trac/mimeview/patch.py:163 +#, python-format +msgid "new file %(new)s" +msgstr "новый файл %(new)s" + +#: trac/mimeview/patch.py:167 +#, python-format +msgid "deleted file %(deleted)s" msgstr "" -#: trac/mimeview/php.py:98 -msgid "" -"You appear to be using the PHP CGI binary. Trac requires the CLI version " -"for syntax highlighting." +#: trac/mimeview/patch.py:239 +msgid "this hunk was shorter than expected" msgstr "" -#: trac/mimeview/rst.py:60 -#, fuzzy -msgid "Docutils not found" -msgstr "Не найден пакет Docutils" +#: trac/mimeview/pygments.py:121 trac/prefs/templates/prefs_pygments.html:9 +msgid "Syntax Highlighting" +msgstr "Подсветка синтаксиса" -#: trac/mimeview/rst.py:62 -#, fuzzy, python-format -msgid "Docutils version >= %(version)s required, %(found)s found" -msgstr "Требуется пакет Docutils версии >= %(version)s, найден пакет версии %(found)s" - -#: trac/prefs/web_ui.py:54 trac/prefs/templates/prefs.html:16 +#: trac/prefs/web_ui.py:52 trac/prefs/templates/prefs.html:16 +#: trac/ticket/templates/ticket.html:477 +#: trac/wiki/templates/wiki_edit_form.html:50 msgid "Preferences" -msgstr "Настройки" +msgstr "Предпочтения" -#: trac/prefs/web_ui.py:77 +#: trac/prefs/web_ui.py:75 msgid "Unknown preference panel" -msgstr "Неизвестная панель настроек" +msgstr "Неизвестная панель предпочтений" -#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_datetime.html:9 +#: trac/prefs/web_ui.py:87 trac/prefs/templates/prefs_datetime.html:10 msgid "Date & Time" msgstr "Дата и время" -#: trac/prefs/web_ui.py:91 trac/prefs/templates/prefs_keybindings.html:9 +#: trac/prefs/web_ui.py:88 trac/prefs/templates/prefs_keybindings.html:10 msgid "Keyboard Shortcuts" msgstr "Горячие клавиши" -#: trac/prefs/web_ui.py:93 trac/prefs/templates/prefs_language.html:9 -#, fuzzy +#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_language.html:9 msgid "Language" msgstr "Язык" -#: trac/prefs/web_ui.py:95 trac/prefs/templates/prefs_advanced.html:9 +#: trac/prefs/web_ui.py:92 trac/prefs/templates/prefs_advanced.html:9 msgid "Advanced" msgstr "Дополнительно" +#: trac/prefs/web_ui.py:143 +msgid "Your preferences have been saved." +msgstr "Ваши предпочтения сохранены." + #: trac/prefs/templates/prefs.html:10 msgid "Preferences:" -msgstr "Настройки:" +msgstr "Предпочтения:" #: trac/prefs/templates/prefs.html:17 -#, fuzzy msgid "" "This page lets you customize your personal settings for this site.\n" " These settings are stored on the server and are identified by a " @@ -810,12 +1135,13 @@ " be\n" " restored on subsequent visits." msgstr "" -"Эта страница позволяет изменить личные настройки для этого сайта.\n" -" Настройки сохраняются на сервере и активируются при последующих\n" -" посещениях при помощи cookie." +"Эта страница позволяет Вам изменить личные настройки для этого сайта.\n" +" Эти настройки сохраняются на сервере и распознаются по ключу " +"сеанса,\n" +" сохранённом в cookie браузера. Этот cookie позволяет восстановить \n" +" Ваши настройки при последующих посещениях." #: trac/prefs/templates/prefs.html:33 -#, fuzzy msgid "Save changes" msgstr "Сохранить изменения" @@ -831,16 +1157,18 @@ " easier to remember at any time if you wish to load your settings\n" " in a different web browser." msgstr "" -"Ключ сеанса используется для сохранения данных и настроек на сервере.\n" -" По умолчанию, он создается сервером, но его можно заменить на \n" -" легко запоминающийся, чтобы загрузить установки на других браузерах." +"Ключ сеанса используется для идентификации сохранённых пользовательских\n" +" настроек и данных сеанса на сервере. Несмотря на то, что\n" +" по умолчанию он генерируется автоматически, Вы в любое время можете" +" сменить его на что-нибудь\n" +" легко запоминающееся, если желаете загрузить Ваши настройки\n" +" в другом веб-браузере." #: trac/prefs/templates/prefs_advanced.html:26 msgid "Restore session:" msgstr "Восстановить сессию:" #: trac/prefs/templates/prefs_advanced.html:29 -#, fuzzy msgid "Load" msgstr "Загрузить" @@ -851,20 +1179,20 @@ "between\n" " multiple computers and web browsers." msgstr "" -"Можно загрузить сессию, созданную ранее, введя ее ключ в данное поле.\n" -"Таким образом можно использовать общие настройки на разных компьютерах и " -"браузерах." +"Вы можете загрузить созданный раннее сеанс, введя ниже\n" +" соответствующий ключ сеанса. Это позволяет Вам разделять настройки " +"между\n" +" несколькими компьютерами и веб-браузерами." -#: trac/prefs/templates/prefs_datetime.html:15 -#, fuzzy +#: trac/prefs/templates/prefs_datetime.html:16 msgid "Time zone:" msgstr "Часовой пояс:" -#: trac/prefs/templates/prefs_datetime.html:17 +#: trac/prefs/templates/prefs_datetime.html:18 msgid "Default time zone" msgstr "Часовой пояс по умолчанию" -#: trac/prefs/templates/prefs_datetime.html:24 +#: trac/prefs/templates/prefs_datetime.html:25 msgid "" "Configuring your time zone will result in all\n" " dates and times displayed on this site to use your time zone\n" @@ -874,28 +1202,27 @@ "время\n" " вместо времени сервера." -#: trac/prefs/templates/prefs_datetime.html:28 +#: trac/prefs/templates/prefs_datetime.html:30 msgid "Example: The current time is" msgstr "Пример: текущее время:" -#: trac/prefs/templates/prefs_datetime.html:29 -#, fuzzy +#: trac/prefs/templates/prefs_datetime.html:31 msgid "(UTC)." -msgstr "(по Гринвичу, UTC)." +msgstr "(UTC)." -#: trac/prefs/templates/prefs_datetime.html:30 +#: trac/prefs/templates/prefs_datetime.html:32 msgid "In" msgstr "В" -#: trac/prefs/templates/prefs_datetime.html:31 +#: trac/prefs/templates/prefs_datetime.html:33 msgid "time zone" msgstr "часовом поясе" -#: trac/prefs/templates/prefs_datetime.html:31 +#: trac/prefs/templates/prefs_datetime.html:33 msgid ", this would be displayed as" msgstr ", будет отображено как" -#: trac/prefs/templates/prefs_datetime.html:35 +#: trac/prefs/templates/prefs_datetime.html:37 msgid "" "Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean " "Time (GMT)." @@ -903,7 +1230,7 @@ "UTC, всеообщее скоординированное время, также известно как GMT, " "Гринвическое время." -#: trac/prefs/templates/prefs_datetime.html:36 +#: trac/prefs/templates/prefs_datetime.html:38 #, fuzzy msgid "" "A positive offset is used to indicate a timezone at the east of " @@ -915,9 +1242,8 @@ msgstr "Полное имя:" #: trac/prefs/templates/prefs_general.html:20 -#, fuzzy msgid "Email address:" -msgstr "Адрес email:" +msgstr "Email-адрес:" #: trac/prefs/templates/prefs_general.html:26 msgid "" @@ -938,171 +1264,127 @@ "почты\n" "и RSS обновлений." -#: trac/prefs/templates/prefs_keybindings.html:17 +#: trac/prefs/templates/prefs_keybindings.html:18 +#, fuzzy msgid "Enable access keys" msgstr "Разрешить горячие клавиши" -#: trac/prefs/templates/prefs_keybindings.html:20 +#: trac/prefs/templates/prefs_keybindings.html:21 +#, fuzzy msgid "" -"This site provides keyboard shortcuts for faster\n" -" access to certain functions of this site. As these shortcuts can\n" +"This site provides keyboard shortcuts for\n" +" faster access to certain functions of this site. As these shortcuts" +" can\n" " cause conflicts with shortcuts provided by the desktop system or\n" -" web browser, they are disabled by default. See" +" web browser, they are disabled by default. See\n" +" [1:TracAccessibility]\n" +" for more information on access keys." msgstr "" "Сайт предоставляет горячие клавиши для быстрого доступа к некоторым " "функциям.Так как они могут конфликтовать с клавишами, используемыми вашей" " системой и браузером, по умолчанию они отключены. См." -#: trac/prefs/templates/prefs_keybindings.html:24 -msgid "TracAccessibility" -msgstr "" - -#: trac/prefs/templates/prefs_keybindings.html:24 -msgid "for more information on access keys." -msgstr " о горячих клавишах." - #: trac/prefs/templates/prefs_language.html:14 -#, fuzzy msgid "Language:" msgstr "Язык:" #: trac/prefs/templates/prefs_language.html:16 -#, fuzzy msgid "default language" msgstr "язык по умолчанию" #: trac/prefs/templates/prefs_language.html:21 -#, fuzzy msgid "" "Configuring your language will result in all text\n" " displayed on this site to use your language instead of that of the\n" " server." msgstr "" -"Установка часового пояса приведет все поля даты и времени в ваше местное " -"время\n" -" вместо времени сервера." +"Настройка Вашего языка приведёт к тому, что весь текст,\n" +" представленный на этом сайте, будет отображён на Вашем языке вместо" +" языка\n" +" сервера." #: trac/prefs/templates/prefs_language.html:25 msgid "" "The 'default language' option uses the browser's\n" " language negotiation feature to select the appropriate language." msgstr "" +"Пункт 'язык по умолчанию' использует возможность\n" +" браузера по согласованию языка для выбора подходящего языка." -#: trac/prefs/templates/prefs_pygments.html:9 +#: trac/prefs/templates/prefs_pygments.html:36 #, fuzzy -msgid "Pygments Theme" -msgstr "Тема Pygments" - -#: trac/prefs/templates/prefs_pygments.html:36 msgid "" "The Pygments syntax highlighter can be used with\n" -" different coloring themes." +" different coloring styles." msgstr "" "Синтаксическая подсветка Pygments может использоваться с разными " "цветовыми темами." #: trac/prefs/templates/prefs_pygments.html:38 -msgid "Theme:" -msgstr "Тема:" +msgid "Style:" +msgstr "Стиль:" #: trac/prefs/templates/prefs_pygments.html:43 msgid "Preview:" msgstr "Предварительный просмотр:" -#: trac/search/web_ui.py:58 trac/search/templates/search.html:10 -#: trac/search/templates/search.html:23 trac/search/templates/search.html:28 +#: trac/search/web_ui.py:63 trac/search/templates/search.html:11 +#: trac/search/templates/search.html:24 trac/search/templates/search.html:29 #: trac/templates/theme.html:28 msgid "Search" msgstr "Поиск" -#: trac/search/web_ui.py:100 +#: trac/search/web_ui.py:153 #, python-format +msgid "Browse repository path %(path)s" +msgstr "Открыть путь репозитория %(path)s" + +#: trac/search/web_ui.py:193 +#, python-format msgid "Search query too short. Query must be at least %(num)s characters long." msgstr "Слишком короткий поисковый запрос, требуется как минимум %(num)s символов." -#: trac/search/web_ui.py:102 -msgid "Search Error" -msgstr "Ошибка поиска" - -#: trac/search/web_ui.py:137 trac/ticket/query.py:659 trac/ticket/report.py:316 -#, fuzzy +#: trac/search/web_ui.py:231 trac/ticket/query.py:763 trac/ticket/report.py:353 msgid "Next Page" msgstr "Следующая страница" -#: trac/search/web_ui.py:143 trac/ticket/query.py:664 trac/ticket/report.py:320 -#, fuzzy +#: trac/search/web_ui.py:237 trac/ticket/query.py:768 trac/ticket/report.py:356 msgid "Previous Page" -msgstr "Пердыдущая страница" +msgstr "Предыдущая страница" -#: trac/search/web_ui.py:185 -#, python-format -msgid "Browse repository path %(path)s" -msgstr "Открыть путь репозитория %(path)s" - -#: trac/search/templates/search.html:10 trac/search/templates/search.html:40 -#: trac/ticket/templates/query_results.html:21 -#: trac/ticket/templates/report_view.html:44 +#: trac/search/templates/search.html:11 trac/search/templates/search.html:41 +#: trac/ticket/templates/query_results.html:22 +#: trac/ticket/templates/report_view.html:86 msgid "Results" msgstr "Результаты" -#: trac/search/templates/search.html:48 +#: trac/search/templates/search.html:49 +#, fuzzy msgid "Quickjump to" msgstr "Перейти на" -#: trac/search/templates/search.html:56 +#: trac/search/templates/search.html:57 msgid "By" -msgstr "По" +msgstr "Изменено пользователем" -#: trac/search/templates/search.html:65 -#: trac/ticket/templates/report_view.html:166 +#: trac/search/templates/search.html:66 +#: trac/ticket/templates/report_view.html:199 msgid "No matches found." -msgstr "Нет совпадений." +msgstr "Совпадений не найдено." #: trac/search/templates/search.html:70 -#: trac/ticket/templates/milestone_delete.html:38 -#: trac/ticket/templates/milestone_edit.html:95 -#: trac/ticket/templates/milestone_view.html:96 -#: trac/ticket/templates/query.html:238 -#: trac/ticket/templates/report_delete.html:26 -#: trac/ticket/templates/report_edit.html:49 -#: trac/ticket/templates/report_view.html:169 -#: trac/ticket/templates/roadmap.html:71 trac/ticket/templates/ticket.html:395 -#: trac/timeline/templates/timeline.html:53 -#: trac/versioncontrol/templates/browser.html:142 -#: trac/versioncontrol/templates/diff_form.html:62 -#: trac/versioncontrol/templates/revisionlog.html:168 -msgid "Note:" -msgstr "Заметка:" +msgid "" +"[1:Note:] See [2:TracSearch]\n" +" for help on searching." +msgstr "" +"[1:Примечание:] Смотрите [2:TracSearch]\n" +" для справки по поиску." -#: trac/search/templates/search.html:70 -#: trac/ticket/templates/milestone_delete.html:38 -#: trac/ticket/templates/milestone_edit.html:95 -#: trac/ticket/templates/milestone_view.html:96 -#: trac/ticket/templates/query.html:238 -#: trac/ticket/templates/report_delete.html:26 -#: trac/ticket/templates/report_edit.html:49 -#: trac/ticket/templates/report_view.html:169 -#: trac/ticket/templates/roadmap.html:71 trac/ticket/templates/ticket.html:395 -#: trac/timeline/templates/timeline.html:53 -#: trac/versioncontrol/templates/browser.html:142 -#: trac/versioncontrol/templates/diff_form.html:62 -#: trac/versioncontrol/templates/revisionlog.html:168 -msgid "See" -msgstr "См." - -#: trac/search/templates/search.html:70 -msgid "TracSearch" -msgstr "Поиск" - -#: trac/search/templates/search.html:70 -msgid "for help on searching." -msgstr "помощь по поиску" - -#: trac/templates/about.html:23 +#: trac/templates/about.html:25 msgid "Trac: Integrated SCM & Project Management" msgstr "" -#: trac/templates/about.html:27 +#: trac/templates/about.html:29 msgid "" "Trac is a web-based software project management and bug/issue\n" " tracking system emphasizing ease of use and low ceremony.\n" @@ -1119,420 +1401,491 @@ "методов контролировать события и\"\n" "\"изменения в проекте." -#: trac/templates/about.html:33 +#: trac/templates/about.html:35 msgid "Trac is distributed under the modified BSD License." msgstr "Trac распространяется в рамках лицензии 'Modified BSD License'." -#: trac/templates/about.html:33 +#: trac/templates/about.html:35 msgid "The complete text of the license can be found" -msgstr "Полный текст лицензии доступен" +msgstr "Полный текст лицензии может быть найден" -#: trac/templates/about.html:35 -#, fuzzy +#: trac/templates/about.html:37 msgid "online" -msgstr "в сети" +msgstr "онлайн" -#: trac/templates/about.html:35 +#: trac/templates/about.html:37 msgid "as well as in the" msgstr "а также в файле" -#: trac/templates/about.html:36 +#: trac/templates/about.html:38 msgid "COPYING" -msgstr "" +msgstr "COPYING," -#: trac/templates/about.html:36 +#: trac/templates/about.html:38 msgid "file included in the distribution." msgstr "включенном в дистрибутив." -#: trac/templates/about.html:38 +#: trac/templates/about.html:40 msgid "python powered" msgstr "" -#: trac/templates/about.html:41 +#: trac/templates/about.html:43 msgid "Please visit the Trac open source project:" -msgstr "Пожалуйтса, посетите the Trac open source project:" +msgstr "Пожалуйтса, посетите open source проект Trac:" -#: trac/templates/about.html:42 +#: trac/templates/about.html:44 msgid "http://trac.edgewall.org/" msgstr "" -#: trac/templates/about.html:51 +#: trac/templates/about.html:53 msgid "System Information" msgstr "Системная информация" -#: trac/templates/about.html:65 +#: trac/templates/about.html:63 +msgid "Installed Plugins" +msgstr "Установленные плагины:" + +#: trac/templates/about.html:71 trac/templates/error.html:83 +#: trac/templates/error.html:217 +msgid "N/A" +msgstr "" + +#: trac/templates/about.html:82 msgid "Section" msgstr "Раздел" -#: trac/templates/about.html:67 trac/templates/error.html:162 +#: trac/templates/about.html:84 trac/templates/error.html:185 msgid "Value" msgstr "Значение" -#: trac/templates/attachment.html:10 +#: trac/templates/attachment.html:11 msgid "Attachment" msgstr "Вложение" -#: trac/templates/attachment.html:17 +#: trac/templates/attachment.html:26 msgid "Add Attachment to" msgstr "Добавить вложение к" -#: trac/templates/attachment.html:20 -#, fuzzy +#: trac/templates/attachment.html:29 msgid "(size limit" msgstr "(максимальный размер" -#: trac/templates/attachment.html:25 +#: trac/templates/attachment.html:34 msgid "Attachment Info" msgstr "Информация о вложении" -#: trac/templates/attachment.html:28 trac/ticket/templates/ticket.html:246 -#: trac/wiki/templates/wiki_edit.html:105 +#: trac/templates/attachment.html:37 trac/ticket/templates/ticket.html:468 +#: trac/wiki/templates/wiki_edit_form.html:46 msgid "Your email or username:" msgstr "Ваш электронный адрес или имя пользователя:" -#: trac/templates/attachment.html:34 +#: trac/templates/attachment.html:43 msgid "Description of the file (optional):" msgstr "Описание файла (не требуется):" -#: trac/templates/attachment.html:39 +#: trac/templates/attachment.html:49 msgid "Replace existing attachment of the same name" msgstr "Заменить существующее вложение с таким именем" -#: trac/templates/attachment.html:48 -#, fuzzy +#: trac/templates/attachment.html:59 msgid "Add attachment" -msgstr "Добавить вложение к" +msgstr "Добавить вложение" -#: trac/templates/attachment.html:56 -#, fuzzy +#: trac/templates/attachment.html:67 msgid "Are you sure you want to delete this attachment?" -msgstr "Вы действительно хотите удлить это вложение?" +msgstr "Вы уверены, что хотите удалить это вложение?" -#: trac/templates/attachment.html:56 trac/wiki/templates/wiki_delete.html:32 +#: trac/templates/attachment.html:67 trac/wiki/templates/wiki_delete.html:32 msgid "This is an irreversible operation." -msgstr "Изменения от данной операции нельзя будет отменить." +msgstr "Эта операция необратима." -#: trac/templates/attachment.html:63 trac/templates/attachment.html:103 -#, fuzzy +#: trac/templates/attachment.html:74 trac/templates/attachment.html:114 msgid "Delete attachment" msgstr "Удалить вложение" -#: trac/templates/attachment.html:78 trac/ticket/api.py:212 -#: trac/ticket/templates/ticket.html:165 -msgid "Description" -msgstr "Описание" +#: trac/templates/attachment.html:83 +msgid "Attach another file" +msgstr "Приложить ещё один файл" -#: trac/templates/attachment.html:82 -msgid "(added by" -msgstr "(добавлено" +#: trac/templates/attachment.html:92 +#, python-format +msgid "" +"File %(file)s, %(size)s\n" +" (added by %(author)s, %(date)s ago)" +msgstr "" +"Файл %(file)s, %(size)s\n" +" (добавлен пользователем %(author)s, %(date)s назад)" -#: trac/templates/attachment.html:83 trac/templates/diff_view.html:40 -#: trac/versioncontrol/templates/browser.html:104 -#: trac/versioncontrol/templates/changeset.html:96 -#: trac/wiki/templates/wiki_view.html:26 -msgid "ago)" -msgstr "нзад)" - -#: trac/templates/diff_div.html:53 -#: trac/versioncontrol/templates/browser.html:124 +#: trac/templates/diff_div.html:58 +#: trac/versioncontrol/templates/browser.html:130 msgid "Property" msgstr "Свойство" -#: trac/templates/diff_div.html:64 trac/ticket/templates/ticket.html:61 -#: trac/versioncontrol/templates/changeset.html:32 +#: trac/templates/diff_div.html:69 trac/ticket/templates/ticket.html:89 +#: trac/versioncontrol/templates/changeset.html:39 msgid "to" msgstr "на" -#: trac/templates/diff_div.html:69 +#: trac/templates/diff_div.html:74 msgid "Differences" msgstr "Различия" -#: trac/templates/diff_view.html:17 +#: trac/templates/diff_options.html:9 +msgid "View differences" +msgstr "Просмотреть различия" + +#: trac/templates/diff_options.html:12 +msgid "inline" +msgstr "построчно" + +#: trac/templates/diff_options.html:14 +msgid "side by side" +msgstr "бок о бок" + +#: trac/templates/diff_options.html:16 +msgid "Show" +msgstr "Показать" + +#: trac/templates/diff_options.html:20 +msgid "lines around each change" +msgstr "строк вокруг каждого изменения" + +#: trac/templates/diff_options.html:23 +msgid "Ignore:" +msgstr "Игнорировать:" + +#: trac/templates/diff_options.html:27 +msgid "Blank lines" +msgstr "Пустые строки" + +#: trac/templates/diff_options.html:32 +msgid "Case changes" +msgstr "Изменения регистра" + +#: trac/templates/diff_options.html:37 +msgid "White space changes" +msgstr "Изменения пробельных символов" + +#: trac/templates/diff_options.html:41 +#: trac/ticket/templates/milestone_view.html:59 +#: trac/ticket/templates/query.html:207 +#: trac/ticket/templates/report_view.html:33 +#: trac/ticket/templates/roadmap.html:25 +#: trac/timeline/templates/timeline.html:32 +#: trac/versioncontrol/templates/revisionlog.html:66 +msgid "Update" +msgstr "Обновить" + +#: trac/templates/diff_view.html:18 +#: trac/versioncontrol/templates/changeset.html:36 msgid "Changes" msgstr "Изменения" -#: trac/templates/diff_view.html:18 trac/templates/diff_view.html:21 +#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22 +#: trac/ticket/templates/query.html:115 msgid "between" msgstr "по сравнению" -#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:25 -#: trac/templates/history_view.html:26 trac/ticket/templates/ticket.html:98 -#: trac/wiki/web_ui.py:519 trac/wiki/templates/wiki_view.html:25 +#: trac/templates/diff_view.html:20 trac/templates/diff_view.html:26 +#: trac/templates/history_view.html:28 trac/ticket/admin.py:440 +#: trac/ticket/api.py:295 trac/ticket/templates/ticket.html:149 msgid "Version" msgstr "Версия" -#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22 -#: trac/timeline/templates/timeline.html:20 +#: trac/templates/diff_view.html:20 trac/templates/diff_view.html:23 +#: trac/ticket/templates/query.html:117 msgid "and" msgstr "и" -#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:716 -#: trac/ticket/templates/ticket.html:95 +#: trac/templates/diff_view.html:23 trac/ticket/web_ui.py:798 +#: trac/ticket/web_ui.py:933 trac/ticket/templates/ticket.html:146 msgid "Initial Version" msgstr "Исходная версия" -#: trac/templates/diff_view.html:24 -#: trac/versioncontrol/templates/changeset.html:71 +#: trac/templates/diff_view.html:25 +#: trac/versioncontrol/templates/changeset.html:37 +#: trac/versioncontrol/templates/changeset.html:81 msgid "from" msgstr "с" -#: trac/templates/diff_view.html:25 +#: trac/templates/diff_view.html:26 msgid "of" msgstr "из" -#: trac/templates/diff_view.html:37 -#: trac/versioncontrol/templates/changeset.html:94 -#, fuzzy +#: trac/templates/diff_view.html:39 +#: trac/versioncontrol/templates/changeset.html:104 msgid "Timestamp:" msgstr "Время:" -#: trac/templates/diff_view.html:39 trac/templates/diff_view.html:45 -#: trac/templates/diff_view.html:50 +#: trac/templates/diff_view.html:41 trac/templates/diff_view.html:48 +#: trac/templates/diff_view.html:54 msgid "(multiple changes)" msgstr "(несколько изменений)" -#: trac/templates/diff_view.html:46 +#: trac/templates/diff_view.html:43 +#: trac/versioncontrol/templates/changeset.html:105 +#, python-format +msgid "%(date)s (%(duration)s ago)" +msgstr "%(date)s (%(duration)s назад)" + +#: trac/templates/diff_view.html:50 msgid "(IP:" -msgstr "" +msgstr "(IP:" -#: trac/templates/diff_view.html:48 +#: trac/templates/diff_view.html:52 msgid "Comment:" -msgstr "Комментарий" +msgstr "Комментарий:" -#: trac/templates/diff_view.html:56 -#: trac/versioncontrol/templates/changeset.html:151 -#: trac/versioncontrol/templates/revisionlog.html:70 +#: trac/templates/diff_view.html:60 +#: trac/versioncontrol/templates/changeset.html:161 +#: trac/versioncontrol/templates/revisionlog.html:72 msgid "Legend:" msgstr "Обозначения:" -#: trac/templates/diff_view.html:58 -#: trac/versioncontrol/templates/changeset.html:153 +#: trac/templates/diff_view.html:62 +#: trac/versioncontrol/templates/changeset.html:163 msgid "Unmodified" -msgstr "Нет изменений" +msgstr "Не изменено" -#: trac/templates/diff_view.html:59 -#: trac/versioncontrol/templates/changeset.html:154 -#: trac/versioncontrol/templates/revisionlog.html:72 +#: trac/templates/diff_view.html:63 +#: trac/versioncontrol/templates/changeset.html:164 +#: trac/versioncontrol/templates/revisionlog.html:74 msgid "Added" msgstr "Добавлено" -#: trac/templates/diff_view.html:60 -#: trac/versioncontrol/templates/changeset.html:155 -#: trac/versioncontrol/templates/revisionlog.html:74 +#: trac/templates/diff_view.html:64 +#: trac/versioncontrol/templates/changeset.html:165 +#: trac/versioncontrol/templates/revisionlog.html:76 msgid "Removed" msgstr "Удалено" -#: trac/templates/diff_view.html:61 trac/ticket/query.py:588 -#: trac/versioncontrol/templates/changeset.html:157 -#: trac/versioncontrol/templates/revisionlog.html:76 +#: trac/templates/diff_view.html:65 trac/ticket/api.py:323 +#: trac/versioncontrol/templates/changeset.html:167 +#: trac/versioncontrol/templates/revisionlog.html:78 trac/wiki/admin.py:196 msgid "Modified" msgstr "Изменено" -#: trac/templates/error.html:60 +#: trac/templates/error.html:64 msgid "" "==== How to Reproduce ====\n" "\n" "While doing a" msgstr "" -#: trac/templates/error.html:64 +#: trac/templates/error.html:67 msgid "operation on `" msgstr "" -#: trac/templates/error.html:64 +#: trac/templates/error.html:67 msgid "" "`, Trac issued an internal error.\n" "\n" "''(please provide additional details here)''" msgstr "" -#: trac/templates/error.html:68 +#: trac/templates/error.html:71 msgid "" "Request parameters:\n" "{{{" msgstr "" -#: trac/templates/error.html:73 +#: trac/templates/error.html:76 msgid "==== System Information ====" msgstr "" -#: trac/templates/error.html:76 +#: trac/templates/error.html:80 +msgid "==== Enabled Plugins ====" +msgstr "" + +#: trac/templates/error.html:83 msgid "" "==== Python Traceback ====\n" "{{{" msgstr "" -#: trac/templates/error.html:84 -#, fuzzy +#: trac/templates/error.html:90 msgid "Create" -msgstr "Создано" +msgstr "Создать" -#: trac/templates/error.html:99 -#, fuzzy +#: trac/templates/error.html:105 msgid "Oops…" msgstr "Упс…" -#: trac/templates/error.html:101 -#, fuzzy +#: trac/templates/error.html:107 msgid "Trac detected an internal error:" -msgstr "Обнаружена внутренняя ошибка Trac:" +msgstr "Trac обнаружил внутреннюю ошибку:" -#: trac/templates/error.html:106 -#, fuzzy +#: trac/templates/error.html:112 msgid "" -"There was an internal error in Trac. It is recommended\n" -" that you inform your local" -msgstr "Обнаружена внутренняя ошибка Trac. Рекомендуется\n" -" информировать вашего локального" +"There was an internal error in Trac.\n" +" It is recommended that you notify your local\n" +" [1:\n" +" Trac administrator] with the information needed to\n" +" reproduce the issue." +msgstr "" -#: trac/templates/error.html:108 -#, fuzzy -msgid "" -"Trac\n" -" administrator" +#: trac/templates/error.html:120 +msgid "To that end, you could" msgstr "" -"Trac\n" -" администратора" -#: trac/templates/error.html:109 -#, fuzzy -msgid "" -"and give him all the information he needs to\n" -" reproduce the issue." +#: trac/templates/error.html:120 +msgid "a ticket." +msgstr "тикет." + +#: trac/templates/error.html:122 +msgid "The action that triggered the error was:" msgstr "" -"и предоставить ему всю информацию, которая может потребоваться\n" -" для воспроизведения данной ошибки." -#: trac/templates/error.html:114 -msgid "To that end, you could" +#: trac/templates/error.html:127 +msgid "This is probably a local installation issue." +msgstr "Возможно, это проблема локальной установки." + +#: trac/templates/error.html:128 +msgid "You should" +msgstr "Вам следует" + +#: trac/templates/error.html:129 +msgid "" +"a ticket at the admin Trac to report\n" +" the issue." msgstr "" -#: trac/templates/error.html:114 +#: trac/templates/error.html:134 +msgid "Found a bug in Trac?" +msgstr "Нашёл баг в Trac?" + +#: trac/templates/error.html:135 msgid "" -"a ticket at this\n" -" site." +"If you think this should work and you can reproduce the problem,\n" +" you should consider creating a bug report." msgstr "" +"Если Вы считаете, что это должно работать, и Вы можете воспроизвести " +"проблему,\n" +" Вам следует рассмотреть возможность создания отчёта о баге." -#: trac/templates/error.html:118 -msgid "The action that triggered the error was:" +#: trac/templates/error.html:138 +#, fuzzy +msgid "Note that the" +msgstr "Обратите внимание, что" + +#: trac/templates/error.html:139 +msgid "plugin seems to be involved." msgstr "" -#: trac/templates/error.html:124 -msgid "" -"If you think this should work you can reproduce the problem,\n" -" you should consider reporting this to the Trac team." +#: trac/templates/error.html:141 +msgid "Note that the following plugins seem to be involved:" msgstr "" -#: trac/templates/error.html:126 +#: trac/templates/error.html:145 +msgid "Please report this issue to the plugin maintainer." +msgstr "" + +#: trac/templates/error.html:147 msgid "" "Before you do that, though, please first try\n" -" [1:searching]\n" -" for similar issues, as it is quite likely that this " +" [1:[2:searching]\n" +" for similar issues], as it is quite likely that this " "problem\n" " has been reported before. For questions about " "installation\n" -" and configuration of Trac, please try the\n" -" [2:mailing list]\n" -" instead of filing a ticket." +" and configuration of Trac or its plugins, please try the\n" +" [3:mailing list]\n" +" instead of creating a ticket." msgstr "" -#: trac/templates/error.html:136 -msgid "Otherwise, please" -msgstr "" - -#: trac/templates/error.html:136 +#: trac/templates/error.html:156 +#, python-format msgid "" -"a new ticket at\n" -" the Trac project site, where you can describe the problem" -" and\n" -" explain how to reproduce it." +"Otherwise, please %(create)s a new bug report\n" +" describing the problem and explain how to reproduce it." msgstr "" -#: trac/templates/error.html:141 +#: trac/templates/error.html:160 msgid "Python Traceback" msgstr "" -#: trac/templates/error.html:142 +#: trac/templates/error.html:161 msgid "Most recent call last:" msgstr "" -#: trac/templates/error.html:147 trac/templates/error.html:174 +#: trac/templates/error.html:166 trac/templates/error.html:197 msgid "File \"" msgstr "" -#: trac/templates/error.html:147 +#: trac/templates/error.html:166 msgid "" "\",\n" " line" msgstr "" -#: trac/templates/error.html:148 trac/templates/error.html:174 +#: trac/templates/error.html:167 trac/templates/error.html:197 msgid ", in" msgstr "" -#: trac/templates/error.html:152 +#: trac/templates/error.html:171 msgid "Code fragment:" msgstr "" -#: trac/templates/error.html:160 +#: trac/templates/error.html:173 +msgid "Line" +msgstr "Строка" + +#: trac/templates/error.html:183 msgid "Local variables:" -msgstr "" +msgstr "Локальные переменные:" -#: trac/templates/error.html:174 +#: trac/templates/error.html:197 msgid "\", line" -msgstr "" +msgstr "\", строка" -#: trac/templates/error.html:177 +#: trac/templates/error.html:200 msgid "Switch to plain text view" -msgstr "" +msgstr "Переключиться в просмотр простого текста" -#: trac/templates/error.html:180 +#: trac/templates/error.html:203 msgid "System Information:" -msgstr "" +msgstr "Системная информация:" -#: trac/templates/error.html:192 +#: trac/templates/error.html:211 +msgid "Enabled Plugins:" +msgstr "Включённые плагины:" + +#: trac/templates/error.html:227 msgid "TracGuide" -msgstr "" +msgstr "TracGuide" -#: trac/templates/error.html:192 +#: trac/templates/error.html:227 msgid "— The Trac User and Administration Guide" -msgstr "" +msgstr "— Руководство пользователя и администрации Trac" -#: trac/templates/history_view.html:15 +#: trac/templates/history_view.html:16 msgid "Change History for" msgstr "История изменений" -#: trac/templates/history_view.html:20 trac/templates/history_view.html:51 -#: trac/versioncontrol/templates/diff_form.html:57 -#: trac/versioncontrol/templates/revisionlog.html:84 -#: trac/versioncontrol/templates/revisionlog.html:162 -#, fuzzy +#: trac/templates/history_view.html:22 trac/templates/history_view.html:53 +#: trac/versioncontrol/templates/diff_form.html:58 +#: trac/versioncontrol/templates/revisionlog.html:176 msgid "View changes" msgstr "Просмотреть изменения" -#: trac/templates/history_view.html:22 +#: trac/templates/history_view.html:24 msgid "Change history" msgstr "История изменений" -#: trac/templates/history_view.html:27 -#: trac/versioncontrol/templates/revisionlog.html:94 -msgid "Date" -msgstr "Дата" - -#: trac/templates/history_view.html:28 -#: trac/versioncontrol/templates/revisionlog.html:95 -msgid "Author" -msgstr "Автор" - -#: trac/templates/history_view.html:29 +#: trac/templates/history_view.html:31 #: trac/ticket/templates/ticket_notify_email.txt:21 msgid "Comment" msgstr "Комментарий" -#: trac/templates/history_view.html:41 +#: trac/templates/history_view.html:43 msgid "View this version" msgstr "Текущая версия" +#: trac/templates/history_view.html:46 +#, python-format +msgid "IP-Address: %(ipnr)s" +msgstr "IP-адрес: %(ipnr)s" + #: trac/templates/index.html:8 trac/templates/index.html:12 msgid "Available Projects" msgstr "Имеющиеся проекты" @@ -1541,1131 +1894,1477 @@ msgid "Error" msgstr "Ошибка" -#: trac/templates/layout.html:43 +#: trac/templates/layout.html:49 msgid "Download in other formats:" -msgstr "Загрузить в других форматах:" +msgstr "Скачать в других форматах:" -#: trac/templates/macros.html:40 -msgid "anonymous" -msgstr "аноним" - -#: trac/templates/macros.html:73 trac/templates/macros.html:74 +#: trac/templates/macros.html:36 trac/templates/macros.html:37 msgid "Previous" msgstr "Пред." -#: trac/templates/macros.html:83 trac/templates/macros.html:84 +#: trac/templates/macros.html:46 trac/templates/macros.html:47 msgid "Next" msgstr "След." -#: trac/templates/macros.html:94 -msgid "View differences" -msgstr "Смотреть различия" +#: trac/templates/macros.html:61 +msgid "(The file is empty)" +msgstr "(Файл пуст)" -#: trac/templates/macros.html:97 -#, fuzzy -msgid "inline" -msgstr "подряд" - -#: trac/templates/macros.html:99 -msgid "side by side" -msgstr "в двух колонках" - -#: trac/templates/macros.html:101 -msgid "Show" -msgstr "Показать" - -#: trac/templates/macros.html:104 -msgid "lines around each change" -msgstr "строк вокруг каждого изменения" - -#: trac/templates/macros.html:107 -msgid "Ignore:" -msgstr "Игнорировать:" - -#: trac/templates/macros.html:111 -msgid "Blank lines" -msgstr "Пустые строки" - -#: trac/templates/macros.html:116 -#, fuzzy -msgid "Case changes" -msgstr "Изменения регистра" - -#: trac/templates/macros.html:121 -msgid "White space changes" -msgstr "Изменения пробельных символов" - -#: trac/templates/macros.html:125 trac/ticket/templates/milestone_view.html:53 -#: trac/ticket/templates/query.html:179 trac/ticket/templates/roadmap.html:26 -#: trac/timeline/templates/timeline.html:30 -#: trac/versioncontrol/templates/revisionlog.html:64 -#, fuzzy -msgid "Update" -msgstr "Обновить" - -#: trac/templates/macros.html:138 trac/templates/macros.html:151 +#: trac/templates/macros.html:64 msgid "HTML preview not available" msgstr "Просмотр в формате HTML невозможен" -#: trac/templates/macros.html:140 +#: trac/templates/macros.html:66 msgid "since the file size exceeds" msgstr "так как длина файла превышает" -#: trac/templates/macros.html:141 +#: trac/templates/macros.html:67 msgid "bytes." msgstr "байт." -#: trac/templates/macros.html:143 +#: trac/templates/macros.html:69 msgid "since no preview renderer could handle it." msgstr "так как не найден подходящий обработчик." -#: trac/templates/macros.html:146 +#: trac/templates/macros.html:72 msgid "Try" msgstr "Вместо этого попробуйте" -#: trac/templates/macros.html:147 +#: trac/templates/macros.html:73 msgid "downloading" -msgstr "загрузить" +msgstr "скачать" -#: trac/templates/macros.html:147 +#: trac/templates/macros.html:73 msgid "the file instead." msgstr "файл." -#: trac/templates/macros.html:151 +#: trac/templates/macros.html:86 +#, python-format msgid "" -".\n" -" To view," +"[1:%(file)s]\n" +" [2:[3:]]\n" +" (%(size)s) - added by [4:%(author)s]\n" +" %(date)s ago." msgstr "" -".\n" -"Чтобы посмотреть," +"[1:%(file)s]\n" +" [2:[3:]]\n" +" (%(size)s) - добавлен пользователем [4:%(author)s]\n" +" %(date)s назад." -#: trac/templates/macros.html:152 -msgid "download" -msgstr "загрузить" - -#: trac/templates/macros.html:152 -msgid "the file." -msgstr "файл." - -#: trac/templates/macros.html:154 -msgid "found:" -msgstr "найдено:" - -#: trac/templates/macros.html:171 -#, fuzzy -msgid "View attachment" -msgstr "Посмотреть вложение" - -#: trac/templates/macros.html:172 -msgid ") - added by" -msgstr ") - добавлено" - -#: trac/templates/macros.html:173 trac/ticket/templates/query_results.html:70 -msgid "ago." -msgstr "назад." - -#: trac/templates/macros.html:178 trac/templates/macros.html:189 -#, fuzzy +#: trac/templates/macros.html:97 trac/templates/macros.html:108 +#: trac/ticket/templates/ticket.html:491 msgid "Attachments" msgstr "Вложения" -#: trac/templates/macros.html:214 +#: trac/templates/macros.html:133 msgid "Attach file" msgstr "Приложить файл" -#: trac/templates/macros.html:238 trac/templates/macros.html:242 -msgid "s:" -msgstr "ы:" +#: trac/templates/macros.html:148 +#, fuzzy, python-format +msgid "%(num)s of %(total)s %(unit)s %(title)s" +msgid_plural "%(num)s of %(total)s %(units)s %(title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: trac/templates/macros.html:242 -#, fuzzy -msgid "Total" -msgstr "Всего" +#: trac/templates/macros.html:161 +#, fuzzy, python-format +msgid "%(title)s %(unit)s:" +msgid_plural "%(title)s %(units)s:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +#: trac/templates/macros.html:171 +#, fuzzy, python-format +msgid "Total %(unit)s:" +msgid_plural "Total %(units)s:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: trac/templates/theme.html:26 msgid "Search:" msgstr "Поиск:" #: trac/templates/theme.html:37 -#, fuzzy msgid "Context Navigation" -msgstr "Просмотр карточек" +msgstr "" #: trac/templates/theme.html:46 msgid "Warning:" msgstr "Предупреждение:" -#: trac/templates/theme.html:49 -msgid "Warnings:" -msgstr "Предупреждения:" +#: trac/ticket/admin.py:36 +msgid "(Undefined)" +msgstr "" -#: trac/templates/theme.html:57 -#, fuzzy -msgid "Notice:" -msgstr "Заметка:" +#: trac/ticket/admin.py:47 +msgid "Ticket System" +msgstr "Система тикетов" -#: trac/templates/theme.html:60 -#, fuzzy -msgid "Notices:" -msgstr "Лицензия:" +#: trac/ticket/admin.py:112 +#, python-format +msgid "The component \"%(name)s\" has been added." +msgstr "Компонент \"%(name)s\" добавлен." -#: trac/ticket/admin.py:87 -#, fuzzy, python-format +#: trac/ticket/admin.py:117 trac/ticket/model.py:756 trac/ticket/model.py:778 +msgid "Invalid component name." +msgstr "Недопустимое имя компонента." + +#: trac/ticket/admin.py:118 +#, python-format msgid "Component %(name)s already exists." -msgstr "" +msgstr "Компонент %(name)s уже существует." -#: trac/ticket/admin.py:94 +#: trac/ticket/admin.py:125 msgid "No component selected" -msgstr "" +msgstr "Ни один компонент не выбран." -#: trac/ticket/admin.py:157 trac/ticket/roadmap.py:632 +#: trac/ticket/admin.py:133 +msgid "The selected components have been removed." +msgstr "Выбранные компоненты удалены." + +#: trac/ticket/admin.py:241 trac/ticket/api.py:293 +#: trac/ticket/templates/milestone_view.html:11 +#: trac/ticket/templates/milestone_view.html:22 +msgid "Milestone" +msgstr "Этап" + +#: trac/ticket/admin.py:270 trac/ticket/roadmap.py:661 msgid "Completion date may not be in the future" msgstr "Дата завершения не может быть в будущем" -#: trac/ticket/admin.py:159 -#, fuzzy +#: trac/ticket/admin.py:272 msgid "Invalid Completion Date" -msgstr "" +msgstr "Недопустимая дата завершения" -#: trac/ticket/admin.py:185 -#, fuzzy, python-format +#: trac/ticket/admin.py:299 +#, python-format +msgid "The milestone \"%(name)s\" has been added." +msgstr "Этап \"%(name)s\" добавлен." + +#: trac/ticket/admin.py:304 trac/ticket/model.py:896 trac/ticket/model.py:921 +msgid "Invalid milestone name." +msgstr "Недопустимое имя этапа." + +#: trac/ticket/admin.py:305 +#, python-format msgid "Milestone %(name)s already exists." -msgstr "" +msgstr "Этап %(name)s уже существует." -#: trac/ticket/admin.py:192 +#: trac/ticket/admin.py:313 msgid "No milestone selected" -msgstr "" +msgstr "Ни один этап не выбран." -#: trac/ticket/admin.py:267 -#, fuzzy, python-format +#: trac/ticket/admin.py:321 +msgid "The selected milestones have been removed." +msgstr "Выбранные этапы удалены." + +#: trac/ticket/admin.py:480 +#, python-format +msgid "The version \"%(name)s\" has been added." +msgstr "Версия \"%(name)s\" добавлена." + +#: trac/ticket/admin.py:485 trac/ticket/model.py:1033 trac/ticket/model.py:1055 +msgid "Invalid version name." +msgstr "Недопустимое имя версии." + +#: trac/ticket/admin.py:486 +#, python-format msgid "Version %(name)s already exists." -msgstr "" +msgstr "Версия %(name)s уже существует." -#: trac/ticket/admin.py:274 +#: trac/ticket/admin.py:493 msgid "No version selected" -msgstr "" +msgstr "Ни одна версия не выбрана" -#: trac/ticket/admin.py:348 -#, fuzzy, python-format +#: trac/ticket/admin.py:501 +msgid "The selected versions have been removed." +msgstr "Выбранные версии удалены." + +#: trac/ticket/admin.py:559 +msgid "Time" +msgstr "Время" + +#: trac/ticket/admin.py:629 +#, python-format +msgid "The %(field)s \"%(name)s\" has been added." +msgstr "Добавлен %(field)s «%(name)s»." + +#: trac/ticket/admin.py:635 trac/ticket/model.py:615 trac/ticket/model.py:642 +#, python-format +msgid "Invalid %(type)s name." +msgstr "Недопустимое %(type)s имя." + +#: trac/ticket/admin.py:637 +#, python-format msgid "%(type)s %(name)s already exists" -msgstr "" +msgstr "%(type)s %(name)s уже существует" -#: trac/ticket/admin.py:354 +#: trac/ticket/admin.py:643 #, python-format msgid "No %s selected" +msgstr "Ни один %s не выбран" + +#: trac/ticket/admin.py:653 +#, python-format +msgid "The selected %(fields)s have been removed." +msgstr "Выбранные %(fields)s удалены." + +#: trac/ticket/admin.py:674 +msgid "" +"Error writing to trac.ini, make sure it is writable by the web server. " +"The default value has not been saved." msgstr "" -#: trac/ticket/admin.py:383 +#: trac/ticket/admin.py:686 msgid "Order numbers must be unique" +msgstr "Числа порядка должны быть уникальными" + +#: trac/ticket/admin.py:748 +msgid "Possible Values" msgstr "" -#: trac/ticket/api.py:362 +#: trac/ticket/admin.py:770 #, python-format -msgid "Comment %(cnum)s for Ticket #%(id)s" +msgid "Invalid up/down value: %(value)s" msgstr "" -#: trac/ticket/api.py:383 -#, fuzzy, python-format +#: trac/ticket/admin.py:790 trac/ticket/api.py:292 +msgid "Priority" +msgstr "Приоритет" + +#: trac/ticket/admin.py:790 +msgid "Priorities" +msgstr "Приоритеты" + +#: trac/ticket/admin.py:796 trac/ticket/api.py:297 +msgid "Resolution" +msgstr "Решение" + +#: trac/ticket/admin.py:796 +msgid "Resolutions" +msgstr "Решения" + +#: trac/ticket/admin.py:802 trac/ticket/api.py:296 +msgid "Severity" +msgstr "Серьёзность" + +#: trac/ticket/admin.py:802 +msgid "Severities" +msgstr "Степени серьёзности" + +#: trac/ticket/admin.py:808 +msgid "Ticket Type" +msgstr "Тип тикетов" + +#: trac/ticket/admin.py:808 +msgid "Ticket Types" +msgstr "Типы тикетов" + +#: trac/ticket/admin.py:836 +msgid " must be a number" +msgstr " должен быть номером" + +#: trac/ticket/admin.py:841 +#, python-format +msgid "Ticket %(num)s and all associated data removed." +msgstr "Тикет %(num)s и все связанные данные удалены." + +#: trac/ticket/api.py:275 +msgid "Summary" +msgstr "Краткое описание" + +#: trac/ticket/api.py:277 +msgid "Reporter" +msgstr "Докладчик" + +#: trac/ticket/api.py:290 trac/versioncontrol/admin.py:106 +#: trac/versioncontrol/templates/admin_repositories.html:124 +msgid "Type" +msgstr "Тип" + +#: trac/ticket/api.py:291 +msgid "Status" +msgstr "Статус" + +#: trac/ticket/api.py:316 +msgid "Keywords" +msgstr "Ключевые слова" + +#: trac/ticket/api.py:317 +msgid "Cc" +msgstr "Копия" + +#: trac/ticket/api.py:321 +msgid "Created" +msgstr "Создано" + +#: trac/ticket/api.py:481 +#, python-format +msgid "Comment %(cnum)s for Ticket #%(id)s" +msgstr "Комментарий %(cnum)s для тикета #%(id)s" + +#: trac/ticket/api.py:502 +#, python-format msgid "Ticket #%(shortname)s" -msgstr "Задача #%(shortname)s" +msgstr "Тикет #%(shortname)s" -#: trac/ticket/default_workflow.py:226 +#: trac/ticket/default_workflow.py:225 msgid "Current state no longer exists" msgstr "" -#: trac/ticket/default_workflow.py:228 +#: trac/ticket/default_workflow.py:227 msgid "The ticket will be disowned" +msgstr "Тикет лишится владельца" + +#: trac/ticket/default_workflow.py:246 trac/ticket/default_workflow.py:262 +#, python-format +msgid "The owner will be changed from %(current_owner)s" +msgstr "Владелец изменится с %(current_owner)s" + +#: trac/ticket/default_workflow.py:252 +#, python-format +msgid "The owner will be changed from %(current_owner)s to %(selected_owner)s" msgstr "" -#: trac/ticket/default_workflow.py:247 trac/ticket/default_workflow.py:258 -msgid "The owner will change" +#: trac/ticket/default_workflow.py:257 +msgid "to " msgstr "" -#: trac/ticket/default_workflow.py:251 trac/ticket/default_workflow.py:261 +#: trac/ticket/default_workflow.py:267 #, python-format -msgid "The owner will change to %(name)s" +msgid "The owner will be changed from %(current_owner)s to %(authname)s" msgstr "" -#: trac/ticket/default_workflow.py:254 -msgid "to " +#: trac/ticket/default_workflow.py:277 +msgid "" +"Your workflow attempts to set a resolution but none is defined " +"(configuration issue, please contact your Trac admin)." msgstr "" -#: trac/ticket/default_workflow.py:273 +#: trac/ticket/default_workflow.py:282 #, python-format msgid "The resolution will be set to %(name)s" -msgstr "" +msgstr "Решение будет установлено в %(name)s" -#: trac/ticket/default_workflow.py:283 +#: trac/ticket/default_workflow.py:293 msgid "The resolution will be set" -msgstr "" +msgstr "Решение будет установлено" -#: trac/ticket/default_workflow.py:288 +#: trac/ticket/default_workflow.py:299 #, python-format msgid "Next status will be '%(name)s'" -msgstr "" +msgstr "Следующим статусом будет '%(name)s'" -#: trac/ticket/model.py:128 +#: trac/ticket/model.py:110 +#, python-format +msgid "Ticket %(id)s does not exist." +msgstr "Тикет %(id)s не существует." + +#: trac/ticket/model.py:111 +msgid "Invalid ticket number" +msgstr "Недопустимый номер тикета" + +#: trac/ticket/model.py:147 msgid "Multi-values fields not supported yet" msgstr "" -#: trac/ticket/model.py:363 +#: trac/ticket/model.py:574 #, python-format msgid "%(type)s %(name)s does not exist." -msgstr "" +msgstr "%(type)s %(name)s не существует." -#: trac/ticket/model.py:507 +#: trac/ticket/model.py:723 #, python-format msgid "Component %(name)s does not exist." +msgstr "Компонент %(name)s не существует." + +#: trac/ticket/model.py:841 +#, python-format +msgid "Milestone %(name)s does not exist." +msgstr "Этап %(name)s не существует." + +#: trac/ticket/model.py:842 +msgid "Invalid milestone name" +msgstr "Недопустимое имя этапа" + +#: trac/ticket/model.py:979 +msgid "Open (by due date)" +msgstr "Открытые (по срокам)" + +#: trac/ticket/model.py:980 +msgid "Open (no due date)" +msgstr "Открытые (сроков нет)" + +#: trac/ticket/model.py:983 +msgid "Closed" msgstr "" -#: trac/ticket/model.py:737 -#, fuzzy, python-format +#: trac/ticket/model.py:1000 +#, python-format msgid "Version %(name)s does not exist." -msgstr "Версия не существует: %(name)s" +msgstr "Версия %(name)s не существует." -#: trac/ticket/query.py:72 +#: trac/ticket/query.py:53 +msgid "Invalid query constraint value" +msgstr "" + +#: trac/ticket/query.py:87 #, python-format msgid "Query page %(page)s is invalid." msgstr "" -#: trac/ticket/query.py:88 +#: trac/ticket/query.py:102 #, python-format msgid "Query max %(max)s is invalid." msgstr "" -#: trac/ticket/query.py:135 +#: trac/ticket/query.py:158 msgid "Query filter requires field and constraints separated by a \"=\"" msgstr "" -#: trac/ticket/query.py:139 +#: trac/ticket/query.py:171 msgid "Query filter requires field name" msgstr "" -#: trac/ticket/query.py:271 +#: trac/ticket/query.py:304 #, python-format msgid "Page %(page)s is beyond the number of pages in the query" msgstr "" -#: trac/ticket/query.py:589 -msgid "Created" -msgstr "Создано" +#: trac/ticket/query.py:561 +#, python-format +msgid "Invalid ticket id list: %(value)s" +msgstr "" -#: trac/ticket/query.py:592 trac/ticket/web_ui.py:548 -#, fuzzy -msgid "Ticket" -msgstr "Задача" - -#: trac/ticket/query.py:608 +#: trac/ticket/query.py:661 trac/ticket/query.py:669 msgid "contains" msgstr "содержит" -#: trac/ticket/query.py:609 +#: trac/ticket/query.py:662 trac/ticket/query.py:670 msgid "doesn't contain" msgstr "не содержит" -#: trac/ticket/query.py:610 +#: trac/ticket/query.py:663 msgid "begins with" msgstr "начинается с" -#: trac/ticket/query.py:611 +#: trac/ticket/query.py:664 msgid "ends with" msgstr "кончается на" -#: trac/ticket/query.py:612 trac/ticket/query.py:616 +#: trac/ticket/query.py:665 trac/ticket/query.py:673 trac/ticket/query.py:677 msgid "is" msgstr "совпадает с" -#: trac/ticket/query.py:613 trac/ticket/query.py:617 +#: trac/ticket/query.py:666 trac/ticket/query.py:674 trac/ticket/query.py:678 msgid "is not" msgstr "не сопадает с" -#: trac/ticket/query.py:672 trac/ticket/report.py:327 +#: trac/ticket/query.py:708 trac/ticket/query.py:714 +msgid "Ticket" +msgstr "Тикет" + +#: trac/ticket/query.py:776 trac/ticket/report.py:362 #, python-format msgid "Page %(num)d" msgstr "" -#: trac/ticket/query.py:713 trac/ticket/report.py:511 trac/ticket/web_ui.py:113 -#: trac/timeline/web_ui.py:190 trac/versioncontrol/web_ui/log.py:241 +#: trac/ticket/query.py:825 trac/ticket/report.py:522 trac/ticket/web_ui.py:129 +#: trac/timeline/web_ui.py:214 trac/versioncontrol/web_ui/log.py:304 msgid "RSS Feed" -msgstr "" +msgstr "RSS-лента" -#: trac/ticket/query.py:715 trac/ticket/report.py:514 trac/ticket/web_ui.py:109 +#: trac/ticket/query.py:827 trac/ticket/report.py:524 trac/ticket/web_ui.py:125 msgid "Comma-delimited Text" -msgstr "Текст, разделенный запятыми (CSV)" +msgstr "Текст, разделённый запятыми" -#: trac/ticket/query.py:717 trac/ticket/report.py:516 trac/ticket/web_ui.py:111 +#: trac/ticket/query.py:829 trac/ticket/report.py:526 trac/ticket/web_ui.py:127 msgid "Tab-delimited Text" -msgstr "Текст, разделенный табуляцией" +msgstr "Текст, разделённый табуляцией" -#: trac/ticket/query.py:739 trac/ticket/report.py:62 -#, fuzzy +#: trac/ticket/query.py:851 trac/ticket/report.py:64 msgid "View Tickets" -msgstr "Задачи" +msgstr "Просмотреть тикеты" -#: trac/ticket/query.py:890 trac/ticket/query.py:901 trac/ticket/report.py:120 +#: trac/ticket/query.py:1058 trac/ticket/query.py:1069 +#: trac/ticket/report.py:126 msgid "Custom Query" msgstr "Произвольный запрос" -#: trac/ticket/query.py:900 trac/ticket/report.py:110 trac/ticket/report.py:111 -#: trac/ticket/report.py:113 trac/ticket/report.py:230 +#: trac/ticket/query.py:1068 trac/ticket/report.py:116 +#: trac/ticket/report.py:117 trac/ticket/report.py:119 +#: trac/ticket/templates/report_list.html:10 +#: trac/ticket/templates/report_list.html:15 msgid "Available Reports" -msgstr "Доступные отчеты" +msgstr "Доступные отчёты" -#: trac/ticket/query.py:987 +#: trac/ticket/query.py:1151 #, python-format msgid "[Error: %(error)s]" msgstr "[Ошибка: %(error)s]" -#: trac/ticket/query.py:1076 -#, fuzzy +#: trac/ticket/query.py:1285 msgid "No results" -msgstr "Нет результатов" +msgstr "Результатов нет" -#: trac/ticket/query.py:1114 +#: trac/ticket/query.py:1303 #, python-format +msgid "%(groupvalue)s %(groupname)s tickets matching %(query)s" +msgstr "" + +#: trac/ticket/query.py:1326 +#, python-format msgid "%(groupvalue)s %(groupname)s tickets:" msgstr "" -#: trac/ticket/report.py:177 +#: trac/ticket/report.py:150 +msgid "The report has been created." +msgstr "Отчёт создан." + +#: trac/ticket/report.py:162 +#, python-format +msgid "The report {%(id)d} has been deleted." +msgstr "Отчёт {%(id)d} удалён." + +#: trac/ticket/report.py:186 #, fuzzy, python-format msgid "Delete Report {%(num)s} %(title)s" msgstr "Удалить отчет {%(num)s} %(title)s" -#: trac/ticket/report.py:182 trac/ticket/report.py:194 -#: trac/ticket/report.py:242 +#: trac/ticket/report.py:191 trac/ticket/report.py:203 +#: trac/ticket/report.py:253 #, python-format -msgid "Report %(num)s does not exist." -msgstr "Отчет не существует: %(num)s" +msgid "Report {%(num)s} does not exist." +msgstr "Отчёт {%(num)s} не существует." -#: trac/ticket/report.py:183 trac/ticket/report.py:195 -#: trac/ticket/report.py:243 -#, fuzzy +#: trac/ticket/report.py:192 trac/ticket/report.py:204 +#: trac/ticket/report.py:254 msgid "Invalid Report Number" -msgstr "Недопустимый номер отчета" +msgstr "Недопустимый номер отчёта" -#: trac/ticket/report.py:207 -#, fuzzy +#: trac/ticket/report.py:216 msgid "Create New Report" -msgstr "Создать новый отчет" +msgstr "Создать новый отчёт" -#: trac/ticket/report.py:211 +#: trac/ticket/report.py:220 #, python-format msgid "Edit Report {%(num)d} %(title)s" msgstr "Редактировать отчет {%(num)d} %(title)s" -#: trac/ticket/report.py:225 +#: trac/ticket/report.py:259 #, python-format msgid "Report failed: %(error)s" msgstr "Сбой отчета: %(error)s" -#: trac/ticket/report.py:233 -msgid "This is a list of available reports." -msgstr "Список доступных отчетов:" - -#: trac/ticket/report.py:258 +#: trac/ticket/report.py:274 #, python-format msgid "When specified, the report number should be \"%(num)s\"." msgstr "Если номер отчета указан, то он должен быть \"%(num)s\"." -#: trac/ticket/report.py:305 +#: trac/ticket/report.py:325 #, python-format msgid "Report execution failed: %(error)s" msgstr "Ошибка при построении отчета: %(error)s" -#: trac/ticket/report.py:518 -#, fuzzy +#: trac/ticket/report.py:530 msgid "SQL Query" -msgstr "Запрос SQL" +msgstr "SQL-запрос" -#: trac/ticket/report.py:532 +#: trac/ticket/report.py:554 #, python-format -msgid "Report %(num)s has no SQL query." -msgstr "У отчета %(num)s не указан SQL-запрос." +msgid "The following arguments are missing: %(args)s" +msgstr "" -#: trac/ticket/report.py:562 +#: trac/ticket/report.py:568 #, python-format +msgid "Report {%(num)s} has no SQL query." +msgstr "У отчёта {%(num)s} нет SQL-запроса." + +#: trac/ticket/report.py:598 +#, python-format msgid "Query parameter \"sort=%(sort_col)s\" is invalid" msgstr "" -#: trac/ticket/report.py:605 -#, python-format -msgid "Dynamic variable '%(name)s' not defined." -msgstr "Не определена динамческая переменная '%(name)s'" +#: trac/ticket/roadmap.py:208 +msgid "ticket status" +msgstr "статус тикета" -#: trac/ticket/roadmap.py:213 +#: trac/ticket/roadmap.py:208 +msgid "ticket" +msgstr "тикет" + +#: trac/ticket/roadmap.py:208 +msgid "tickets" +msgstr "тикеты" + +#: trac/ticket/roadmap.py:218 #, python-format msgid "" "'%(group1)s' and '%(group2)s' milestone groups both are declared to be " "\"catch-all\" groups. Please check your configuration." msgstr "" -#: trac/ticket/roadmap.py:229 +#: trac/ticket/roadmap.py:234 #, python-format msgid "" "'%(groupname)s' milestone group reused status '%(status)s' already taken " "by other groups. Please check your configuration." msgstr "" -#: trac/ticket/roadmap.py:308 trac/ticket/roadmap.py:419 -#: trac/ticket/roadmap.py:549 trac/ticket/templates/roadmap.html:10 -#: trac/ticket/templates/roadmap.html:17 +#: trac/ticket/roadmap.py:317 trac/ticket/roadmap.py:433 +#: trac/ticket/roadmap.py:568 trac/ticket/templates/roadmap.html:11 +#: trac/ticket/templates/roadmap.html:16 msgid "Roadmap" msgstr "План работ" -#: trac/ticket/roadmap.py:350 +#: trac/ticket/roadmap.py:361 msgid "iCalendar" -msgstr "" +msgstr "iCalendar" -#: trac/ticket/roadmap.py:428 trac/ticket/roadmap.py:801 +#: trac/ticket/roadmap.py:442 trac/ticket/roadmap.py:842 #, python-format msgid "Milestone %(name)s" msgstr "Этап %(name)s" -#: trac/ticket/roadmap.py:447 +#: trac/ticket/roadmap.py:461 #, python-format msgid "Ticket #%(num)s: %(summary)s" -msgstr "Задача #%(num)s: %(summary)s" +msgstr "Тикет #%(num)s: %(summary)s" -#: trac/ticket/roadmap.py:621 +#: trac/ticket/roadmap.py:523 +msgid "Milestones reached" +msgstr "Достигнутые этапы" + +#: trac/ticket/roadmap.py:611 #, python-format -msgid "Milestone \"%(name)s\" already exists, please choose another name" -msgstr "Этап \"%(name)s\" уже существует, пожалуста, выберите другое название" +msgid "The milestone \"%(name)s\" has been deleted." +msgstr "" -#: trac/ticket/roadmap.py:626 +#: trac/ticket/roadmap.py:650 +#, python-format +msgid "Milestone \"%(name)s\" already exists, please choose another name." +msgstr "Этап \"%(name)s\" уже существует; пожалуста, выберите другое название." + +#: trac/ticket/roadmap.py:653 msgid "You must provide a name for the milestone." msgstr "Этап должен иметь название." -#: trac/ticket/web_ui.py:135 trac/ticket/templates/ticket.html:17 +#: trac/ticket/web_ui.py:151 trac/ticket/templates/ticket.html:18 msgid "New Ticket" -msgstr "Новая задача" +msgstr "Новый тикет" -#: trac/ticket/web_ui.py:151 +#: trac/ticket/web_ui.py:167 msgid "id can't be set for a new ticket request." msgstr "" -#: trac/ticket/web_ui.py:202 -#, fuzzy -msgid "Ticket changes" -msgstr "Изменения" +#: trac/ticket/web_ui.py:229 +msgid "Opened and closed tickets" +msgstr "Открытые и закрытые тикеты" -#: trac/ticket/web_ui.py:204 -msgid "Ticket details" -msgstr "Подробно" +#: trac/ticket/web_ui.py:231 +msgid "Ticket updates" +msgstr "Обновления тикета" -#: trac/ticket/web_ui.py:210 -#, fuzzy +#: trac/ticket/web_ui.py:237 msgid "created" -msgstr "Создано" +msgstr "создана" -#: trac/ticket/web_ui.py:211 -#, fuzzy +#: trac/ticket/web_ui.py:238 msgid "reopened" -msgstr "Открыта" +msgstr "снова открыт" -#: trac/ticket/web_ui.py:212 -#, fuzzy +#: trac/ticket/web_ui.py:239 msgid "closed" -msgstr "скопировано" +msgstr "закрыт" -#: trac/ticket/web_ui.py:213 -#, fuzzy +#: trac/ticket/web_ui.py:240 msgid "updated" -msgstr "обновлено" +msgstr "обновлён" -#: trac/ticket/web_ui.py:309 +#: trac/ticket/web_ui.py:260 #, fuzzy, python-format +msgid "%(labels)s changed" +msgid_plural "%(labels)s changed" +msgstr[0] "Сохранить изменения" +msgstr[1] "" +msgstr[2] "" + +#: trac/ticket/web_ui.py:340 +#, python-format msgid "Ticket %(ticketref)s (%(summary)s) %(verb)s" -msgstr "Задача %(ticketref)s (%(summary)s) %(verb)s" +msgstr "Тикет %(ticketref)s (%(summary)s) %(verb)s" -#: trac/ticket/web_ui.py:437 -#, fuzzy, python-format +#: trac/ticket/web_ui.py:495 +#, python-format msgid "Invalid action \"%(name)s\"" -msgstr "Этап %(name)s" +msgstr "Недопустимое действие \"%(name)s\"" -#: trac/ticket/web_ui.py:548 -#, fuzzy +#: trac/ticket/web_ui.py:623 +msgid "Previous Ticket" +msgstr "Предыдущий тикет" + +#: trac/ticket/web_ui.py:623 +msgid "Next Ticket" +msgstr "Следующий тикет" + +#: trac/ticket/web_ui.py:624 msgid "Back to Query" -msgstr "Вернуться к результатам запроса" +msgstr "Назад к запросу" -#: trac/ticket/web_ui.py:628 trac/ticket/web_ui.py:778 -#, fuzzy +#: trac/ticket/web_ui.py:706 trac/ticket/web_ui.py:854 +#: trac/ticket/web_ui.py:862 msgid "Ticket History" -msgstr "История изменений" +msgstr "История тикета" -#: trac/ticket/web_ui.py:673 -#, fuzzy +#: trac/ticket/web_ui.py:710 trac/ticket/web_ui.py:909 +#, python-format +msgid "Back to Ticket #%(num)s" +msgstr "Назад к тикету #%(num)s" + +#: trac/ticket/web_ui.py:752 msgid "No differences to show" -msgstr "Показать различия" +msgstr "" -#: trac/ticket/web_ui.py:713 trac/ticket/web_ui.py:768 -#: trac/ticket/web_ui.py:776 trac/wiki/web_ui.py:355 trac/wiki/web_ui.py:361 -#: trac/wiki/web_ui.py:507 trac/wiki/web_ui.py:515 +#: trac/ticket/web_ui.py:795 trac/ticket/web_ui.py:851 +#: trac/ticket/web_ui.py:859 trac/ticket/web_ui.py:930 +#: trac/ticket/web_ui.py:967 trac/ticket/web_ui.py:974 trac/wiki/web_ui.py:375 +#: trac/wiki/web_ui.py:381 trac/wiki/web_ui.py:570 trac/wiki/web_ui.py:584 #, python-format msgid "Version %(num)s" msgstr "Версия %(num)s" -#: trac/ticket/web_ui.py:716 +#: trac/ticket/web_ui.py:798 trac/ticket/web_ui.py:933 msgid "initial" msgstr "" -#: trac/ticket/web_ui.py:778 trac/versioncontrol/web_ui/changeset.py:342 -#: trac/wiki/web_ui.py:374 +#: trac/ticket/web_ui.py:861 trac/ticket/web_ui.py:976 +#: trac/versioncontrol/web_ui/changeset.py:362 trac/wiki/web_ui.py:394 +msgid "Previous Change" +msgstr "Предыдущее изменение" + +#: trac/ticket/web_ui.py:861 trac/ticket/web_ui.py:976 +#: trac/versioncontrol/web_ui/changeset.py:362 trac/wiki/web_ui.py:394 +msgid "Next Change" +msgstr "Следующее изменение" + +#: trac/ticket/web_ui.py:867 +msgid "Ticket Diff" +msgstr "Diff тикета" + +#: trac/ticket/web_ui.py:901 trac/ticket/web_ui.py:970 +#: trac/ticket/web_ui.py:977 #, fuzzy -msgid "Change" -msgstr "Изменения" +msgid "Ticket Comment History" +msgstr "История комментариев тикета" -#: trac/ticket/web_ui.py:783 +#: trac/ticket/web_ui.py:903 trac/ticket/web_ui.py:927 +#: trac/ticket/web_ui.py:984 +#, python-format +msgid "Ticket #%(num)s, comment %(cnum)d" +msgstr "Тикет #%(num)s, комментарий %(cnum)d" + +#: trac/ticket/web_ui.py:982 #, fuzzy -msgid "Ticket Diff" -msgstr "Изменения" +msgid "Ticket Comment Diff" +msgstr "Diff комментариев тикета" -#: trac/ticket/web_ui.py:851 +#: trac/ticket/web_ui.py:1068 +msgid "No permission to edit the ticket description." +msgstr "Нет права редактировать описание тикета." + +#: trac/ticket/web_ui.py:1074 +msgid "No permission to change the ticket reporter." +msgstr "Нет права менять автора тикета." + +#: trac/ticket/web_ui.py:1079 msgid "No permission to change ticket fields." -msgstr "Недостаточно прав для редактирования." +msgstr "Нет права менять поля тикета." -#: trac/ticket/web_ui.py:859 -msgid "No permissions to change ticket fields." -msgstr "Недостаточно прав для редактирвоания." - -#: trac/ticket/web_ui.py:868 +#: trac/ticket/web_ui.py:1088 msgid "No permissions to add a comment." msgstr "Недостаточно прав для добавления комментария." -#: trac/ticket/web_ui.py:874 +#: trac/ticket/web_ui.py:1094 msgid "" "Sorry, can not save your changes. This ticket has been modified by " "someone else since you started" msgstr "" -"К сожалению, невозможно принять ваши изменения, так как задача была " -"кем-то\"\n" -"\"изменена с момента начала редактирования" +"Извините, сохранить Ваши изменения не получается. С того момента, как Вы " +"начали, тикет был изменён кем-то другим." -#: trac/ticket/web_ui.py:881 +#: trac/ticket/web_ui.py:1101 msgid "Tickets must contain a summary." -msgstr "Задача должна иметь краткое описание." +msgstr "У тикета должно быть краткое описание." -#: trac/ticket/web_ui.py:904 -#, fuzzy, python-format +#: trac/ticket/web_ui.py:1124 +#, python-format msgid "Ticket description is too long (must be less than %(num)s characters)" -msgstr "Описание задачи слишком велико (не должно превышать %(num)s символов)" +msgstr "Слишком длинное описание тикета (должно быть меньше чем %(num)s символов)" -#: trac/ticket/web_ui.py:919 +#: trac/ticket/web_ui.py:1131 +#, python-format +msgid "Ticket comment is too long (must be less than %(num)s characters)" +msgstr "" +"Слишком длинный комментарий тикета (должен быть меньше чем %(num)s " +"символов)" + +#: trac/ticket/web_ui.py:1146 msgid "Invalid comment threading identifier" msgstr "" -#: trac/ticket/web_ui.py:926 -#, fuzzy, python-format +#: trac/ticket/web_ui.py:1153 +#, python-format msgid "The ticket field '%(field)s' is invalid: %(message)s" -msgstr "Недопустимое поле: '%(field)s': %(message)s" +msgstr "Поле '%(field)s' тикета недопустимо: %(message)s" -#: trac/ticket/web_ui.py:1043 -msgid "Assign to" -msgstr "" +#: trac/ticket/web_ui.py:1172 +#, python-format +msgid "" +"The ticket has been created, but an error occurred while sending " +"notifications: %(message)s" +msgstr "Тикет создан, но при отправке оповещений произошла ошибка: %(message)s" -#: trac/ticket/web_ui.py:1059 -#, fuzzy -msgid "Open" -msgstr "Компонент" +#: trac/ticket/web_ui.py:1182 +#, python-format +msgid "" +"Your ticket %(ticketref)s has been created, but you don't have permission" +" to view it." +msgstr "Ваш тикет %(ticketref)s создан, но у Вас нет права для его просмотра." -#: trac/ticket/web_ui.py:1060 -#, fuzzy -msgid "Closed" -msgstr "скопировано" +#. TRANSLATOR: The 'change' has been saved... (link) +#: trac/ticket/web_ui.py:1213 +msgid "change" +msgstr "изменение" -#: trac/ticket/web_ui.py:1075 +#: trac/ticket/web_ui.py:1219 +#, python-format +msgid "" +"The %(change)s has been saved, but an error occurred while sending " +"notifications: %(message)s" +msgstr "" + +#: trac/ticket/web_ui.py:1351 msgid "Add to Cc" msgstr "" -#: trac/ticket/web_ui.py:1076 +#: trac/ticket/web_ui.py:1352 msgid "Remove from Cc" msgstr "" -#: trac/ticket/web_ui.py:1077 +#: trac/ticket/web_ui.py:1353 msgid "Add/Remove from Cc" msgstr "" -#: trac/ticket/web_ui.py:1078 +#: trac/ticket/web_ui.py:1354 msgid "" msgstr "" -#: trac/ticket/web_ui.py:1098 trac/ticket/templates/query.html:89 +#: trac/ticket/web_ui.py:1375 trac/ticket/templates/query.html:102 msgid "yes" msgstr "да" -#: trac/ticket/web_ui.py:1098 trac/ticket/templates/query.html:92 +#: trac/ticket/web_ui.py:1375 trac/ticket/templates/query.html:105 msgid "no" msgstr "нет" -#: trac/ticket/web_ui.py:1268 trac/versioncontrol/templates/changeset.html:130 +#: trac/ticket/web_ui.py:1566 trac/versioncontrol/templates/changeset.html:140 msgid "modified" msgstr "изменено" -#: trac/ticket/templates/milestone_delete.html:9 -#: trac/ticket/templates/milestone_delete.html:21 +#: trac/ticket/templates/milestone_delete.html:10 +#: trac/ticket/templates/milestone_delete.html:22 msgid "Delete Milestone" msgstr "Удалить этап" -#: trac/ticket/templates/milestone_delete.html:25 +#: trac/ticket/templates/milestone_delete.html:27 msgid "Are you sure you want to delete this milestone?" -msgstr "Вы дествительно хотите удалить этот этап?" +msgstr "Вы уверены, что хотите удалить этот этап?" -#: trac/ticket/templates/milestone_delete.html:27 +#: trac/ticket/templates/milestone_delete.html:29 msgid "Retarget associated tickets to milestone" -msgstr "Переназначить связанные задачи на этап" +msgstr "Перенаправить привязанные тикеты в этап" -#: trac/ticket/templates/milestone_delete.html:34 -#: trac/ticket/templates/milestone_view.html:91 -#, fuzzy +#: trac/ticket/templates/milestone_delete.html:41 +#: trac/ticket/templates/milestone_view.html:105 msgid "Delete milestone" msgstr "Удалить этап" -#: trac/ticket/templates/milestone_delete.html:39 -#: trac/ticket/templates/milestone_edit.html:96 -#: trac/ticket/templates/milestone_view.html:97 -#: trac/ticket/templates/roadmap.html:72 -msgid "TracRoadmap" -msgstr "" - -#: trac/ticket/templates/milestone_delete.html:39 +#: trac/ticket/templates/milestone_delete.html:45 msgid "" -"for help on using\n" +"[1:Note:] See\n" +" [2:TracRoadmap] for help on using\n" " the roadmap." -msgstr "для справки по использованию Плана" +msgstr "" +"[1:Примечание:] Смотрите\n" +" [2:TracRoadmap] для справки по использованию\n" +" плана работ." #: trac/ticket/templates/milestone_edit.html:11 -#: trac/ticket/templates/milestone_edit.html:37 +#: trac/ticket/templates/milestone_edit.html:36 msgid "Edit Milestone" -msgstr "Редактировать этапы" +msgstr "Редактировать этап" #: trac/ticket/templates/milestone_edit.html:12 -#: trac/ticket/templates/milestone_edit.html:38 +#: trac/ticket/templates/milestone_edit.html:37 msgid "New Milestone" msgstr "Новый этап" -#: trac/ticket/templates/milestone_edit.html:45 +#: trac/ticket/templates/milestone_edit.html:44 msgid "Name of the milestone:" msgstr "Название этапа:" -#: trac/ticket/templates/milestone_edit.html:50 +#: trac/ticket/templates/milestone_edit.html:49 msgid "Schedule" -msgstr "Запланировано к" +msgstr "Расписание" -#: trac/ticket/templates/milestone_edit.html:71 +#: trac/ticket/templates/milestone_edit.html:70 msgid "Retarget associated open tickets to milestone:" -msgstr "Переназначить связанные открытые задачи на этап:" +msgstr "Перенаправить открытые связанные тикеты в этап:" -#: trac/ticket/templates/milestone_edit.html:89 -#: trac/wiki/templates/wiki_edit.html:126 -#: trac/wiki/templates/wiki_edit.html:131 -#, fuzzy +#: trac/ticket/templates/milestone_edit.html:91 +#: trac/ticket/templates/ticket.html:108 trac/ticket/templates/ticket.html:500 +#: trac/wiki/templates/wiki_edit_form.html:70 +#: trac/wiki/templates/wiki_edit_form.html:75 msgid "Submit changes" -msgstr "Сохранить" +msgstr "Отправить изменения" -#: trac/ticket/templates/milestone_edit.html:90 -#, fuzzy +#: trac/ticket/templates/milestone_edit.html:92 msgid "Add milestone" -msgstr "Добавить этап:" +msgstr "Добавить этап" -#: trac/ticket/templates/milestone_edit.html:96 -#: trac/ticket/templates/milestone_view.html:97 -#: trac/ticket/templates/roadmap.html:72 -#, fuzzy +#: trac/ticket/templates/milestone_edit.html:97 +#: trac/ticket/templates/milestone_view.html:111 +#: trac/ticket/templates/roadmap.html:76 msgid "" -"for help on using\n" +"[1:Note:] See\n" +" [2:TracRoadmap] for help on using\n" " the roadmap." -msgstr "для справки по использованию Плана." +msgstr "" +"[1:Примечание:] Смотрите\n" +" [2:TracRoadmap] для справки по использованию\n" +" плана работ." -#: trac/ticket/templates/milestone_view.html:10 -#: trac/ticket/templates/milestone_view.html:22 -msgid "Milestone" -msgstr "Этап" - #: trac/ticket/templates/milestone_view.html:26 +#, python-format msgid "" -"ago\n" -" (" -msgstr "назад (" +"Completed %(duration)s ago\n" +" (%(date)s)" +msgstr "" +"Выполнен %(duration)s назад\n" +" (%(date)s)" -#: trac/ticket/templates/milestone_view.html:30 -#: trac/ticket/templates/roadmap.html:43 -msgid "late" -msgstr "задержка" +#: trac/ticket/templates/milestone_view.html:32 +#, python-format +msgid "" +"[1:%(duration)s late]\n" +" (%(date)s)" +msgstr "" +"[1:Задерживается на %(duration)s]\n" +" (%(date)s)" -#: trac/ticket/templates/milestone_view.html:33 -#: trac/ticket/templates/roadmap.html:46 -msgid "Due in" -msgstr "Срок к" +#: trac/ticket/templates/milestone_view.html:38 +#, python-format +msgid "" +"Due in %(duration)s\n" +" (%(date)s)" +msgstr "" +"Осталось %(duration)s\n" +" (%(date)s)" -#: trac/ticket/templates/milestone_view.html:37 -#: trac/ticket/templates/roadmap.html:50 +#: trac/ticket/templates/milestone_view.html:43 +#: trac/ticket/templates/roadmap.html:55 msgid "No date set" msgstr "Дата не установлена" -#: trac/ticket/templates/milestone_view.html:47 -#: trac/timeline/templates/timeline.html:42 +#: trac/ticket/templates/milestone_view.html:53 +#: trac/timeline/templates/timeline.html:44 msgid "by" -msgstr "-" +msgstr "пользователем" -#: trac/ticket/templates/milestone_view.html:58 -#, fuzzy +#: trac/ticket/templates/milestone_view.html:67 msgid "(none)" -msgstr "Не установлено" +msgstr "(нет)" -#: trac/ticket/templates/milestone_view.html:87 -#, fuzzy +#: trac/ticket/templates/milestone_view.html:99 msgid "Edit milestone" -msgstr "Редактировать этапы" +msgstr "Редактировать этап" -#: trac/ticket/templates/query.html:28 -#: trac/ticket/templates/query_results.html:29 +#: trac/ticket/templates/query.html:29 +#: trac/ticket/templates/query_results.html:30 +#: trac/ticket/templates/report_view.html:94 #, fuzzy, python-format msgid "%(num)s match" msgid_plural "%(num)s matches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)s совпадение" +msgstr[1] "%(num)s совпадения" +msgstr[2] "%(num)s совпадений" -#: trac/ticket/templates/query.html:37 +#: trac/ticket/templates/query.html:38 msgid "Filters" msgstr "Фильтры" -#: trac/ticket/templates/query.html:38 +#: trac/ticket/templates/query.html:39 msgid "Query filters" msgstr "Фильтры запроса" -#: trac/ticket/templates/query.html:113 -msgid "Add filter" -msgstr "Добавить фильтр" +#: trac/ticket/templates/query.html:45 trac/ticket/templates/query.html:141 +msgid "Or" +msgstr "Или" -#: trac/ticket/templates/query.html:133 +#: trac/ticket/templates/query.html:127 +msgid "And" +msgstr "И" + +#: trac/ticket/templates/query.html:160 msgid "Columns" msgstr "Столбцы" -#: trac/ticket/templates/query.html:147 +#: trac/ticket/templates/query.html:174 msgid "Group results by" msgstr "Группировать результаты по" -#: trac/ticket/templates/query.html:157 +#: trac/ticket/templates/query.html:185 msgid "descending" msgstr "убыванию" -#: trac/ticket/templates/query.html:161 +#: trac/ticket/templates/query.html:189 msgid "Show under each result:" msgstr "Показать для каждого результата:" -#: trac/ticket/templates/query.html:171 +#: trac/ticket/templates/query.html:199 +#: trac/ticket/templates/report_view.html:27 msgid "Max items per page" -msgstr "" +msgstr "Макс. кол-во элементов на страницу" -#: trac/ticket/templates/query.html:214 +#: trac/ticket/templates/query.html:242 msgid "Edit query" -msgstr "Редактировать отчет" +msgstr "Редактировать запрос" -#: trac/ticket/templates/query.html:222 +#: trac/ticket/templates/query.html:250 msgid "Save query" -msgstr "Сохранить отчет" +msgstr "Сохранить запрос" -#: trac/ticket/templates/query.html:222 +#: trac/ticket/templates/query.html:250 #, python-format msgid "Save updated query in report {%(id)s}" msgstr "" -#: trac/ticket/templates/query.html:222 +#: trac/ticket/templates/query.html:250 msgid "Create new report from current query" msgstr "" -#: trac/ticket/templates/query.html:231 -#, fuzzy +#: trac/ticket/templates/query.html:258 msgid "Delete query" -msgstr "Удалить отчет" +msgstr "Удалить запрос" -#: trac/ticket/templates/query.html:238 -#: trac/ticket/templates/report_edit.html:36 -msgid "TracQuery" +#: trac/ticket/templates/query.html:264 +msgid "" +"[1:Note:] See [2:TracQuery]\n" +" for help on using queries." msgstr "" +"[1:Примечание:] Смотрите [2:TracQuery]\n" +" для справки по использованию запросов." -#: trac/ticket/templates/query.html:238 -msgid "for help on using queries." -msgstr "для справки по использованию запросов." +#: trac/ticket/templates/query_results.html:45 +msgid "No tickets found" +msgstr "Ни одного тикета не найдено." -#: trac/ticket/templates/query_results.html:53 -#: trac/ticket/templates/query_results.html:55 -#, fuzzy +#: trac/ticket/templates/query_results.html:59 +#: trac/ticket/templates/query_results.html:61 msgid "View ticket" -msgstr "Просмотр задачи" +msgstr "Просмотреть тикет" -#: trac/ticket/templates/query_results.html:69 -msgid "Reported by" -msgstr "От кого" +#: trac/ticket/templates/query_results.html:66 +#: trac/ticket/templates/report_view.html:176 +msgid "View milestone" +msgstr "Просмотреть этап" -#: trac/ticket/templates/query_results.html:76 -#, fuzzy +#: trac/ticket/templates/query_results.html:77 +#, python-format +msgid "" +"Reported by [1:%(author)s],\n" +" %(date)s ago." +msgstr "" + +#: trac/ticket/templates/query_results.html:84 msgid "(this ticket)" -msgstr "(текущая задача)" +msgstr "(данный тикет)" -#: trac/ticket/templates/query_results.html:92 +#: trac/ticket/templates/query_results.html:100 msgid "(more results for this group on next page)" msgstr "" -#: trac/ticket/templates/report_delete.html:18 -#, fuzzy +#: trac/ticket/templates/report_delete.html:17 msgid "Are you sure you want to delete this report?" -msgstr "Вы действительно хотите удалить данный отчет?" +msgstr "Вы уверены, что хотите удалить данный отчёт?" -#: trac/ticket/templates/report_delete.html:21 -#: trac/ticket/templates/report_view.html:39 -#, fuzzy +#: trac/ticket/templates/report_delete.html:22 +#: trac/ticket/templates/report_list.html:36 +#: trac/ticket/templates/report_view.html:82 msgid "Delete report" -msgstr "Удалить отчет" +msgstr "Удалить отчёт" -#: trac/ticket/templates/report_delete.html:27 -#: trac/ticket/templates/report_edit.html:50 -#: trac/ticket/templates/report_view.html:170 -msgid "TracReports" +#: trac/ticket/templates/report_delete.html:26 +#: trac/ticket/templates/report_edit.html:47 +#: trac/ticket/templates/report_list.html:54 +#: trac/ticket/templates/report_view.html:201 +msgid "" +"[1:Note:]\n" +" See [2:TracReports] for help on using and creating reports." msgstr "" +"[1:Примечание:]\n" +" Смотрите [2:TracReports] для справки по использованию и созданию " +"отчётов." -#: trac/ticket/templates/report_delete.html:27 -#: trac/ticket/templates/report_edit.html:50 -#: trac/ticket/templates/report_view.html:170 -msgid "for help on using and creating reports." -msgstr "для справки по созданию и использованию отчетов." +#: trac/ticket/templates/report_edit.html:16 +#, fuzzy +msgid "New Report" +msgstr "Просмотреть отчёт" #: trac/ticket/templates/report_edit.html:21 msgid "Report Title:" -msgstr "Заголовок отчёта:" +msgstr "Название отчёта:" #: trac/ticket/templates/report_edit.html:25 #, fuzzy msgid "Description: (you may use [1:WikiFormatting] here)" -msgstr "Описание: (можно использовать [1:WikiFormatting])" +msgstr "Описание: (здесь Вы можете использовать [1:WikiFormatting])" -#: trac/ticket/templates/report_edit.html:34 -msgid "Error:" -msgstr "Ошибка:" - #: trac/ticket/templates/report_edit.html:36 -msgid "Query for Report: (can be either SQL or, if starting with" +msgid "" +"Query for Report: (can be either SQL or, if starting with [1:query:], a " +"[2:TracQuery] expression)" msgstr "" -"Запрос: (может быть либо забпрос SQL, либо выражение REGEX, если " -"начинается с " +"Запрос для отчёта: (может быть либо SQL, либо, если начинается с " +"[1:query:], выражение [2:TracQuery])" -#: trac/ticket/templates/report_edit.html:36 -msgid "query:" -msgstr "" +#: trac/ticket/templates/report_edit.html:41 +msgid "Save report" +msgstr "Сохранить отчёт" -#: trac/ticket/templates/report_edit.html:36 -msgid ", a" -msgstr ")" +#: trac/ticket/templates/report_list.html:18 +msgid "This is a list of available reports." +msgstr "Это список доступных отчётов:" -#: trac/ticket/templates/report_edit.html:36 -msgid "expression)" -msgstr "." +#: trac/ticket/templates/report_list.html:25 +msgid "Report" +msgstr "Отчёт" -#: trac/ticket/templates/report_edit.html:41 -#, fuzzy -msgid "Save report" -msgstr "Сохранить отчет" +#: trac/ticket/templates/report_list.html:26 trac/wiki/admin.py:196 +msgid "Title" +msgstr "Название" -#: trac/ticket/templates/report_view.html:16 -msgid "matches)" -msgstr "соответствия)" +#: trac/ticket/templates/report_list.html:27 +#: trac/wiki/templates/wiki_edit.html:69 trac/wiki/templates/wiki_edit.html:142 +msgid "Actions" +msgstr "Действия" -#: trac/ticket/templates/report_view.html:27 -#, fuzzy +#: trac/ticket/templates/report_list.html:32 +#: trac/ticket/templates/report_list.html:33 +#: trac/ticket/templates/report_view.html:129 +msgid "View report" +msgstr "Просмотреть отчёт" + +#: trac/ticket/templates/report_list.html:34 +#: trac/ticket/templates/report_view.html:70 msgid "Edit report" -msgstr "Редактировать отчет" +msgstr "Редактировать отчёт" -#: trac/ticket/templates/report_view.html:33 +#: trac/ticket/templates/report_list.html:35 +#: trac/ticket/templates/ticket.html:264 trac/wiki/templates/wiki_edit.html:125 +msgid "Edit" +msgstr "Редактировать" + +#: trac/ticket/templates/report_list.html:37 +#: trac/wiki/templates/wiki_delete.html:22 +msgid "Delete" +msgstr "Удалить" + +#: trac/ticket/templates/report_list.html:40 #, fuzzy -msgid "Copy report" -msgstr "Скопировать отчет" +msgid "No reports available." +msgstr "Просмотр в формате HTML невозможен" -#: trac/ticket/templates/report_view.html:51 -msgid "match" -msgstr "соответствие" +#: trac/ticket/templates/report_list.html:49 +msgid "Create new report" +msgstr "Создать новый отчёт" -#: trac/ticket/templates/report_view.html:85 -#: trac/ticket/templates/report_view.html:92 -msgid "View report" -msgstr "Просмотреть отчет" +#: trac/ticket/templates/report_view.html:21 +#, fuzzy, python-format +msgid "%(num)d match" +msgid_plural "%(num)d matches" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: trac/ticket/templates/report_view.html:160 +#: trac/ticket/templates/report_view.html:42 #, fuzzy -msgid "Create new report" -msgstr "Создать новый отчет" +msgid "Arguments" +msgstr "Вложения" -#: trac/ticket/templates/roadmap.html:23 +#: trac/ticket/templates/report_view.html:43 +msgid "Report arguments" +msgstr "" + +#: trac/ticket/templates/report_view.html:76 +msgid "Copy report" +msgstr "Скопировать отчёт" + +#: trac/ticket/templates/report_view.html:94 +msgid "No matches" +msgstr "Совпадений нет" + +#: trac/ticket/templates/roadmap.html:22 msgid "Show already completed milestones" -msgstr "Показывать выполненные этапы" +msgstr "Показывать уже выполненные этапы" -#: trac/ticket/templates/roadmap.html:34 +#: trac/ticket/templates/roadmap.html:33 msgid "Milestone:" msgstr "Этап:" -#: trac/ticket/templates/roadmap.html:39 +#: trac/ticket/templates/roadmap.html:38 +#, python-format msgid "" -"ago\n" -" (" -msgstr "назад. (" +"Completed %(duration)s ago\n" +" (%(date)s)" +msgstr "" +"Выполнен %(duration)s назад\n" +" (%(date)s)" -#: trac/ticket/templates/roadmap.html:67 -#, fuzzy +#: trac/ticket/templates/roadmap.html:44 +#, python-format +msgid "" +"[1:%(duration)s late]\n" +" (%(date)s)" +msgstr "" +"[1:Задерживается на %(duration)s]\n" +" (%(date)s)" + +#: trac/ticket/templates/roadmap.html:50 +#, python-format +msgid "" +"Due in %(duration)s\n" +" (%(date)s)" +msgstr "" +"Осталось %(duration)s\n" +" (%(date)s)" + +#: trac/ticket/templates/roadmap.html:72 msgid "Add new milestone" -msgstr "Новый этап" +msgstr "Добавить новый этап" -#: trac/ticket/templates/ticket.html:57 -#: trac/versioncontrol/templates/changeset.html:128 +#: trac/ticket/templates/ticket.html:84 +#: trac/versioncontrol/templates/changeset.html:138 msgid "added" msgstr "добавлен" -#: trac/ticket/templates/ticket.html:60 -#, fuzzy +#: trac/ticket/templates/ticket.html:88 msgid "changed from" -msgstr "изменен с" +msgstr "изменён с" -#: trac/ticket/templates/ticket.html:63 -#: trac/versioncontrol/templates/browser.html:125 +#: trac/ticket/templates/ticket.html:91 +#: trac/versioncontrol/templates/browser.html:131 msgid "set to" msgstr "установлено в" -#: trac/ticket/templates/ticket.html:66 +#: trac/ticket/templates/ticket.html:95 msgid "deleted" msgstr "удалено" -#: trac/ticket/templates/ticket.html:79 +#: trac/ticket/templates/ticket.html:107 trac/ticket/templates/ticket.html:499 +#: trac/wiki/templates/wiki_edit.html:71 trac/wiki/templates/wiki_edit.html:129 +#: trac/wiki/templates/wiki_edit_form.html:39 +#: trac/wiki/templates/wiki_edit_form.html:68 +msgid "Preview" +msgstr "Предварительный просмотр" + +#: trac/ticket/templates/ticket.html:109 +msgid "Cancel comment edit" +msgstr "Отменить редактирование комментария" + +#: trac/ticket/templates/ticket.html:135 +msgid "Go to the ticket editor" +msgstr "Перейти в редактор тикета" + +#: trac/ticket/templates/ticket.html:139 msgid "Ticket #" -msgstr "Задача #" +msgstr "Тикет #" -#: trac/ticket/templates/ticket.html:83 -msgid "Create New Ticket" -msgstr "Создать задачу" - -#: trac/ticket/templates/ticket.html:94 trac/ticket/templates/ticket.html:97 +#: trac/ticket/templates/ticket.html:145 trac/ticket/templates/ticket.html:148 msgid "— at" msgstr "- в" -#: trac/ticket/templates/ticket.html:108 -msgid "Preview (" -msgstr "Просмотреть (" +#: trac/ticket/templates/ticket.html:153 +msgid "Create New Ticket" +msgstr "Создать новый тикет" -#: trac/ticket/templates/ticket.html:108 trac/wiki/templates/wiki_edit.html:62 -msgid "skip" -msgstr "пропустить" +#: trac/ticket/templates/ticket.html:161 +#, python-format +msgid "Opened %(created)s ago" +msgstr "Открыт %(created)s назад" -#: trac/ticket/templates/ticket.html:113 trac/ticket/templates/ticket.html:209 -msgid "in reply to:" -msgstr "в ответ на:" +#: trac/ticket/templates/ticket.html:162 +#, python-format +msgid "Last modified %(modified)s ago" +msgstr "Последний раз изменён %(modified)s назад" -#: trac/ticket/templates/ticket.html:115 -msgid "Changed by" -msgstr "Изменен " - -#: trac/ticket/templates/ticket.html:126 -msgid "Opened" -msgstr "Открыта" - -#: trac/ticket/templates/ticket.html:126 trac/ticket/templates/ticket.html:127 -msgid "ago" -msgstr "назад" - -#: trac/ticket/templates/ticket.html:127 -msgid "Last modified" -msgstr "Последняя модификация" - -#: trac/ticket/templates/ticket.html:128 +#: trac/ticket/templates/ticket.html:163 msgid "(ticket not yet created)" -msgstr "" +msgstr "(тикет ещё не создан)" -#: trac/ticket/templates/ticket.html:137 +#: trac/ticket/templates/ticket.html:171 msgid "Reported by:" msgstr "От кого:" -#: trac/ticket/templates/ticket.html:139 +#: trac/ticket/templates/ticket.html:175 msgid "Owned by:" msgstr "Владелец:" -#: trac/ticket/templates/ticket.html:168 +#: trac/ticket/templates/ticket.html:204 msgid "(last modified by" msgstr "(последним изменил" -#: trac/ticket/templates/ticket.html:170 +#: trac/ticket/templates/ticket.html:206 trac/ticket/templates/ticket.html:292 msgid "diff" -msgstr "различия" +msgstr "diff" -#: trac/ticket/templates/ticket.html:181 trac/ticket/templates/ticket.html:223 +#: trac/ticket/templates/ticket.html:215 trac/ticket/templates/ticket.html:270 msgid "Reply" -msgstr "" +msgstr "Ответить" -#: trac/ticket/templates/ticket.html:181 +#: trac/ticket/templates/ticket.html:215 msgid "Reply, quoting this description" msgstr "Ответить, цитируя данное описание" -#: trac/ticket/templates/ticket.html:200 +#: trac/ticket/templates/ticket.html:233 msgid "Change History" msgstr "История изменений" -#: trac/ticket/templates/ticket.html:213 +#: trac/ticket/templates/ticket.html:248 trac/ticket/templates/ticket.html:328 +msgid "in reply to:" +msgstr "в ответ на:" + +#: trac/ticket/templates/ticket.html:252 msgid "follow-up" msgstr "" -#: trac/ticket/templates/ticket.html:218 -msgid "Changed" -msgstr "Изменен" +#: trac/ticket/templates/ticket.html:258 +#, python-format +msgid "Changed %(date)s ago by %(author)s" +msgstr "Изменён %(date)s назад пользователем %(author)s" -#: trac/ticket/templates/ticket.html:219 -msgid "ago by" -msgstr "назад пользователем" +#: trac/ticket/templates/ticket.html:277 +#, python-format +msgid "" +"Version %(version)s, edited %(date)s ago\n" +" by %(author)s" +msgstr "" -#: trac/ticket/templates/ticket.html:238 -msgid "Add/Change #" -msgstr "Добавить/изменить #" +#: trac/ticket/templates/ticket.html:281 +#, python-format +msgid "" +"Last edited %(date)s ago\n" +" by %(author)s" +msgstr "" -#: trac/ticket/templates/ticket.html:258 +#: trac/ticket/templates/ticket.html:286 +#: trac/versioncontrol/templates/changeset.html:97 +msgid "previous" +msgstr "" + +#: trac/ticket/templates/ticket.html:289 +msgid "next" +msgstr "" + +#: trac/ticket/templates/ticket.html:308 +msgid "View ticket fields and description" +msgstr "Просмотреть поля и описание тикета" + +#: trac/ticket/templates/ticket.html:308 +msgid "View" +msgstr "Просмотр" + +#: trac/ticket/templates/ticket.html:311 +msgid "Add a comment" +msgstr "Добавить комментарий" + +#: trac/ticket/templates/ticket.html:315 msgid "" -"Comment (you may use\n" +"You may use\n" " [1:WikiFormatting]\n" -" here):" -msgstr "Комментрий (можно использовать [1:WikiFormatting]" +" here." +msgstr "" +"Здесь Вы можете использовать\n" +" [1:WikiFormatting]." -#: trac/ticket/templates/ticket.html:271 +#: trac/ticket/templates/ticket.html:322 +msgid "The ticket validation has [1:failed]." +msgstr "" + +#: trac/ticket/templates/ticket.html:330 +msgid "Changed by" +msgstr "Изменён пользователем" + +#: trac/ticket/templates/ticket.html:338 +msgid "Modify Ticket" +msgstr "Изменить тикет" + +#: trac/ticket/templates/ticket.html:344 +msgid "Change Properties" +msgstr "" + +#: trac/ticket/templates/ticket.html:345 msgid "Properties" msgstr "Свойства" -#: trac/ticket/templates/ticket.html:274 +#: trac/ticket/templates/ticket.html:349 msgid "Summary:" msgstr "Краткое описание:" -#: trac/ticket/templates/ticket.html:282 +#: trac/ticket/templates/ticket.html:357 +#, fuzzy msgid "Reporter:" -msgstr "От кого:" +msgstr "Автор:" -#: trac/ticket/templates/ticket.html:339 +#: trac/ticket/templates/ticket.html:417 msgid "This checkbox allows you to add or remove yourself from the CC list." msgstr "" -#: trac/ticket/templates/ticket.html:345 +#: trac/ticket/templates/ticket.html:423 msgid "Space or comma delimited email addresses and usernames are accepted." msgstr "" -#: trac/ticket/templates/ticket.html:377 +#: trac/ticket/templates/ticket.html:476 +#: trac/wiki/templates/wiki_edit_form.html:49 +msgid "E-mail address and user name can be saved in the" +msgstr "" + +#: trac/ticket/templates/ticket.html:485 msgid "I have files to attach to this ticket" -msgstr "Приложить файл(ы) к задаче" +msgstr "У меня есть файлы для вложения в этот тикет" -#: trac/ticket/templates/ticket.html:388 trac/wiki/templates/wiki_edit.html:124 +#: trac/ticket/templates/ticket.html:491 #, fuzzy -msgid "Preview" -msgstr "Предварительный просмотр:" +msgid "Go to the list of attachments" +msgstr "Перейти в список вложений" -#: trac/ticket/templates/ticket.html:396 -msgid "TracTickets" -msgstr "" +#: trac/ticket/templates/ticket.html:500 +msgid "Create ticket" +msgstr "Создать тикет" -#: trac/ticket/templates/ticket.html:396 -#, fuzzy +#: trac/ticket/templates/ticket.html:505 msgid "" -"for help on using\n" +"[1:Note:] See\n" +" [2:TracTickets] for help on using\n" " tickets." -msgstr "для справки по использованию карточек" +msgstr "" +"[1:Примечание:] Смотрите\n" +" [2:TracTickets] для справки по использованию\n" +" тикетов." #: trac/ticket/templates/ticket_notify_email.txt:9 msgid "Changes (by" @@ -2679,44 +3378,132 @@ msgid "" "-- \n" "Ticket URL: <" -msgstr "-- Ссылка: <" +msgstr "" +"-- \n" +"URL тикета: <" -#: trac/timeline/web_ui.py:76 trac/timeline/templates/timeline.html:10 -#: trac/timeline/templates/timeline.html:16 -#, fuzzy +#: trac/timeline/web_ui.py:75 trac/timeline/templates/timeline.html:11 +#: trac/timeline/templates/timeline.html:17 msgid "Timeline" -msgstr "Журнал активности" +msgstr "Хронология" -#: trac/timeline/web_ui.py:202 -msgid "Previous period" +#: trac/timeline/web_ui.py:227 trac/timeline/web_ui.py:235 +msgid "Previous Period" msgstr "Предыдущий период" -#: trac/timeline/web_ui.py:208 -msgid "Next period" +#: trac/timeline/web_ui.py:234 trac/timeline/web_ui.py:235 +msgid "Next Period" msgstr "Следующий период" -#: trac/timeline/web_ui.py:269 -#, python-format +#: trac/timeline/web_ui.py:295 +#, fuzzy, python-format msgid "%(date)s in Timeline" -msgstr "%(date)s в Истории" +msgstr "%(date)s в хронологии" +#. TRANSLATOR: other_events +#: trac/timeline/web_ui.py:343 +msgid "other kind of events" +msgstr "" + +#: trac/timeline/web_ui.py:348 +#, python-format +msgid "Event provider %(name)s failed for filters %(kinds)s: " +msgstr "" + +#: trac/timeline/web_ui.py:354 +#, python-format +msgid "" +"\n" +" You may want to see the %(other_events)s from the Timeline " +"or \n" +" notify your Trac administrator about the error (detailed\n" +" informations were written to the log).\n" +" " +msgstr "" + #: trac/timeline/templates/timeline.html:20 #, fuzzy -msgid "View changes from" -msgstr "Смотреть изменения за" +msgid "" +"[1:View changes from [2:]] [3:]\n" +" and [4:[5:] days back][6:]\n" +" [7:done by [8:]]" +msgstr "" +"[1:Просмотреть изменения с [2:]] [3:]\n" +" и на [4:[5:] дней назад][6:]\n" +" [7:выполненные [8:]]" -#: trac/timeline/templates/timeline.html:21 -msgid "days back" -msgstr "последних дней" +#: trac/timeline/templates/timeline.html:37 +msgid "Today" +msgstr "Сегодня" -#: trac/timeline/templates/timeline.html:53 -msgid "TracTimeline" -msgstr "" +#: trac/timeline/templates/timeline.html:37 +msgid "Yesterday" +msgstr "Вчера" -#: trac/timeline/templates/timeline.html:53 -msgid "for information about the timeline view." +#: trac/timeline/templates/timeline.html:54 +msgid "" +"[1:Note:] See [2:TracTimeline]\n" +" for information about the timeline view." msgstr "" +"[1:Примечание:] Смотрите [2:TracTimeline]\n" +" для информации о выводе хронологии." +#: trac/util/datefmt.py:68 +#, fuzzy, python-format +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d год" +msgstr[1] "%(num)d года" +msgstr[2] "%(num)d лет" + +#: trac/util/datefmt.py:69 +#, fuzzy, python-format +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d месяц" +msgstr[1] "%(num)d месяца" +msgstr[2] "%(num)d месяцев" + +#: trac/util/datefmt.py:70 +#, fuzzy, python-format +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d неделя" +msgstr[1] "%(num)d недели" +msgstr[2] "%(num)d недель" + +#: trac/util/datefmt.py:71 +#, fuzzy, python-format +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d день" +msgstr[1] "%(num)d дня" +msgstr[2] "%(num)d дней" + +#: trac/util/datefmt.py:72 +#, fuzzy, python-format +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d час" +msgstr[1] "%(num)d часа" +msgstr[2] "%(num)d часов" + +#: trac/util/datefmt.py:73 +#, fuzzy, python-format +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d минута" +msgstr[1] "%(num)d минуты" +msgstr[2] "%(num)d минут" + +#: trac/util/datefmt.py:92 +#, fuzzy, python-format +msgid "%(num)i second" +msgid_plural "%(num)i seconds" +msgstr[0] "%(num)i секунда" +msgstr[1] "%(num)i секунды" +msgstr[2] "%(num)i секунд" + #: trac/util/presentation.py:254 #, python-format msgid "%(last)d of %(total)d" @@ -2725,281 +3512,584 @@ #: trac/util/presentation.py:256 #, python-format msgid "%(start)d - %(stop)d of %(total)d" +msgstr "%(start)d - %(stop)d из %(total)d" + +#: trac/versioncontrol/admin.py:78 trac/versioncontrol/admin.py:103 +#: trac/versioncontrol/admin.py:104 trac/versioncontrol/admin.py:288 +#: trac/versioncontrol/api.py:37 trac/versioncontrol/api.py:154 +#: trac/versioncontrol/api.py:191 +#: trac/versioncontrol/templates/admin_repositories.html:20 +#: trac/versioncontrol/templates/admin_repositories.html:33 +#: trac/versioncontrol/templates/admin_repositories.html:131 +#: trac/versioncontrol/templates/admin_repositories.html:133 +#: trac/versioncontrol/web_ui/browser.py:808 +#: trac/versioncontrol/web_ui/changeset.py:841 +#: trac/versioncontrol/web_ui/changeset.py:976 +msgid "(default)" +msgstr "(по умолчанию)" + +#: trac/versioncontrol/admin.py:106 +msgid "Alias" +msgstr "Псевдоним" + +#: trac/versioncontrol/admin.py:106 +#: trac/versioncontrol/templates/admin_repositories.html:124 +msgid "Directory" +msgstr "Директория" + +#: trac/versioncontrol/admin.py:112 +msgid "Cannot synchronize a single revision on multiple repositories" msgstr "" -#: trac/versioncontrol/api.py:81 +#: trac/versioncontrol/admin.py:121 #, python-format -msgid "Can't synchronize with the repository (%(error)s)" -msgstr "Ошибка синхронизации с репозиторием: %(error)s" +msgid "Unknown repository '%(reponame)s'" +msgstr "" -#: trac/versioncontrol/api.py:96 +#: trac/versioncontrol/admin.py:125 +#, python-format +msgid "%(rev)s resynced on %(reponame)s." +msgstr "" + +#: trac/versioncontrol/admin.py:133 +#, python-format +msgid "Resyncing repository history for %(reponame)s... " +msgstr "" + +#: trac/versioncontrol/admin.py:138 #, fuzzy, python-format +msgid "%(num)s revision cached." +msgid_plural "%(num)s revisions cached." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: trac/versioncontrol/admin.py:140 +msgid "Done." +msgstr "" + +#: trac/versioncontrol/admin.py:156 +msgid "Version Control" +msgstr "Контроль версий" + +#: trac/versioncontrol/admin.py:157 +#: trac/versioncontrol/templates/admin_repositories.html:10 +msgid "Repositories" +msgstr "Репозитории" + +#: trac/versioncontrol/admin.py:172 +#, fuzzy, python-format +msgid "Repository %(name)s does not exist." +msgstr "Версия не существует: %(name)s" + +#: trac/versioncontrol/admin.py:191 trac/versioncontrol/admin.py:227 +#, python-format +msgid "" +"You should now run \"trac-admin $ENV repository resync %(name)s\" to " +"synchronize Trac with the repository." +msgstr "" + +#: trac/versioncontrol/admin.py:196 +#, python-format +msgid "" +"You may have to run \"trac-admin $ENV repository resync %(name)s\" to " +"synchronize Trac with the repository." +msgstr "" + +#: trac/versioncontrol/admin.py:201 +msgid "" +"You will need to update your post-commit hook to call \"trac-admin $ENV " +"changeset added\" with the new repository name." +msgstr "" + +#: trac/versioncontrol/admin.py:222 +#, python-format +msgid "The repository \"%(name)s\" has been added." +msgstr "" + +#: trac/versioncontrol/admin.py:229 +#, python-format +msgid "" +"You should also set up a post-commit hook on the repository to call " +"\"trac-admin $ENV changeset added %(name)s $REV\" for each committed " +"changeset." +msgstr "" + +#: trac/versioncontrol/admin.py:235 +msgid "Missing arguments to add a repository." +msgstr "" + +#: trac/versioncontrol/admin.py:244 +#, python-format +msgid "The alias \"%(name)s\" has been added." +msgstr "" + +#: trac/versioncontrol/admin.py:247 +msgid "Missing arguments to add an alias." +msgstr "" + +#: trac/versioncontrol/admin.py:260 +msgid "The selected repositories have been removed." +msgstr "" + +#: trac/versioncontrol/admin.py:263 +msgid "No repositories were selected." +msgstr "" + +#: trac/versioncontrol/api.py:188 +#, python-format +msgid "Invalid key \"%(key)s\"" +msgstr "Недопустимый ключ \"%(key)s\"" + +#: trac/versioncontrol/api.py:193 +#, python-format +msgid "You should now run \"repository resync %(name)s\"." +msgstr "" + +#: trac/versioncontrol/api.py:196 +#, python-format +msgid "You may have to run \"repository resync %(name)s\"." +msgstr "" + +#: trac/versioncontrol/api.py:207 +#, python-format +msgid "The repository type '%(type)s' is not supported" +msgstr "" + +#: trac/versioncontrol/api.py:336 +#, python-format +msgid "" +"Can't synchronize with repository \"%(name)s\" (%(error)s). Look in the " +"Trac log for more information." +msgstr "" + +#: trac/versioncontrol/api.py:355 +#, fuzzy, python-format +msgid "Changeset %(rev)s in %(repo)s" +msgstr "Набор изменений %(rev)s отсутсвует в репозиотории" + +#: trac/versioncontrol/api.py:357 +#, fuzzy, python-format msgid "Changeset %(rev)s" msgstr "Набор изменений %(rev)s" -#: trac/versioncontrol/api.py:103 -#, fuzzy -msgid "Directory" -msgstr "Родительская директория" +#: trac/versioncontrol/api.py:365 +msgid "directory" +msgstr "директория" -#: trac/versioncontrol/api.py:107 +#: trac/versioncontrol/api.py:367 +msgid "file" +msgstr "файл" + +#: trac/versioncontrol/api.py:369 #, python-format msgid "at version %(rev)s" msgstr "" -#: trac/versioncontrol/api.py:109 -#, fuzzy -msgid "Path" -msgstr "соответствие" +#: trac/versioncontrol/api.py:371 +msgid "path" +msgstr "путь" -#: trac/versioncontrol/api.py:131 +#: trac/versioncontrol/api.py:374 #, fuzzy, python-format +msgid " in %(repo)s" +msgstr "в ответ на:" + +#: trac/versioncontrol/api.py:377 +#, python-format +msgid "Repository %(repo)s" +msgstr "" + +#: trac/versioncontrol/api.py:659 +#, python-format +msgid "Unsupported version control system \"%(name)s\": %(error)s" +msgstr "" + +#: trac/versioncontrol/api.py:662 +#, python-format msgid "" -"Unsupported version control system \"%(name)s\". Check that the Python " -"support libraries for \"%(name)s\" are correctly installed." +"Unsupported version control system \"%(name)s\": Can't find an " +"appropriate component, maybe the corresponding plugin was not enabled? " msgstr "" -"Неподдерживаемая система управления версиями %(name)s. Проверьте наличие " -"корректно установленной\"\n" -"\"поддержки этотй системы для Питона." -#: trac/versioncontrol/api.py:163 +#: trac/versioncontrol/api.py:670 #, python-format msgid "No changeset %(rev)s in the repository" msgstr "Набор изменений %(rev)s отсутсвует в репозиотории" -#: trac/versioncontrol/api.py:165 +#: trac/versioncontrol/api.py:672 #, fuzzy msgid "No such changeset" msgstr "Нет такого набора изменений" -#: trac/versioncontrol/api.py:171 +#: trac/versioncontrol/api.py:678 msgid "No such node" msgstr "Нет такого узла" -#: trac/versioncontrol/api.py:509 -#, python-format -msgid "Insufficient permissions to access %(path)s" -msgstr "Недостаточно прав для доступа к %(path)s" - -#: trac/versioncontrol/api.py:514 -#, python-format -msgid "Insufficient permissions to access changeset %(id)s" -msgstr "Недостаточно прав для доступа к набору изменений %(id)s" - -#: trac/versioncontrol/cache.py:95 +#: trac/versioncontrol/cache.py:140 msgid "" -"The 'repository_dir' has changed, a 'trac-admin resync' operation is " -"needed." +"The 'repository_dir' has changed, a 'trac-admin $ENV repository resync' " +"operation is needed." msgstr "" -#: trac/versioncontrol/cache.py:114 -msgid "Missing \"youngest_rev\" in cache metadata" +#: trac/versioncontrol/svn_authz.py:73 +#, python-format +msgid "Line %(lineno)d: Entry before first section header" msgstr "" +#: trac/versioncontrol/svn_authz.py:77 +#, python-format +msgid "Line %(lineno)d: Invalid entry" +msgstr "Строка %(lineno)d: недопустимая запись" + #: trac/versioncontrol/svn_fs.py:294 #, python-format msgid "Subversion >= 1.0 required: Found %(version)s" msgstr "" -#: trac/versioncontrol/svn_fs.py:371 -msgid "No svn:externals configured in trac.ini" +#: trac/versioncontrol/svn_fs.py:318 +#, python-format +msgid "%(path)s does not appear to be a Subversion repository." msgstr "" -#: trac/versioncontrol/svn_fs.py:395 +#: trac/versioncontrol/svn_fs.py:325 #, python-format -msgid "%(path)s does not appear to be a Subversion repository." +msgid "Couldn't open Subversion repository %(path)s: %(svn_error)s" msgstr "" -#: trac/versioncontrol/svn_fs.py:652 +#: trac/versioncontrol/svn_fs.py:605 #, python-format msgid "" "Diff mismatch: Base is a %(oldnode)s (%(oldpath)s in revision %(oldrev)s)" " and Target is a %(newnode)s (%(newpath)s in revision %(newrev)s)." msgstr "" -#: trac/versioncontrol/svn_fs.py:803 +#: trac/versioncontrol/svn_fs.py:754 #, fuzzy, python-format -msgid "svn blame failed: %(error)s" +msgid "svn blame failed on %(path)s: %(error)s" msgstr "Сбой отчета: %(error)s" -#: trac/versioncontrol/templates/browser.html:45 +#: trac/versioncontrol/svn_prop.py:111 +msgid "No svn:externals configured in trac.ini" +msgstr "" + +#: trac/versioncontrol/svn_prop.py:148 +#, fuzzy +msgid "merged" +msgstr "Обозначения:" + +#: trac/versioncontrol/svn_prop.py:148 +#, fuzzy +msgid "blocked" +msgstr "скопировано" + +#: trac/versioncontrol/svn_prop.py:192 +msgid "eligible" +msgstr "" + +#: trac/versioncontrol/svn_prop.py:206 +msgid "(toggle deleted branches)" +msgstr "" + +#: trac/versioncontrol/svn_prop.py:234 +msgid "View merge source" +msgstr "" + +#: trac/versioncontrol/svn_prop.py:245 +#, fuzzy +msgid "No revisions" +msgstr "на ревизиии:" + +#: trac/versioncontrol/svn_prop.py:281 +#, fuzzy +msgid "merged: " +msgstr "Обозначения:" + +#: trac/versioncontrol/svn_prop.py:281 +msgid "blocked: " +msgstr "" + +#: trac/versioncontrol/svn_prop.py:282 +msgid "reverse-merged: " +msgstr "" + +#: trac/versioncontrol/svn_prop.py:282 +msgid "un-blocked: " +msgstr "" + +#: trac/versioncontrol/svn_prop.py:293 +#, fuzzy +msgid " (added)" +msgstr "добавлен" + +#: trac/versioncontrol/svn_prop.py:321 +#: trac/versioncontrol/templates/changeset.html:139 +msgid "removed" +msgstr "удалено" + +#: trac/versioncontrol/svn_prop.py:324 +msgid " (with no actual effect on merging)" +msgstr "" + +#: trac/versioncontrol/svn_prop.py:325 +#, python-format +msgid "Property %(prop)s changed" +msgstr "" + +#: trac/versioncontrol/templates/admin_repositories.html:14 +msgid "Manage Repositories" +msgstr "Управлять репозиториями" + +#: trac/versioncontrol/templates/admin_repositories.html:24 +msgid "Default:" +msgstr "По умолчанию:" + +#: trac/versioncontrol/templates/admin_repositories.html:30 +msgid "Repository:" +msgstr "Репозиторий:" + +#: trac/versioncontrol/templates/admin_repositories.html:43 +msgid "Modify Repository:" +msgstr "Изменить репозиторий:" + +#: trac/versioncontrol/templates/admin_repositories.html:44 +msgid "View Repository:" +msgstr "Просмотреть репозиторий:" + +#: trac/versioncontrol/templates/admin_repositories.html:45 +msgid "" +"[1:Note:]\n" +" This repository is defined in [2:[3:trac.ini]] and cannot be " +"edited on this page." +msgstr "" + +#: trac/versioncontrol/templates/admin_repositories.html:58 +#: trac/versioncontrol/templates/admin_repositories.html:98 +#, fuzzy +msgid "Directory:" +msgstr "Директория:" + +#: trac/versioncontrol/templates/admin_repositories.html:66 +msgid "Hide from repository index" +msgstr "" + +#: trac/versioncontrol/templates/admin_repositories.html:92 +msgid "Add Repository:" +msgstr "Добавить репозиторий:" + +#: trac/versioncontrol/templates/admin_repositories.html:109 +msgid "Add Alias:" +msgstr "" + +#: trac/versioncontrol/templates/admin_repositories.html:124 +msgid "Revision" +msgstr "Ревизия" + +#: trac/versioncontrol/templates/admin_repositories.html:136 +msgid "Alias of" +msgstr "" + +#: trac/versioncontrol/templates/admin_repositories.html:143 +msgid "Refresh" +msgstr "Обновить" + +#: trac/versioncontrol/templates/browser.html:52 +msgid "Default Repository" +msgstr "" + +#: trac/versioncontrol/templates/browser.html:59 +msgid "Hint: clear the field to view latest revision" +msgstr "" + +#: trac/versioncontrol/templates/browser.html:59 msgid "View revision:" msgstr "Посмотреть ревизию:" -#: trac/versioncontrol/templates/browser.html:55 +#: trac/versioncontrol/templates/browser.html:69 msgid "Visit:" msgstr "Посетите:" -#: trac/versioncontrol/templates/browser.html:63 -#, fuzzy +#: trac/versioncontrol/templates/browser.html:77 msgid "Go!" -msgstr "назад" +msgstr "Поехали!" -#: trac/versioncontrol/templates/browser.html:63 +#: trac/versioncontrol/templates/browser.html:77 msgid "Jump to the chosen preselected path" msgstr "Перейти на выбранный заранее путь" -#: trac/versioncontrol/templates/browser.html:82 -#: trac/versioncontrol/templates/revisionlog.html:92 -#: trac/versioncontrol/web_ui/browser.py:622 -msgid "Rev" -msgstr "Ревизия" - -#: trac/versioncontrol/templates/browser.html:84 -#: trac/versioncontrol/web_ui/browser.py:373 trac/wiki/web_ui.py:520 -#: trac/wiki/web_ui.py:544 -msgid "Last Change" -msgstr "Последнее изменение" - -#: trac/versioncontrol/templates/browser.html:91 +#: trac/versioncontrol/templates/browser.html:90 #, fuzzy msgid "Parent Directory" msgstr "Родительская директория" -#: trac/versioncontrol/templates/browser.html:100 -#: trac/wiki/templates/wiki_edit.html:51 trac/wiki/templates/wiki_view.html:23 +#: trac/versioncontrol/templates/browser.html:96 +#, fuzzy +msgid "No files found" +msgstr "Нет совпадений." + +#: trac/versioncontrol/templates/browser.html:104 +#: trac/wiki/templates/wiki_edit.html:113 trac/wiki/templates/wiki_view.html:37 msgid "Revision info" msgstr "Информация о ревизии" -#: trac/versioncontrol/templates/browser.html:102 -msgid "Revision" -msgstr "Ревизия" +#: trac/versioncontrol/templates/browser.html:106 +#, python-format +msgid "" +"Revision [1:%(rev)s], %(size)s\n" +" checked in by %(author)s, %(date)s ago\n" +" ([2:diff])" +msgstr "" -#: trac/versioncontrol/templates/browser.html:103 -msgid "(checked in by" -msgstr "(помещена пользователем" +#: trac/versioncontrol/templates/browser.html:149 +#, fuzzy +msgid "Repository Index" +msgstr "Добавления в репозиторий" -#: trac/versioncontrol/templates/browser.html:142 -msgid "TracBrowser" +#: trac/versioncontrol/templates/browser.html:159 +msgid "" +"[1:Note:] See [2:TracBrowser]\n" +" for help on using the repository browser." msgstr "" -#: trac/versioncontrol/templates/browser.html:142 +#: trac/versioncontrol/templates/browser.html:171 #, fuzzy -msgid "for help on using the browser." -msgstr "для справки по использованию браузера." - -#: trac/versioncontrol/templates/browser.html:153 -#, fuzzy msgid "View changes..." msgstr "Просмотреть изменения..." -#: trac/versioncontrol/templates/browser.html:153 +#: trac/versioncontrol/templates/browser.html:171 msgid "Select paths and revs for Diff" msgstr "Выберите пути и ревизии для поиска отличий" -#: trac/versioncontrol/templates/changeset.html:21 -#: trac/versioncontrol/templates/changeset.html:36 -#: trac/versioncontrol/web_ui/changeset.py:344 +#: trac/versioncontrol/templates/changeset.html:26 +#: trac/versioncontrol/templates/changeset.html:43 #, fuzzy msgid "Changeset" msgstr "Набор изменений" -#: trac/versioncontrol/templates/changeset.html:22 -#: trac/versioncontrol/templates/changeset.html:32 -#: trac/versioncontrol/templates/changeset.html:34 -#: trac/versioncontrol/templates/changeset.html:36 +#: trac/versioncontrol/templates/changeset.html:27 +#: trac/versioncontrol/templates/changeset.html:39 +#: trac/versioncontrol/templates/changeset.html:41 +#: trac/versioncontrol/templates/changeset.html:43 #, fuzzy msgid "Show full changeset" msgstr "Показать весь набор изменений" -#: trac/versioncontrol/templates/changeset.html:22 +#: trac/versioncontrol/templates/changeset.html:28 +#: trac/versioncontrol/templates/changeset.html:34 +#: trac/versioncontrol/templates/changeset.html:37 +#: trac/versioncontrol/templates/changeset.html:46 +msgid "in" +msgstr "" + +#: trac/versioncontrol/templates/changeset.html:28 msgid "for" msgstr "для" -#: trac/versioncontrol/templates/changeset.html:23 -#: trac/versioncontrol/templates/changeset.html:26 -#: trac/versioncontrol/templates/changeset.html:31 -#: trac/versioncontrol/templates/changeset.html:33 -#: trac/versioncontrol/templates/changeset.html:64 +#: trac/versioncontrol/templates/changeset.html:29 +#: trac/versioncontrol/templates/changeset.html:32 +#: trac/versioncontrol/templates/changeset.html:38 +#: trac/versioncontrol/templates/changeset.html:40 +#: trac/versioncontrol/templates/changeset.html:74 msgid "Show entry in browser" msgstr "Показать в браузере" -#: trac/versioncontrol/templates/changeset.html:25 +#: trac/versioncontrol/templates/changeset.html:31 msgid "Changes in" msgstr "Изменения в" -#: trac/versioncontrol/templates/changeset.html:27 +#: trac/versioncontrol/templates/changeset.html:33 msgid "Show revision log" msgstr "Показать журнал изменений" -#: trac/versioncontrol/templates/changeset.html:30 -#, fuzzy -msgid "Changes from" -msgstr "Изменения с" - -#: trac/versioncontrol/templates/changeset.html:31 -#: trac/versioncontrol/templates/changeset.html:33 +#: trac/versioncontrol/templates/changeset.html:38 +#: trac/versioncontrol/templates/changeset.html:40 msgid "at" msgstr "в" -#: trac/versioncontrol/templates/changeset.html:32 -#: trac/versioncontrol/templates/changeset.html:34 +#: trac/versioncontrol/templates/changeset.html:39 +#: trac/versioncontrol/templates/changeset.html:41 msgid "r" msgstr "" -#: trac/versioncontrol/templates/changeset.html:77 -#: trac/versioncontrol/templates/changeset.html:80 +#: trac/versioncontrol/templates/changeset.html:87 +#: trac/versioncontrol/templates/changeset.html:90 msgid "Show differences" msgstr "Показать различия" -#: trac/versioncontrol/templates/changeset.html:77 +#: trac/versioncontrol/templates/changeset.html:87 msgid "view diffs" msgstr "смотреть различия" -#: trac/versioncontrol/templates/changeset.html:87 +#: trac/versioncontrol/templates/changeset.html:90 +#, fuzzy, python-format +msgid "%(num)d diff" +msgid_plural "%(num)d diffs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: trac/versioncontrol/templates/changeset.html:93 +#, fuzzy, python-format +msgid "%(num)d prop" +msgid_plural "%(num)d props" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: trac/versioncontrol/templates/changeset.html:97 msgid "Show previous version in browser" msgstr "Показать в браузере предыдущую версию" -#: trac/versioncontrol/templates/changeset.html:87 -msgid "previous" -msgstr "предыдущая" - -#: trac/versioncontrol/templates/changeset.html:109 +#: trac/versioncontrol/templates/changeset.html:119 msgid "Message:" msgstr "Сообщение:" -#: trac/versioncontrol/templates/changeset.html:121 +#: trac/versioncontrol/templates/changeset.html:131 #, fuzzy msgid "Location:" msgstr "Расположение:" -#: trac/versioncontrol/templates/changeset.html:129 -msgid "removed" -msgstr "удалено" - -#: trac/versioncontrol/templates/changeset.html:131 +#: trac/versioncontrol/templates/changeset.html:141 msgid "copied" msgstr "скопировано" -#: trac/versioncontrol/templates/changeset.html:132 +#: trac/versioncontrol/templates/changeset.html:142 msgid "moved" msgstr "перемещено" -#: trac/versioncontrol/templates/diff_form.html:9 -#: trac/versioncontrol/templates/diff_form.html:20 +#: trac/versioncontrol/templates/changeset.html:174 +msgid "" +"[1:Note:] See [2:TracChangeset]\n" +" for help on using the changeset viewer." +msgstr "" +"[1:Примечание:] Смотрите [2:TracChangeset]\n" +" для справки по использованию просмотра набора изменений." + +#: trac/versioncontrol/templates/diff_form.html:10 +#: trac/versioncontrol/templates/diff_form.html:21 msgid "Prepare Diff" msgstr "Подготовить различия" -#: trac/versioncontrol/templates/diff_form.html:26 +#: trac/versioncontrol/templates/diff_form.html:27 msgid "Select the base and the target for the diff:" msgstr "Выберите базу и цель для вычисления различий:" -#: trac/versioncontrol/templates/diff_form.html:29 +#: trac/versioncontrol/templates/diff_form.html:30 #, fuzzy msgid "From:" msgstr "От:" -#: trac/versioncontrol/templates/diff_form.html:33 -#: trac/versioncontrol/templates/diff_form.html:43 +#: trac/versioncontrol/templates/diff_form.html:34 +#: trac/versioncontrol/templates/diff_form.html:44 msgid "at revision:" msgstr "на ревизиии:" -#: trac/versioncontrol/templates/diff_form.html:39 +#: trac/versioncontrol/templates/diff_form.html:40 #, fuzzy msgid "To:" msgstr "До:" -#: trac/versioncontrol/templates/diff_form.html:49 +#: trac/versioncontrol/templates/diff_form.html:50 msgid "" "For either path, you can start typing the path and will be\n" " presented a list of existing directories and files to " @@ -3012,93 +4102,137 @@ "\"существующих файлов и директорий при помощи мышки или стрелок и клавиши" " Tab." -#: trac/versioncontrol/templates/diff_form.html:63 -msgid "TracChangeset" +#: trac/versioncontrol/templates/diff_form.html:62 +msgid "" +"[1:Note:] See\n" +" [2:TracChangeset]\n" +" for help on using the diff feature." msgstr "" -#: trac/versioncontrol/templates/diff_form.html:63 -msgid "for help on using the diff feature." -msgstr "" - -#: trac/versioncontrol/templates/dir_entries.html:17 +#: trac/versioncontrol/templates/dir_entries.html:20 +#: trac/versioncontrol/templates/repository_index.html:23 msgid "View Revision Log" msgstr "Смотреть журнал ревизий" -#: trac/versioncontrol/templates/revisionlog.html:10 +#: trac/versioncontrol/templates/dir_entries.html:21 +#: trac/versioncontrol/templates/repository_index.html:24 +#, fuzzy +msgid "View Changeset" +msgstr "Просмотреть изменения" + +#: trac/versioncontrol/templates/dirlist_thead.html:9 +#: trac/versioncontrol/templates/revisionlog.html:95 +#: trac/versioncontrol/web_ui/browser.py:752 +msgid "Rev" +msgstr "Ревизия" + +#: trac/versioncontrol/templates/dirlist_thead.html:12 +#: trac/versioncontrol/web_ui/browser.py:442 +msgid "Last Change" +msgstr "Последнее изменение" + +#: trac/versioncontrol/templates/path_links.html:15 +msgid "Go to repository root" +msgstr "" + +#: trac/versioncontrol/templates/path_links.html:15 +msgid "Go to repository index" +msgstr "" + +#: trac/versioncontrol/templates/path_links.html:19 +#, fuzzy, python-format +msgid "View %(name)s" +msgstr "Этап %(name)s" + +#: trac/versioncontrol/templates/repository_index.html:15 +#, fuzzy +msgid "View Root Directory" +msgstr "Родительская директория" + +#: trac/versioncontrol/templates/revisionlog.html:11 msgid "(log)" msgstr "(журнал)" -#: trac/versioncontrol/templates/revisionlog.html:22 +#: trac/versioncontrol/templates/revisionlog.html:24 msgid "Revision Log Mode:" msgstr "Режим журнала ревизий:" -#: trac/versioncontrol/templates/revisionlog.html:26 +#: trac/versioncontrol/templates/revisionlog.html:28 msgid "Stop on copy" msgstr "Остановиться на копировании" -#: trac/versioncontrol/templates/revisionlog.html:32 +#: trac/versioncontrol/templates/revisionlog.html:34 msgid "Follow copies" msgstr "Следовать копированию" -#: trac/versioncontrol/templates/revisionlog.html:38 +#: trac/versioncontrol/templates/revisionlog.html:40 msgid "Show only adds and deletes" msgstr "Показывать только добавления и удаления" -#: trac/versioncontrol/templates/revisionlog.html:43 +#: trac/versioncontrol/templates/revisionlog.html:45 msgid "View log starting at" msgstr "Смотреть журнал начиная с" -#: trac/versioncontrol/templates/revisionlog.html:47 +#: trac/versioncontrol/templates/revisionlog.html:49 msgid "and back to" msgstr "и назад до" -#: trac/versioncontrol/templates/revisionlog.html:52 +#: trac/versioncontrol/templates/revisionlog.html:54 msgid "Show at most" msgstr "Показывать не более" -#: trac/versioncontrol/templates/revisionlog.html:54 +#: trac/versioncontrol/templates/revisionlog.html:56 msgid "revisions per page." msgstr "ревизий на страницу" -#: trac/versioncontrol/templates/revisionlog.html:59 +#: trac/versioncontrol/templates/revisionlog.html:61 msgid "Show full log messages" msgstr "Показывать комментарии целиком" -#: trac/versioncontrol/templates/revisionlog.html:77 +#: trac/versioncontrol/templates/revisionlog.html:79 msgid "Copied or renamed" msgstr "Копировано или переименовано" -#: trac/versioncontrol/templates/revisionlog.html:84 -msgid "Diff from Old Revision to New Revision (select them below)" +#: trac/versioncontrol/templates/revisionlog.html:87 +#: trac/versioncontrol/templates/revisionlog.html:176 +#, fuzzy +msgid "Diff from Old Revision to New Revision (as selected in the Diff column)" msgstr "Различия между старой и новой ревизией (выберите из указанных)" #: trac/versioncontrol/templates/revisionlog.html:93 -msgid "Chgset" -msgstr "Набор изменений" +msgid "Old / New" +msgstr "" +#: trac/versioncontrol/templates/revisionlog.html:93 +msgid "Diff" +msgstr "Diff" + #: trac/versioncontrol/templates/revisionlog.html:96 +msgid "Age" +msgstr "" + +#: trac/versioncontrol/templates/revisionlog.html:98 msgid "Log Message" -msgstr "Комментарий" +msgstr "" -#: trac/versioncontrol/templates/revisionlog.html:107 +#: trac/versioncontrol/templates/revisionlog.html:105 +#, fuzzy +msgid "No revisions found" +msgstr "Показать журнал изменений" + +#: trac/versioncontrol/templates/revisionlog.html:118 msgid "copied from" msgstr "Скопировано из" -#: trac/versioncontrol/templates/revisionlog.html:121 +#: trac/versioncontrol/templates/revisionlog.html:132 msgid "View log starting at this revision" msgstr "Смотреть журнал начиная с этой ревизии" -#: trac/versioncontrol/templates/revisionlog.html:162 -msgid "Diff from Old Revision to New Revision (select them above)" -msgstr "Различия между старой и новой ревизиями (выберите из вышеуказанных)" - -#: trac/versioncontrol/templates/revisionlog.html:168 -msgid "TracRevisionLog" -msgstr "" - -#: trac/versioncontrol/templates/revisionlog.html:168 +#: trac/versioncontrol/templates/revisionlog.html:181 #, fuzzy -msgid "for help on using the revision log." +msgid "" +"[1:Note:] See [2:TracRevisionLog]\n" +" for help on using the revision log." msgstr "для справки по использованию журнала ревизий." #: trac/versioncontrol/templates/revisionlog.txt:1 @@ -3110,39 +4244,68 @@ "# История изменений для" #: trac/versioncontrol/templates/revisionlog.txt:2 +msgid " in $(reponame)s" +msgstr "" + +#: trac/versioncontrol/templates/revisionlog.txt:2 msgid "" "# \n" "# Generated by Trac" msgstr "" -#: trac/versioncontrol/web_ui/browser.py:297 +#: trac/versioncontrol/web_ui/browser.py:298 msgid "Browse Source" msgstr "Репозиторий" -#: trac/versioncontrol/web_ui/browser.py:345 -#: trac/versioncontrol/web_ui/changeset.py:240 -#, fuzzy -msgid "Invalid Changeset Number" +#: trac/versioncontrol/web_ui/browser.py:347 +#: trac/versioncontrol/web_ui/log.py:88 +#, python-format +msgid "No repository '%(repo)s' found" +msgstr "" + +#: trac/versioncontrol/web_ui/browser.py:369 +msgid "Invalid changeset number" msgstr "Недопустимый номер набора изменений" -#: trac/versioncontrol/web_ui/browser.py:351 -#: trac/versioncontrol/web_ui/log.py:98 +#: trac/versioncontrol/web_ui/browser.py:425 +#: trac/versioncontrol/web_ui/browser.py:435 +#, fuzzy, python-format +msgid "Revision %(num)s" +msgstr "Версия %(num)s" + +#: trac/versioncontrol/web_ui/browser.py:436 +#, fuzzy +msgid "Previous Revision" +msgstr "Предыдущий период" + +#: trac/versioncontrol/web_ui/browser.py:436 +#, fuzzy +msgid "Next Revision" +msgstr "на ревизиии:" + +#: trac/versioncontrol/web_ui/browser.py:437 +#, fuzzy +msgid "Latest Revision" +msgstr "на ревизиии:" + +#: trac/versioncontrol/web_ui/browser.py:441 +#: trac/versioncontrol/web_ui/log.py:300 msgid "Parent directory" msgstr "Родительская директория" -#: trac/versioncontrol/web_ui/browser.py:377 +#: trac/versioncontrol/web_ui/browser.py:447 msgid "Normal" msgstr "Нормальный" -#: trac/versioncontrol/web_ui/browser.py:378 +#: trac/versioncontrol/web_ui/browser.py:448 msgid "View file without annotations" msgstr "Смотреть файл без аннотаций" -#: trac/versioncontrol/web_ui/browser.py:382 +#: trac/versioncontrol/web_ui/browser.py:453 msgid "Annotate" msgstr "Комментировать" -#: trac/versioncontrol/web_ui/browser.py:383 +#: trac/versioncontrol/web_ui/browser.py:454 msgid "" "Annotate each line with the last changed revision (this can be time " "consuming...)" @@ -3151,64 +4314,138 @@ "изменение (\"\n" "\"может занять время)" -#: trac/versioncontrol/web_ui/browser.py:389 +#: trac/versioncontrol/web_ui/browser.py:461 msgid "Revision Log" msgstr "Журнал изменений" -#: trac/versioncontrol/web_ui/browser.py:455 -#: trac/versioncontrol/web_ui/changeset.py:334 +#: trac/versioncontrol/web_ui/browser.py:467 +msgid "Repository URL" +msgstr "URL репозитория" + +#: trac/versioncontrol/web_ui/browser.py:579 +#: trac/versioncontrol/web_ui/changeset.py:355 msgid "Zip Archive" msgstr "Архив Zip" -#: trac/versioncontrol/web_ui/browser.py:622 +#: trac/versioncontrol/web_ui/browser.py:752 msgid "Revision in which the line changed" msgstr "Ревизия, в которй строка была изменена" -#: trac/versioncontrol/web_ui/changeset.py:333 +#: trac/versioncontrol/web_ui/browser.py:810 +#, python-format +msgid "View repository %(repo)s" +msgstr "" + +#: trac/versioncontrol/web_ui/changeset.py:239 +#, python-format +msgid "Can't compare across different repositories: %(old)s vs. %(new)s" +msgstr "" + +#: trac/versioncontrol/web_ui/changeset.py:246 +#, python-format +msgid "No repository found for '%(reponame)s'" +msgstr "" + +#: trac/versioncontrol/web_ui/changeset.py:248 +msgid "No repository specified and no default repository configured." +msgstr "" + +#: trac/versioncontrol/web_ui/changeset.py:260 +#, fuzzy +msgid "Invalid Changeset Number" +msgstr "Недопустимый номер набора изменений" + +#: trac/versioncontrol/web_ui/changeset.py:353 msgid "Unified Diff" msgstr "Стандартный Diff" -#: trac/versioncontrol/web_ui/changeset.py:348 +#: trac/versioncontrol/web_ui/changeset.py:364 +#, fuzzy +msgid "Previous Changeset" +msgstr "Пердыдущая страница" + +#: trac/versioncontrol/web_ui/changeset.py:364 +#, fuzzy +msgid "Next Changeset" +msgstr "Изменения" + +#: trac/versioncontrol/web_ui/changeset.py:368 msgid "Reverse Diff" msgstr "" -#: trac/versioncontrol/web_ui/changeset.py:379 +#: trac/versioncontrol/web_ui/changeset.py:400 #, python-format msgid "Changeset %(id)s for %(path)s" msgstr "Изменения %(id)s для %(path)s" -#: trac/versioncontrol/web_ui/changeset.py:382 -#: trac/versioncontrol/web_ui/changeset.py:404 -#: trac/versioncontrol/web_ui/changeset.py:422 +#: trac/versioncontrol/web_ui/changeset.py:403 +#: trac/versioncontrol/web_ui/changeset.py:429 +#: trac/versioncontrol/web_ui/changeset.py:449 #, python-format msgid "Changeset %(id)s" msgstr "Изменения %(id)s" -#: trac/versioncontrol/web_ui/changeset.py:452 +#: trac/versioncontrol/web_ui/changeset.py:480 #, python-format msgid "Show revision %(rev)s of this file in browser" msgstr "Показать в браузере ревизию %(rev)s этого файла" -#: trac/versioncontrol/web_ui/changeset.py:595 +#: trac/versioncontrol/web_ui/changeset.py:622 #, python-format msgid "Show the changeset %(id)s restricted to %(path)s" msgstr "Показать набор изменений %(id)s в рамках пути %(path)s" -#: trac/versioncontrol/web_ui/changeset.py:605 +#: trac/versioncontrol/web_ui/changeset.py:634 #, fuzzy, python-format msgid "Show the %(range)s differences restricted to %(path)s" msgstr "Показать %(range)s изменений в рамках пути %(path)s" -#: trac/versioncontrol/web_ui/changeset.py:784 -msgid "Repository checkins" -msgstr "Добавления в репозиторий" +#: trac/versioncontrol/web_ui/changeset.py:847 +#, fuzzy +msgid "Changesets in all repositories" +msgstr "Набор изменений %(rev)s отсутсвует в репозиотории" -#: trac/versioncontrol/web_ui/changeset.py:956 +#: trac/versioncontrol/web_ui/changeset.py:849 #, fuzzy +msgid "Repository changesets" +msgstr "Наборы изменений репозитория" + +#: trac/versioncontrol/web_ui/changeset.py:980 +#, fuzzy, python-format +msgid "Changeset in %(repo)s " +msgid_plural "Changesets in %(repo)s " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: trac/versioncontrol/web_ui/changeset.py:982 +#, fuzzy +msgid "Changeset " +msgid_plural "Changesets " +msgstr[0] "Набор изменений" +msgstr[1] "" +msgstr[2] "" + +#: trac/versioncontrol/web_ui/changeset.py:1050 +#, fuzzy, python-format +msgid "No permission to view changset %(rev)s on %(repos)s" +msgstr "нет прав на просмотр этой страницы вики" + +#: trac/versioncontrol/web_ui/changeset.py:1054 +#, python-format +msgid "Repository %(repos)s not found" +msgstr "" + +#: trac/versioncontrol/web_ui/changeset.py:1056 +msgid "No default repository defined" +msgstr "" + +#: trac/versioncontrol/web_ui/changeset.py:1095 +#, fuzzy msgid "Changesets" msgstr "Наборы изменений" -#: trac/versioncontrol/web_ui/log.py:170 +#: trac/versioncontrol/web_ui/log.py:197 #, python-format msgid "" "The file or directory '%(path)s' doesn't exist at revision %(rev)s or at " @@ -3217,165 +4454,286 @@ "Файл или директория '%(path)s' не существуют в ревизии %(rev)s и в " "предшествующий ей." -#: trac/versioncontrol/web_ui/log.py:172 +#: trac/versioncontrol/web_ui/log.py:199 msgid "Nonexistent path" msgstr "Несуществующий путь" -#: trac/versioncontrol/web_ui/log.py:188 +#: trac/versioncontrol/web_ui/log.py:226 #, python-format msgid "Revision Log (restarting at %(path)s, rev. %(rev)s)" msgstr "Журнал изменений (начиная с %(path)s, рев. %(rev)s)" -#: trac/versioncontrol/web_ui/log.py:245 +#: trac/versioncontrol/web_ui/log.py:308 msgid "ChangeLog" msgstr "История изменений" -#: trac/versioncontrol/web_ui/log.py:247 +#: trac/versioncontrol/web_ui/log.py:310 msgid "View Latest Revision" msgstr "Посмотреть последнюю ревизию" -#: trac/versioncontrol/web_ui/log.py:251 +#: trac/versioncontrol/web_ui/log.py:314 msgid "Older Revisions" msgstr "Более старые ревизии" -#: trac/web/auth.py:89 +#: trac/versioncontrol/web_ui/util.py:64 +msgid "search" +msgstr "" + +#: trac/versioncontrol/web_ui/util.py:68 #, python-format +msgid "" +"You can %(search)s in the repository history to see if that path existed " +"but was later removed" +msgstr "" + +#: trac/web/auth.py:98 +#, python-format msgid "logged in as %(user)s" -msgstr "Привет, %(user)s" +msgstr "Вы вошли как пользователь %(user)s" -#: trac/web/auth.py:92 -#, fuzzy +#: trac/web/auth.py:101 msgid "Logout" -msgstr "Выход" +msgstr "Выйти" -#: trac/web/auth.py:95 -#, fuzzy +#: trac/web/auth.py:104 msgid "Login" -msgstr "Вход" +msgstr "Войти" -#: trac/web/auth.py:137 +#: trac/web/auth.py:146 #, python-format msgid "Already logged in as %(user)s." -msgstr "Вы уже залонинены как пользователь %(user)s." +msgstr "Вы уже вошли как пользователь %(user)s." -#: trac/web/chrome.py:160 trac/web/chrome.py:168 +#: trac/web/chrome.py:577 +#, python-format +msgid "Error with navigation contributor \"%(name)s\"" +msgstr "" + +#: trac/web/chrome.py:870 +#, fuzzy +msgid "(unknown template location)" +msgstr "Неизвестное действие" + +#: trac/web/chrome.py:871 +#, python-format +msgid "Genshi %(error)s error while rendering template %(location)s" +msgstr "" + +#: trac/web/main.py:510 #, fuzzy, python-format -msgid "Previous %(label)s" -msgstr "Пред. %(label)s" +msgid "Error: %(message)s" +msgstr "Ошибка: %(message)s" -#: trac/web/chrome.py:180 trac/web/chrome.py:187 +#. TRANSLATOR: ... not logged in, you may want to 'do so' now (link) +#: trac/web/main.py:524 +msgid "do so" +msgstr "сделать это" + +#: trac/web/main.py:526 #, python-format -msgid "Next %(label)s" -msgstr "След. %(label)s" +msgid "You are currently not logged in. You may want to %(do_so)s now." +msgstr "На данным момент Вы не вошли. Вы можете хотеть %(do_so)s сейчас." -#: trac/wiki/api.py:325 +#: trac/wiki/admin.py:113 +#, python-format +msgid "'%(name)s' is not a file" +msgstr "'%(name)s' не является файлом" + +#: trac/wiki/admin.py:164 trac/wiki/admin.py:247 +#, python-format +msgid " %(page)s imported from %(filename)s" +msgstr "" + +#: trac/wiki/admin.py:196 +msgid "Edits" +msgstr "" + +#: trac/wiki/admin.py:206 #, fuzzy +msgid "Deleted pages" +msgstr "Удалить страницу" + +#: trac/wiki/admin.py:226 +#, fuzzy, python-format +msgid "'%(name)s' is not a directory" +msgstr "Недопустимое действие: %(name)s" + +#: trac/wiki/api.py:301 +#, fuzzy msgid "no permission to view this wiki page" msgstr "нет прав на просмотр этой страницы вики" -#: trac/wiki/formatter.py:133 +#: trac/wiki/formatter.py:148 #, fuzzy, python-format msgid "HTML parsing error: %(message)s" msgstr "Ошибка на Вики-странице: %(message)s" -#: trac/wiki/intertrac.py:51 +#: trac/wiki/formatter.py:152 +msgid "Error: Forbidden character sequence \"--\" in htmlcomment wiki code block" +msgstr "" + +#: trac/wiki/formatter.py:221 #, python-format +msgid "!#%(name)s must contain at most one table" +msgstr "" + +#: trac/wiki/formatter.py:225 +#, python-format +msgid "!#%(name)s must contain at least one table cell (and table cells only)" +msgstr "" + +#: trac/wiki/intertrac.py:50 +#, python-format msgid "Can't view %(link)s:" msgstr "" -#: trac/wiki/macros.py:467 +#: trac/wiki/macros.py:529 #, python-format msgid "Error: Can't get description for macro %(name)s" msgstr "Ошибка: нет описания ждя макроса %(name)s" -#: trac/wiki/macros.py:550 +#: trac/wiki/macros.py:623 msgid "Table of Contents" msgstr "Содержание" -#: trac/wiki/model.py:146 +#: trac/wiki/model.py:150 msgid "Page not modified" msgstr "Страница не менялась" -#: trac/wiki/web_ui.py:85 trac/wiki/web_ui.py:596 +#: trac/wiki/web_ui.py:88 trac/wiki/web_ui.py:662 msgid "Wiki" msgstr "Вики" -#: trac/wiki/web_ui.py:87 +#: trac/wiki/web_ui.py:90 msgid "Help/Guide" -msgstr "Руководство и справочник" +msgstr "Справка/Руководство" -#: trac/wiki/web_ui.py:122 +#: trac/wiki/web_ui.py:125 #, python-format msgid "No version \"%(num)s\" for Wiki page \"%(name)s\"" msgstr "У страницы \"%(name)s\" нет версии \"%(num)s\"" -#: trac/wiki/web_ui.py:181 +#: trac/wiki/web_ui.py:183 #, python-format +msgid "The wiki page is too long (must be less than %(num)s characters)" +msgstr "Слишком длинная вики-страница (должно быть меньше чем %(num)s символов)" + +#: trac/wiki/web_ui.py:193 +#, python-format msgid "The Wiki page field '%(field)s' is invalid: %(message)s" -msgstr "Недопустимое под '%(field)s' Вики-страницы: %(message)s" +msgstr "Поле '%(field)s' страницы Вики недопустимо: %(message)s" -#: trac/wiki/web_ui.py:185 +#: trac/wiki/web_ui.py:197 #, python-format msgid "Invalid Wiki page: %(message)s" -msgstr "Ошибка на Вики-странице: %(message)s" +msgstr "Недопустимая страница Вики: %(message)s" -#: trac/wiki/web_ui.py:271 +#. TRANSLATOR: wiki page +#: trac/wiki/web_ui.py:224 +msgid "currently edited" +msgstr "" + +#: trac/wiki/web_ui.py:258 +#, python-format +msgid "The page %(name)s has been deleted." +msgstr "Страница %(name)s удалена." + +#: trac/wiki/web_ui.py:263 +#, python-format +msgid "The versions %(from_)d to %(to)d of the page %(name)s have been deleted." +msgstr "Версии с %(from_)d по %(to)d страницы %(name)s удалены." + +#: trac/wiki/web_ui.py:267 +#, python-format +msgid "The version %(version)d of the page %(name)s has been deleted." +msgstr "Версия %(version)d страницы %(name)s удалена." + +#: trac/wiki/web_ui.py:293 msgid "Page not modified, showing latest version." -msgstr "Изменений не обнаружено." +msgstr "Страница не изменена, показывается последняя версия." -#: trac/wiki/web_ui.py:303 +#: trac/wiki/web_ui.py:325 #, fuzzy, python-format msgid "Version %(num)s of page \"%(name)s\" does not exist" msgstr "Версия %(num)s страницы %(name)s не существует" -#: trac/wiki/web_ui.py:357 -#, fuzzy +#: trac/wiki/web_ui.py:377 msgid "Page history" msgstr "История страницы" -#: trac/wiki/web_ui.py:374 -#, fuzzy +#: trac/wiki/web_ui.py:395 msgid "Wiki History" -msgstr "История изменений" +msgstr "История Вики" -#: trac/wiki/web_ui.py:439 +#: trac/wiki/web_ui.py:481 #, python-format msgid "Page %(name)s does not exist" -msgstr "Страница не существует: %(name)s" +msgstr "Страница %(name)s не существует" -#: trac/wiki/web_ui.py:476 +#: trac/wiki/web_ui.py:495 +#, fuzzy, python-format +msgid "Back to %(wikipage)s" +msgstr "Назад к %(wikipage)s" + +#: trac/wiki/web_ui.py:523 #, python-format msgid "Page %(name)s not found" msgstr "Страница не найдена: %(name)s" -#: trac/wiki/web_ui.py:510 trac/wiki/web_ui.py:519 +#: trac/wiki/web_ui.py:575 #, fuzzy -msgid "View Latest Version" +msgid "View latest version" msgstr "Текущая версия" -#: trac/wiki/web_ui.py:539 +#: trac/wiki/web_ui.py:579 +#, fuzzy +msgid "View parent page" +msgstr "Просмотреть изменения" + +#: trac/wiki/web_ui.py:588 +msgid "Previous Version" +msgstr "Предыдущая версия" + +#: trac/wiki/web_ui.py:588 +msgid "Next Version" +msgstr "Следующая версия" + +#: trac/wiki/web_ui.py:589 +msgid "View Latest Version" +msgstr "Просмотреть последнюю версию" + +#: trac/wiki/web_ui.py:592 +msgid "Up" +msgstr "" + +#: trac/wiki/web_ui.py:609 msgid "Start Page" msgstr "Начальная страница" -#: trac/wiki/web_ui.py:540 +#: trac/wiki/web_ui.py:610 msgid "Index" -msgstr "Индекс" +msgstr "Указатель" -#: trac/wiki/web_ui.py:542 +#: trac/wiki/web_ui.py:612 msgid "History" -msgstr "История изменений" +msgstr "История" -#: trac/wiki/web_ui.py:552 +#: trac/wiki/web_ui.py:619 msgid "Wiki changes" -msgstr "Изменения в Вики" +msgstr "Изменения Вики" -#: trac/wiki/templates/wiki_delete.html:22 -msgid "Delete" -msgstr "Удалить" +#. TRANSLATOR: wiki page +#: trac/wiki/web_ui.py:648 +msgid " edited" +msgstr " изменено" +#: trac/wiki/web_ui.py:648 +msgid " created" +msgstr " создано" + #: trac/wiki/templates/wiki_delete.html:26 msgid "Are you sure you want to" -msgstr "Вы действительно хотите" +msgstr "Вы уверены, что хотите" #: trac/wiki/templates/wiki_delete.html:26 msgid "delete" @@ -3389,135 +4747,219 @@ msgid "This is the only version the page, so the page will be removed completely!" msgstr "Это единственная версия, страница будет окончательно удалена." -#: trac/wiki/templates/wiki_diff.html:16 -#, fuzzy, python-format +#: trac/wiki/templates/wiki_diff.html:17 +#, python-format msgid "Delete version %(old_version)d to version %(version)d" -msgstr "Удаление версий с %(old_version)d по %(version)d" +msgstr "Удалить с версии %(old_version)d по версию %(version)d" -#: trac/wiki/templates/wiki_diff.html:17 -#, fuzzy, python-format +#: trac/wiki/templates/wiki_diff.html:18 +#, python-format msgid "Delete version %(version)d" msgstr "Удалить версию %(version)d" -#: trac/wiki/templates/wiki_edit.html:28 +#: trac/wiki/templates/wiki_edit.html:68 trac/wiki/templates/wiki_edit.html:141 +msgid "Go to Save, Preview, Review or Cancel buttons" +msgstr "" +"Перейти к кнопкам Сохранить, Предварительный просмотр, Пересмотр или " +"Отменить" + +#: trac/wiki/templates/wiki_edit.html:70 +msgid "See the diffs" +msgstr "Смотреть diff" + +#: trac/wiki/templates/wiki_edit.html:70 +#: trac/wiki/templates/wiki_edit_form.html:38 +msgid "Review" +msgstr "Пересмотр" + +#: trac/wiki/templates/wiki_edit.html:71 +msgid "See the preview" +msgstr "Просмотреть предварительный просмотр" + +#: trac/wiki/templates/wiki_edit.html:74 msgid "Editing" msgstr "Редактирование" -#: trac/wiki/templates/wiki_edit.html:30 +#: trac/wiki/templates/wiki_edit.html:76 msgid "Someone else has modified that page since you started your edits." msgstr "" +"С того момета, как Вы начали вносить правки, кто-то другой изменил эту " +"страницу." -#: trac/wiki/templates/wiki_edit.html:31 trac/wiki/templates/wiki_edit.html:41 +#: trac/wiki/templates/wiki_edit.html:77 msgid "If you save right away, you risk to revert those changes" -msgstr "" +msgstr "Если Вы сохраните сразу, Вы рискуете отменить те изменения" -#: trac/wiki/templates/wiki_edit.html:31 trac/wiki/templates/wiki_edit.html:41 +#: trac/wiki/templates/wiki_edit.html:77 msgid "(highlighted below as deletions)." -msgstr "" +msgstr "(выделенные ниже удаления)." -#: trac/wiki/templates/wiki_edit.html:33 trac/wiki/templates/wiki_edit.html:42 +#: trac/wiki/templates/wiki_edit.html:79 msgid "" "Please review all those changes and manually merge them with your\n" " own changes." msgstr "" +"Пожалуйста, пересмотрите все те изменения и вручную объединитие их со " +"своими\n" +" изменениями." -#: trac/wiki/templates/wiki_edit.html:34 trac/wiki/templates/wiki_edit.html:44 +#: trac/wiki/templates/wiki_edit.html:80 msgid "If you're unsure about what you're doing, please press" -msgstr "" +msgstr "Если Вы не уверены в том, что делаете, пожалуйста, нажмите" -#: trac/wiki/templates/wiki_edit.html:35 trac/wiki/templates/wiki_edit.html:45 +#: trac/wiki/templates/wiki_edit.html:81 msgid "" "(losing your changes) and start editing the latest version of the page\n" " again." msgstr "" +"(потеряв все Ваши изменения) и снова начните редактировать с последней " +"версии страницы." -#: trac/wiki/templates/wiki_edit.html:39 -msgid "Someone else modified that page since you started your edits." -msgstr "" - -#: trac/wiki/templates/wiki_edit.html:53 +#: trac/wiki/templates/wiki_edit.html:115 msgid "Change information for future version" msgstr "Изменения в новой версии" -#: trac/wiki/templates/wiki_edit.html:54 trac/wiki/templates/wiki_view.html:26 +#: trac/wiki/templates/wiki_edit.html:116 msgid "(modified by" msgstr "(изменено пользователем" -#: trac/wiki/templates/wiki_edit.html:72 +#: trac/wiki/templates/wiki_edit.html:125 +msgid "Go to the editor" +msgstr "Перейти в редактор" + +#: trac/wiki/templates/wiki_edit.html:128 +#: trac/wiki/templates/wiki_edit_form.html:74 +msgid "Review Changes" +msgstr "Пересмотреть изменения" + +#: trac/wiki/templates/wiki_edit.html:130 +msgid "No changes" +msgstr "Изменений нет" + +#: trac/wiki/templates/wiki_edit.html:147 msgid "" "Sorry, this page has been modified by somebody else since you started\n" " editing. Your changes cannot be saved." msgstr "" -"Извините, но пока вы редактировали страницу, она успела измениться. " +"Извините, но пока вы редактировали страницу, её изменил кто-то другой. " "Невозможно сохранить Ваши изменения." -#: trac/wiki/templates/wiki_edit.html:85 +#: trac/wiki/templates/wiki_edit_form.html:16 msgid "Adjust edit area height:" -msgstr "Высота области редактирования:" +msgstr "Настроить высоту области редактирования:" -#: trac/wiki/templates/wiki_edit.html:97 +#: trac/wiki/templates/wiki_edit_form.html:24 +msgid "Selecting and pressing 'Preview' enters a two-column [edit|preview] mode" +msgstr "" +"Выбор и нажатие 'Предварительный просмотр' вводит двух-колоночный режим " +"[редактирование|предварительный просмотр]" + +#: trac/wiki/templates/wiki_edit_form.html:24 +msgid "Edit side-by-side" +msgstr "Редактировать бок-о-бок" + +#: trac/wiki/templates/wiki_edit_form.html:32 msgid "" "[1:Note:] See [2:WikiFormatting] and\n" -" [3:TracWiki] for help on editing wiki content." +" [3:TracWiki] for help on editing wiki content." msgstr "" -"[1:Note:] См. [2:WikiFormatting] и\n" -" [3:TracWiki] для справки по редактированию Вики-страниц." +"[1:Примечание:] Смотрите [2:WikiFormatting] и\n" +" [3:TracWiki] для справки по редактированию вики-контента." -#: trac/wiki/templates/wiki_edit.html:102 +#: trac/wiki/templates/wiki_edit_form.html:38 +#, fuzzy +msgid "See the start of the diffs" +msgstr "Выберите базу и цель для вычисления различий:" + +#: trac/wiki/templates/wiki_edit_form.html:39 +msgid "See the start of the preview" +msgstr "Просмотреть начало предварительного просмотра" + +#: trac/wiki/templates/wiki_edit_form.html:43 msgid "Change information" msgstr "Изменить информацию" -#: trac/wiki/templates/wiki_edit.html:110 +#: trac/wiki/templates/wiki_edit_form.html:54 msgid "Comment about this change (optional):" -msgstr "Комментарий к данному изменению (не требуется):" +msgstr "Комментарий к данному изменению (по желанию):" -#: trac/wiki/templates/wiki_edit.html:117 +#: trac/wiki/templates/wiki_edit_form.html:61 msgid "Page is read-only" -msgstr "Неизменяемая страница" +msgstr "Страница только для чтения" -#: trac/wiki/templates/wiki_edit.html:125 -#, fuzzy +#: trac/wiki/templates/wiki_edit_form.html:69 msgid "Merge changes" msgstr "Объединить изменения" -#: trac/wiki/templates/wiki_edit.html:129 -#, fuzzy +#: trac/wiki/templates/wiki_edit_form.html:73 msgid "Preview Page" -msgstr "Просмотреть" +msgstr "Предварительный просмотр страницы" -#: trac/wiki/templates/wiki_edit.html:130 -#, fuzzy -msgid "Review Changes" -msgstr "Просмотреть изменения" +#: trac/wiki/templates/wiki_view.html:26 +msgid "View WikiStart" +msgstr "Прсмотреть WikiStart" +#: trac/wiki/templates/wiki_view.html:26 +msgid "wiki:" +msgstr "вики:" + #: trac/wiki/templates/wiki_view.html:39 -msgid "Describe" -msgstr "Описать" +#, python-format +msgid "" +"Version %(version)s (modified by %(author)s, %(date)s ago)\n" +" ([1:diff])" +msgstr "" +"Версия %(version)s (изменена пользователем %(author)s, %(date)s назад)\n" +" ([1:diff])" -#: trac/wiki/templates/wiki_view.html:40 -msgid "here." -msgstr "на этой странице." +#: trac/wiki/templates/wiki_view.html:53 +#, python-format +msgid "" +"[1:Last modified]\n" +" by %(author)s on %(datetime)s (%(reldate)s ago)" +msgstr "" +"[1:Последний раз изменено]\n" +" пользователем %(author)s в %(datetime)s (%(reldate)s назад)" -#: trac/wiki/templates/wiki_view.html:57 +#: trac/wiki/templates/wiki_view.html:60 +msgid "The page" +msgstr "Страница" + +#: trac/wiki/templates/wiki_view.html:60 +msgid "does not exist. You can create it here." +msgstr "не существует. Вы можете создать её здесь." + +#: trac/wiki/templates/wiki_view.html:62 +msgid "You could also create the same page higher in the hierarchy:" +msgstr "" + +#: trac/wiki/templates/wiki_view.html:83 msgid "Edit this page" -msgstr "Редактировать страницу" +msgstr "Редактировать данную страницу" -#: trac/wiki/templates/wiki_view.html:60 +#: trac/wiki/templates/wiki_view.html:86 msgid "Create this page" -msgstr "Создать страницу" +msgstr "Создать эту страницу" -#: trac/wiki/templates/wiki_view.html:62 +#: trac/wiki/templates/wiki_view.html:88 msgid "Using the template:" msgstr "Использовать шаблон:" -#: trac/wiki/templates/wiki_view.html:65 +#: trac/wiki/templates/wiki_view.html:91 msgid "(blank page)" msgstr "(с чистого листа)" -#: trac/wiki/templates/wiki_view.html:84 +#: trac/wiki/templates/wiki_view.html:110 msgid "Delete this version" msgstr "Удалить данную версию" -#: trac/wiki/templates/wiki_view.html:86 +#: trac/wiki/templates/wiki_view.html:112 msgid "Delete page" msgstr "Удалить страницу" + +#: trac/wiki/templates/wiki_view.html:121 +msgid "The following pages have a name similar to this page, and may be related:" +msgstr "" +"Названия следующих страниц похожи на название этой, и они могут быть " +"связанными:" +