2007-07-22 13:57:12 +02:00
|
|
|
|
# Translation of git-gui to russian
|
|
|
|
|
# Copyright (C) 2007 Shawn Pearce
|
|
|
|
|
# This file is distributed under the same license as the git-gui package.
|
|
|
|
|
# Irina Riesen <irina.riesen@gmail.com>, 2007.
|
|
|
|
|
#
|
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: git-gui\n"
|
|
|
|
|
"Report-Msgid-Bugs-To: \n"
|
2011-01-17 22:08:55 +01:00
|
|
|
|
"POT-Creation-Date: 2010-01-26 15:47-0800\n"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
"PO-Revision-Date: 2007-10-22 22:30-0200\n"
|
|
|
|
|
"Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"Language-Team: Russian Translation <git@vger.kernel.org>\n"
|
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
|
|
|
|
|
#: git-gui.sh:922
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "git-gui: fatal error"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "git-gui: критическая ошибка"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:743
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Invalid font specified in %s:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "В %s установлен неверный шрифт:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:779
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Main Font"
|
|
|
|
|
msgstr "Шрифт интерфейса"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:780
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Diff/Console Font"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Шрифт консоли и изменений (diff)"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:794
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Cannot find git in PATH."
|
|
|
|
|
msgstr "git не найден в PATH."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:821
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Cannot parse Git version string:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Невозможно распознать строку версии Git: "
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:839
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Git version cannot be determined.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s claims it is version '%s'.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s requires at least Git 1.5.0 or later.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Assume '%s' is version 1.5.0?\n"
|
|
|
|
|
msgstr ""
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"Невозможно определить версию Git\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"\n"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"%s указывает на версию '%s'.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"для %s требуется версия Git, начиная с 1.5.0\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Принять '%s' как версию 1.5.0?\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1128
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Git directory not found:"
|
|
|
|
|
msgstr "Каталог Git не найден:"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1146
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Cannot move to top of working directory:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Невозможно перейти к корню рабочего каталога репозитория: "
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1154
|
|
|
|
|
msgid "Cannot use bare repository:"
|
|
|
|
|
msgstr "Невозможно использование репозитория без рабочего каталога:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1162
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "No working directory"
|
|
|
|
|
msgstr "Отсутствует рабочий каталог"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1334 lib/checkout_op.tcl:306
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Refreshing file status..."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Обновление информации о состоянии файлов..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1390
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Scanning for modified files ..."
|
|
|
|
|
msgstr "Поиск измененных файлов..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1454
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Calling prepare-commit-msg hook..."
|
|
|
|
|
msgstr "Вызов программы поддержки репозитория prepare-commit-msg..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1471
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Commit declined by prepare-commit-msg hook."
|
2009-08-12 17:24:10 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Сохранение прервано программой поддержки репозитория prepare-commit-msg"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1629 lib/browser.tcl:246
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Ready."
|
|
|
|
|
msgstr "Готово."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1787
|
2009-08-12 17:24:10 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Displaying only %s of %s files."
|
|
|
|
|
msgstr "Показано %s из %s файлов."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1913
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Unmodified"
|
|
|
|
|
msgstr "Не изменено"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1915
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Modified, not staged"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Изменено, не подготовлено"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1916 git-gui.sh:1924
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Staged for commit"
|
|
|
|
|
msgstr "Подготовлено для сохранения"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1917 git-gui.sh:1925
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Portions staged for commit"
|
|
|
|
|
msgstr "Части, подготовленные для сохранения"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1918 git-gui.sh:1926
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Staged for commit, missing"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Подготовлено для сохранения, отсутствует"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1920
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "File type changed, not staged"
|
|
|
|
|
msgstr "Тип файла изменён, не подготовлено"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1921
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "File type changed, staged"
|
|
|
|
|
msgstr "Тип файла изменён, подготовлено"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1923
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Untracked, not staged"
|
|
|
|
|
msgstr "Не отслеживается, не подготовлено"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1928
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Missing"
|
|
|
|
|
msgstr "Отсутствует"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1929
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Staged for removal"
|
|
|
|
|
msgstr "Подготовлено для удаления"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1930
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Staged for removal, still present"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Подготовлено для удаления, еще не удалено"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
|
|
|
|
|
#: git-gui.sh:1936 git-gui.sh:1937
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Requires merge resolution"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Требуется разрешение конфликта при слиянии"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1972
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Starting gitk... please wait..."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Запускается gitk... Подождите, пожалуйста..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:1984
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Couldn't find gitk in PATH"
|
|
|
|
|
msgstr "gitk не найден в PATH."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2043
|
|
|
|
|
msgid "Couldn't find git gui in PATH"
|
|
|
|
|
msgstr "git gui не найден в PATH."
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:2455 lib/choose_repository.tcl:36
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Repository"
|
|
|
|
|
msgstr "Репозиторий"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2456
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Edit"
|
|
|
|
|
msgstr "Редактировать"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2458 lib/choose_rev.tcl:561
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Branch"
|
|
|
|
|
msgstr "Ветвь"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2461 lib/choose_rev.tcl:548
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Commit@@noun"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Состояние"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Merge"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Слияние"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2465 lib/choose_rev.tcl:557
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Remote"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Внешние репозитории"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2468
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Tools"
|
|
|
|
|
msgstr "Вспомогательные операции"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2477
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Explore Working Copy"
|
|
|
|
|
msgstr "Просмотр рабочего каталога"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2483
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Browse Current Branch's Files"
|
|
|
|
|
msgstr "Просмотреть файлы текущей ветви"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2487
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Browse Branch Files..."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Показать файлы ветви..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2492
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Visualize Current Branch's History"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Показать историю текущей ветви"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2496
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Visualize All Branch History"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Показать историю всех ветвей"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2503
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Browse %s's Files"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Показать файлы ветви %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2505
|
2007-10-20 21:35:53 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Visualize %s's History"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Показать историю ветви %s"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Database Statistics"
|
|
|
|
|
msgstr "Статистика базы данных"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2513 lib/database.tcl:34
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Compress Database"
|
|
|
|
|
msgstr "Сжать базу данных"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2516
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Verify Database"
|
|
|
|
|
msgstr "Проверить базу данных"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
|
|
|
|
|
#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Create Desktop Icon"
|
|
|
|
|
msgstr "Создать ярлык на рабочем столе"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Quit"
|
|
|
|
|
msgstr "Выход"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2547
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Undo"
|
|
|
|
|
msgstr "Отменить"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2550
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Redo"
|
|
|
|
|
msgstr "Повторить"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2554 git-gui.sh:3109
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Cut"
|
|
|
|
|
msgstr "Вырезать"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/console.tcl:69
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Copy"
|
|
|
|
|
msgstr "Копировать"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2560 git-gui.sh:3115
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Paste"
|
|
|
|
|
msgstr "Вставить"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#: lib/remote_branch_delete.tcl:38
|
|
|
|
|
msgid "Delete"
|
|
|
|
|
msgstr "Удалить"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Select All"
|
|
|
|
|
msgstr "Выделить все"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2576
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Create..."
|
|
|
|
|
msgstr "Создать..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2582
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Checkout..."
|
|
|
|
|
msgstr "Перейти..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2588
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Rename..."
|
|
|
|
|
msgstr "Переименовать..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2593
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Delete..."
|
|
|
|
|
msgstr "Удалить..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2598
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Reset..."
|
|
|
|
|
msgstr "Сбросить..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2608
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Done"
|
|
|
|
|
msgstr "Завершено"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2610
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Commit@@verb"
|
|
|
|
|
msgstr "Сохранить"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2619 git-gui.sh:3050
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "New Commit"
|
|
|
|
|
msgstr "Новое состояние"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2627 git-gui.sh:3057
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Amend Last Commit"
|
|
|
|
|
msgstr "Исправить последнее состояние"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Rescan"
|
|
|
|
|
msgstr "Перечитать"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2643
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Stage To Commit"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Подготовить для сохранения"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2649
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Stage Changed Files To Commit"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Подготовить измененные файлы для сохранения"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2655
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Unstage From Commit"
|
|
|
|
|
msgstr "Убрать из подготовленного"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2661 lib/index.tcl:412
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Revert Changes"
|
|
|
|
|
msgstr "Отменить изменения"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Show Less Context"
|
|
|
|
|
msgstr "Меньше контекста"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Show More Context"
|
|
|
|
|
msgstr "Больше контекста"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Sign Off"
|
|
|
|
|
msgstr "Вставить Signed-off-by"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2696
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Local Merge..."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Локальное слияние..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2701
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Abort Merge..."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Прервать слияние..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2713 git-gui.sh:2741
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Add..."
|
|
|
|
|
msgstr "Добавить..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2717
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Push..."
|
|
|
|
|
msgstr "Отправить..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2721
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Delete Branch..."
|
|
|
|
|
msgstr "Удалить ветвь..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2731 git-gui.sh:3292
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Options..."
|
|
|
|
|
msgstr "Настройки..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2742
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Remove..."
|
|
|
|
|
msgstr "Удалить..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2751 lib/choose_repository.tcl:50
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Help"
|
|
|
|
|
msgstr "Помощь"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
|
|
|
|
|
#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "About %s"
|
|
|
|
|
msgstr "О %s"
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:2783
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Online Documentation"
|
|
|
|
|
msgstr "Документация в интернете"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Show SSH Key"
|
|
|
|
|
msgstr "Показать ключ SSH"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2893
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "fatal: cannot stat path %s: No such file or directory"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "критическая ошибка: %s: нет такого файла или каталога"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2926
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Current Branch:"
|
|
|
|
|
msgstr "Текущая ветвь:"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2947
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Staged Changes (Will Commit)"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr "Подготовлено (будет сохранено)"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:2967
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Unstaged Changes"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Изменено (не будет сохранено)"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3017
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Stage Changed"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Подготовить все"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Push"
|
|
|
|
|
msgstr "Отправить"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3071
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Initial Commit Message:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Комментарий к первому состоянию:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3072
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Amended Commit Message:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Комментарий к исправленному состоянию:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3073
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Amended Initial Commit Message:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Комментарий к исправленному первоначальному состоянию:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3074
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Amended Merge Commit Message:"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Комментарий к исправленному слиянию:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3075
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Merge Commit Message:"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Комментарий к слиянию:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3076
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Commit Message:"
|
|
|
|
|
msgstr "Комментарий к состоянию:"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Copy All"
|
|
|
|
|
msgstr "Копировать все"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3149 lib/blame.tcl:104
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "File:"
|
|
|
|
|
msgstr "Файл:"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3255
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Refresh"
|
|
|
|
|
msgstr "Обновить"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3276
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Decrease Font Size"
|
|
|
|
|
msgstr "Уменьшить размер шрифта"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3280
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Increase Font Size"
|
|
|
|
|
msgstr "Увеличить размер шрифта"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3288 lib/blame.tcl:281
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Encoding"
|
|
|
|
|
msgstr "Кодировка"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3299
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Apply/Reverse Hunk"
|
|
|
|
|
msgstr "Применить/Убрать изменение"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3304
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Apply/Reverse Line"
|
|
|
|
|
msgstr "Применить/Убрать строку"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3323
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Run Merge Tool"
|
|
|
|
|
msgstr "Запустить программу слияния"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3328
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Use Remote Version"
|
|
|
|
|
msgstr "Взять внешнюю версию"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3332
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Use Local Version"
|
|
|
|
|
msgstr "Взять локальную версию"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3336
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Revert To Base"
|
|
|
|
|
msgstr "Отменить изменения"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3354
|
|
|
|
|
msgid "Visualize These Changes In The Submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:3358
|
|
|
|
|
msgid "Visualize Current Branch History In The Submodule"
|
|
|
|
|
msgstr "Показать историю текущей ветви подмодуля"
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:3362
|
|
|
|
|
msgid "Visualize All Branch History In The Submodule"
|
|
|
|
|
msgstr "Показать историю всех ветвей подмодуля"
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:3367
|
|
|
|
|
msgid "Start git gui In The Submodule"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:3389
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Unstage Hunk From Commit"
|
|
|
|
|
msgstr "Не сохранять часть"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3391
|
|
|
|
|
msgid "Unstage Lines From Commit"
|
|
|
|
|
msgstr "Убрать строки из подготовленного"
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:3393
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Unstage Line From Commit"
|
|
|
|
|
msgstr "Убрать строку из подготовленного"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3396
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Stage Hunk For Commit"
|
|
|
|
|
msgstr "Подготовить часть для сохранения"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3398
|
|
|
|
|
msgid "Stage Lines For Commit"
|
|
|
|
|
msgstr "Подготовить строки для сохранения"
|
|
|
|
|
|
|
|
|
|
#: git-gui.sh:3400
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Stage Line For Commit"
|
|
|
|
|
msgstr "Подготовить строку для сохранения"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3424
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Initializing..."
|
|
|
|
|
msgstr "Инициализация..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3541
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Possible environment issues exist.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The following environment variables are probably\n"
|
|
|
|
|
"going to be ignored by any Git subprocess run\n"
|
|
|
|
|
"by %s:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"Возможны ошибки в переменных окружения.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Переменные окружения, которые возможно\n"
|
|
|
|
|
"будут проигнорированы командами Git,\n"
|
|
|
|
|
"запущенными из %s\n"
|
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3570
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"This is due to a known issue with the\n"
|
|
|
|
|
"Tcl binary distributed by Cygwin."
|
|
|
|
|
msgstr ""
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Это известная проблема с Tcl,\n"
|
|
|
|
|
"распространяемым Cygwin."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: git-gui.sh:3575
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"A good replacement for %s\n"
|
|
|
|
|
"is placing values for the user.name and\n"
|
|
|
|
|
"user.email settings into your personal\n"
|
|
|
|
|
"~/.gitconfig file.\n"
|
|
|
|
|
msgstr ""
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"\n"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
"Вместо использования %s можно\n"
|
|
|
|
|
"сохранить значения user.name и\n"
|
|
|
|
|
"user.email в Вашем персональном\n"
|
|
|
|
|
"файле ~/.gitconfig.\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/about.tcl:26
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "git-gui - a graphical user interface for Git."
|
|
|
|
|
msgstr "git-gui - графический пользовательский интерфейс к Git."
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:72
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "File Viewer"
|
|
|
|
|
msgstr "Просмотр файла"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:78
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Commit:"
|
|
|
|
|
msgstr "Сохраненное состояние:"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:271
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Copy Commit"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Скопировать SHA-1"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:275
|
|
|
|
|
msgid "Find Text..."
|
|
|
|
|
msgstr "Найти текст..."
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:284
|
|
|
|
|
msgid "Do Full Copy Detection"
|
|
|
|
|
msgstr "Провести полный поиск копий"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:288
|
|
|
|
|
msgid "Show History Context"
|
|
|
|
|
msgstr "Показать исторический контекст"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:291
|
|
|
|
|
msgid "Blame Parent Commit"
|
|
|
|
|
msgstr "Рассмотреть состояние предка"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:450
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Reading %s..."
|
|
|
|
|
msgstr "Чтение %s..."
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:557
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Loading copy/move tracking annotations..."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Загрузка аннотации копирований/переименований..."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:577
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "lines annotated"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "строк прокомментировано"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:769
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Loading original location annotations..."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Загрузка аннотаций первоначального положения объекта..."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:772
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Annotation complete."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Аннотация завершена."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:802
|
|
|
|
|
msgid "Busy"
|
|
|
|
|
msgstr "Занят"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:803
|
|
|
|
|
msgid "Annotation process is already running."
|
|
|
|
|
msgstr "Аннотация уже запущена"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:842
|
|
|
|
|
msgid "Running thorough copy detection..."
|
|
|
|
|
msgstr "Выполнение полного поиска копий..."
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:910
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Loading annotation..."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Загрузка аннотации..."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:963
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Author:"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Автор:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:967
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Committer:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Сохранил:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:972
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Original File:"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Исходный файл:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:1020
|
|
|
|
|
msgid "Cannot find HEAD commit:"
|
|
|
|
|
msgstr "Невозможно найти текущее состояние:"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:1075
|
|
|
|
|
msgid "Cannot find parent commit:"
|
|
|
|
|
msgstr "Невозможно найти состояние предка:"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:1090
|
|
|
|
|
msgid "Unable to display parent"
|
|
|
|
|
msgstr "Не могу показать предка"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/blame.tcl:1091 lib/diff.tcl:320
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Error loading diff:"
|
|
|
|
|
msgstr "Ошибка загрузки изменений:"
|
|
|
|
|
|
|
|
|
|
#: lib/blame.tcl:1231
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Originally By:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Источник:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:1237
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "In File:"
|
|
|
|
|
msgstr "Файл:"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/blame.tcl:1242
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Copied Or Moved Here By:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Скопировано/перемещено в:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
|
|
|
|
|
msgid "Checkout Branch"
|
|
|
|
|
msgstr "Перейти на ветвь"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_checkout.tcl:23
|
|
|
|
|
msgid "Checkout"
|
|
|
|
|
msgstr "Перейти"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
|
|
|
|
|
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
|
|
|
|
|
#: lib/transport.tcl:108
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Cancel"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Отмена"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Revision"
|
|
|
|
|
msgstr "Версия"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Options"
|
|
|
|
|
msgstr "Настройки"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
|
|
|
|
|
msgid "Fetch Tracking Branch"
|
|
|
|
|
msgstr "Получить изменения из внешней ветви"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_checkout.tcl:44
|
|
|
|
|
msgid "Detach From Local Branch"
|
|
|
|
|
msgstr "Отсоединить от локальной ветви"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:22
|
|
|
|
|
msgid "Create Branch"
|
|
|
|
|
msgstr "Создание ветви"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:27
|
|
|
|
|
msgid "Create New Branch"
|
|
|
|
|
msgstr "Создать новую ветвь"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Create"
|
|
|
|
|
msgstr "Создать"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:40
|
|
|
|
|
msgid "Branch Name"
|
|
|
|
|
msgstr "Название ветви"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Name:"
|
|
|
|
|
msgstr "Название:"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:58
|
|
|
|
|
msgid "Match Tracking Branch Name"
|
|
|
|
|
msgstr "Взять из имен ветвей слежения"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:66
|
|
|
|
|
msgid "Starting Revision"
|
|
|
|
|
msgstr "Начальная версия"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:72
|
|
|
|
|
msgid "Update Existing Branch:"
|
|
|
|
|
msgstr "Обновить имеющуюся ветвь:"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:75
|
|
|
|
|
msgid "No"
|
|
|
|
|
msgstr "Нет"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:80
|
|
|
|
|
msgid "Fast Forward Only"
|
|
|
|
|
msgstr "Только Fast Forward"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Reset"
|
|
|
|
|
msgstr "Сброс"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:97
|
|
|
|
|
msgid "Checkout After Creation"
|
|
|
|
|
msgstr "После создания сделать текущей"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:131
|
|
|
|
|
msgid "Please select a tracking branch."
|
|
|
|
|
msgstr "Укажите ветвь слежения."
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:140
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Tracking branch %s is not a branch in the remote repository."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Ветвь слежения %s не является ветвью во внешнем репозитории."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
|
|
|
|
|
msgid "Please supply a branch name."
|
|
|
|
|
msgstr "Укажите название ветви."
|
|
|
|
|
|
|
|
|
|
#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "'%s' is not an acceptable branch name."
|
|
|
|
|
msgstr "Недопустимое название ветви '%s'."
|
|
|
|
|
|
|
|
|
|
#: lib/branch_delete.tcl:15
|
|
|
|
|
msgid "Delete Branch"
|
|
|
|
|
msgstr "Удаление ветви"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_delete.tcl:20
|
|
|
|
|
msgid "Delete Local Branch"
|
|
|
|
|
msgstr "Удалить локальную ветвь"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_delete.tcl:37
|
|
|
|
|
msgid "Local Branches"
|
|
|
|
|
msgstr "Локальные ветви"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_delete.tcl:52
|
|
|
|
|
msgid "Delete Only If Merged Into"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Удалить только в случае, если было слияние с"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
|
|
|
|
|
msgid "Always (Do not perform merge checks)"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Всегда (не выполнять проверку на слияние)"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/branch_delete.tcl:103
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "The following branches are not completely merged into %s:"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Ветви, которые не полностью сливаются с %s:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
|
|
|
|
|
msgid ""
|
|
|
|
|
"Recovering deleted branches is difficult.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Delete the selected branches?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Восстановить удаленные ветви сложно.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Продолжить?"
|
|
|
|
|
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#: lib/branch_delete.tcl:141
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Failed to delete branches:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Не удалось удалить ветви:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
|
|
|
|
|
msgid "Rename Branch"
|
|
|
|
|
msgstr "Переименование ветви"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_rename.tcl:26
|
|
|
|
|
msgid "Rename"
|
|
|
|
|
msgstr "Переименовать"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_rename.tcl:36
|
|
|
|
|
msgid "Branch:"
|
|
|
|
|
msgstr "Ветвь:"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_rename.tcl:39
|
|
|
|
|
msgid "New Name:"
|
|
|
|
|
msgstr "Новое название:"
|
|
|
|
|
|
|
|
|
|
#: lib/branch_rename.tcl:75
|
|
|
|
|
msgid "Please select a branch to rename."
|
|
|
|
|
msgstr "Укажите ветвь для переименования."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Branch '%s' already exists."
|
|
|
|
|
msgstr "Ветвь '%s' уже существует."
|
|
|
|
|
|
|
|
|
|
#: lib/branch_rename.tcl:117
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Failed to rename '%s'."
|
|
|
|
|
msgstr "Не удалось переименовать '%s'. "
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/browser.tcl:17
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Starting..."
|
|
|
|
|
msgstr "Запуск..."
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/browser.tcl:26
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "File Browser"
|
|
|
|
|
msgstr "Просмотр списка файлов"
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/browser.tcl:126 lib/browser.tcl:143
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Loading %s..."
|
|
|
|
|
msgstr "Загрузка %s..."
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/browser.tcl:187
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "[Up To Parent]"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "[На уровень выше]"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/browser.tcl:267 lib/browser.tcl:273
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Browse Branch Files"
|
|
|
|
|
msgstr "Показать файлы ветви"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/browser.tcl:278 lib/choose_repository.tcl:398
|
|
|
|
|
#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
|
|
|
|
|
#: lib/choose_repository.tcl:1028
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Browse"
|
|
|
|
|
msgstr "Показать"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:85
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Fetching %s from %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Получение %s из %s "
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:133
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "fatal: Cannot resolve %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "критическая ошибка: невозможно разрешить %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/sshkey.tcl:53
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Close"
|
|
|
|
|
msgstr "Закрыть"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:175
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Branch '%s' does not exist."
|
|
|
|
|
msgstr "Ветвь '%s' не существует "
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:194
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Failed to configure simplified git-pull for '%s'."
|
|
|
|
|
msgstr "Ошибка создания упрощённой конфигурации git pull для '%s'."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:229
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Branch '%s' already exists.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"It cannot fast-forward to %s.\n"
|
|
|
|
|
"A merge is required."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Ветвь '%s' уже существует.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Она не может быть прокручена(fast-forward) к %s.\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Требуется слияние."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:243
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Merge strategy '%s' not supported."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Неизвестная стратегия слияния: '%s'."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:262
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Failed to update '%s'."
|
|
|
|
|
msgstr "Не удалось обновить '%s'."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:274
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Staging area (index) is already locked."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Рабочая область заблокирована другим процессом."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:289
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Last scanned state does not match repository state.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Another Git program has modified this repository since the last scan. A "
|
|
|
|
|
"rescan must be performed before the current branch can be changed.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"The rescan will be automatically started now.\n"
|
|
|
|
|
msgstr ""
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
"С момента последней проверки репозиторий был изменен другой программой Git. "
|
|
|
|
|
"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Это будет сделано сейчас автоматически.\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:345
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Updating working directory to '%s'..."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Обновление рабочего каталога из '%s'..."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:346
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "files checked out"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "файлы извлечены"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:376
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Aborted checkout of '%s' (file level merging is required)."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Прерван переход на '%s' (требуется слияние содержания файлов)"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:377
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "File level merge required."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Требуется слияние содержания файлов."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:381
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Staying on branch '%s'."
|
|
|
|
|
msgstr "Ветвь '%s' остается текущей."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:452
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"You are no longer on a local branch.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"If you wanted to be on a branch, create one now starting from 'This Detached "
|
|
|
|
|
"Checkout'."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Вы находитесь не в локальной ветви.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, "
|
|
|
|
|
"начиная с 'Текущего отсоединенного состояния'."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Checked out '%s'."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Ветвь '%s' сделана текущей."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:535
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Resetting '%s' to '%s' will lose the following commits:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Сброс '%s' в '%s' приведет к потере следующих сохраненных состояний: "
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:557
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Recovering lost commits may not be easy."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Восстановить потерянные сохраненные состояния будет сложно."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:562
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Reset '%s'?"
|
|
|
|
|
msgstr "Сбросить '%s'?"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Visualize"
|
|
|
|
|
msgstr "Наглядно"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/checkout_op.tcl:635
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Failed to set current branch.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"This working directory is only partially switched. We successfully updated "
|
|
|
|
|
"your files, but failed to update an internal Git file.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"This should not have occurred. %s will now close and give up."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Не удалось установить текущую ветвь.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Ваш рабочий каталог обновлен только частично. Были обновлены все файлы кроме "
|
|
|
|
|
"служебных файлов Git. \n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Этого не должно было произойти. %s завершается."
|
|
|
|
|
|
|
|
|
|
#: lib/choose_font.tcl:39
|
|
|
|
|
msgid "Select"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgstr "Выбрать"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
|
|
|
|
#: lib/choose_font.tcl:53
|
|
|
|
|
msgid "Font Family"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Шрифт"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/choose_font.tcl:74
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Font Size"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Размер шрифта"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/choose_font.tcl:91
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Font Example"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Пример текста"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/choose_font.tcl:103
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"This is example text.\n"
|
|
|
|
|
"If you like this text, it can be your font."
|
|
|
|
|
msgstr ""
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"Это пример текста.\n"
|
|
|
|
|
"Если Вам нравится этот текст, это может быть Ваш шрифт."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/choose_repository.tcl:28
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Git Gui"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Git Gui"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Create New Repository"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Создать новый репозиторий"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/choose_repository.tcl:93
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid "New..."
|
|
|
|
|
msgstr "Новый..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Clone Existing Repository"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Склонировать существующий репозиторий"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/choose_repository.tcl:106
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid "Clone..."
|
|
|
|
|
msgstr "Склонировать..."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Open Existing Repository"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Выбрать существующий репозиторий"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/choose_repository.tcl:119
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid "Open..."
|
|
|
|
|
msgstr "Открыть..."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/choose_repository.tcl:132
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid "Recent Repositories"
|
|
|
|
|
msgstr "Недавние репозитории"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/choose_repository.tcl:138
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid "Open Recent Repository:"
|
|
|
|
|
msgstr "Открыть последний репозиторий"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
|
|
|
|
|
#: lib/choose_repository.tcl:320
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Failed to create repository %s:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не удалось создать репозиторий %s:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:391
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Directory:"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Каталог:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
|
|
|
|
|
#: lib/choose_repository.tcl:1052
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Git Repository"
|
|
|
|
|
msgstr "Репозиторий"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:448
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Directory %s already exists."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Каталог '%s' уже существует."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:452
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "File %s already exists."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Файл '%s' уже существует."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:466
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Clone"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Склонировать"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:479
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Source Location:"
|
|
|
|
|
msgstr "Исходное положение:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:490
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Target Directory:"
|
|
|
|
|
msgstr "Каталог назначения:"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:502
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Clone Type:"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Тип клона:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:508
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Стандартный (Быстрый, полуизбыточный, \"жесткие\" ссылки)"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:514
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Full Copy (Slower, Redundant Backup)"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Полная копия (Медленный, создает резервную копию)"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:520
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Shared (Fastest, Not Recommended, No Backup)"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
|
|
|
|
|
#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
|
|
|
|
|
#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Not a Git repository: %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Каталог не является репозиторием: %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:592
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Standard only available for local repository."
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Стандартный клон возможен только для локального репозитория."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:596
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Shared only available for local repository."
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Общий клон возможен только для локального репозитория."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:617
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Location %s already exists."
|
|
|
|
|
msgstr "Путь '%s' уже существует."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:628
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Failed to configure origin"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не могу сконфигурировать исходный репозиторий."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:640
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Counting objects"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Считаю объекты"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:641
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "buckets"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr ""
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:665
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Unable to copy objects/info/alternates: %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не могу скопировать objects/info/alternates: %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:701
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Nothing to clone from %s."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Нечего клонировать с %s."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
|
|
|
|
|
#: lib/choose_repository.tcl:929
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "The 'master' branch has not been initialized."
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Не инициализирована ветвь 'master'."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:716
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Hardlinks are unavailable. Falling back to copying."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "\"Жесткие ссылки\" недоступны. Будет использовано копирование."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:728
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Cloning from %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Клонирование %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:759
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Copying objects"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Копирование objects"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:760
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "KiB"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "КБ"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:784
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Unable to copy object: %s"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Не могу скопировать объект: %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:794
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Linking objects"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Создание ссылок на objects"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:795
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "objects"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "объекты"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:803
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Unable to hardlink object: %s"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Не могу \"жестко связать\" объект: %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:858
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Cannot fetch branches and objects. See console output for details."
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Не могу получить ветви и объекты. Дополнительная информация на консоли."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:869
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Cannot fetch tags. See console output for details."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не могу получить метки. Дополнительная информация на консоли."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:893
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Cannot determine HEAD. See console output for details."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не могу определить HEAD. Дополнительная информация на консоли."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:902
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Unable to cleanup %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не могу очистить %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:908
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Clone failed."
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Клонирование не удалось."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:915
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "No default branch obtained."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не было получено ветви по умолчанию."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:926
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Cannot resolve %s as a commit."
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Не могу распознать %s как состояние."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:938
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Creating working directory"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Создаю рабочий каталог"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
|
|
|
|
|
#: lib/index.tcl:198
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "files"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "файлов"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:968
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Initial file checkout failed."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не удалось получить начальное состояние файлов репозитория."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:1011
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Open"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Открыть"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:1021
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Repository:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Репозиторий:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/choose_repository.tcl:1072
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Failed to open repository %s:"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не удалось открыть репозиторий %s:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
|
|
|
|
#: lib/choose_rev.tcl:53
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "This Detached Checkout"
|
|
|
|
|
msgstr "Текущее отсоединенное состояние"
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/choose_rev.tcl:60
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Revision Expression:"
|
|
|
|
|
msgstr "Выражение для определения версии:"
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/choose_rev.tcl:74
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Local Branch"
|
|
|
|
|
msgstr "Локальная ветвь:"
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/choose_rev.tcl:79
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Tracking Branch"
|
|
|
|
|
msgstr "Ветвь слежения"
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Tag"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Метка"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/choose_rev.tcl:317
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Invalid revision: %s"
|
|
|
|
|
msgstr "Неверная версия: %s"
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/choose_rev.tcl:338
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "No revision selected."
|
|
|
|
|
msgstr "Версия не указана."
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/choose_rev.tcl:346
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Revision expression is empty."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Пустое выражение для определения версии."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/choose_rev.tcl:531
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Updated"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Обновлено"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/choose_rev.tcl:559
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "URL"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Ссылка"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/commit.tcl:9
|
|
|
|
|
msgid ""
|
|
|
|
|
"There is nothing to amend.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"You are about to create the initial commit. There is no commit before this "
|
|
|
|
|
"to amend.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Отсутствует состояние для исправления.\n"
|
|
|
|
|
"\n"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
"Вы создаете первое состояние в репозитории, здесь еще нечего исправлять.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/commit.tcl:18
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot amend while merging.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"You are currently in the middle of a merge that has not been fully "
|
|
|
|
|
"completed. You cannot amend the prior commit unless you first abort the "
|
|
|
|
|
"current merge activity.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Невозможно исправить состояние во время операции слияния.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2009-08-12 17:24:10 +02:00
|
|
|
|
"Текущее слияние не завершено. Невозможно исправить предыдущее сохраненное "
|
|
|
|
|
"состояние, не прерывая эту операцию.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/commit.tcl:48
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Error loading commit data for amend:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Ошибка при загрузке данных для исправления сохраненного состояния:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/commit.tcl:75
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Unable to obtain your identity:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Невозможно получить информацию об авторстве:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/commit.tcl:80
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Invalid GIT_COMMITTER_IDENT:"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgstr "Неверный GIT_COMMITTER_IDENT:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:129
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "warning: Tcl does not support encoding '%s'."
|
|
|
|
|
msgstr "предупреждение: Tcl не поддерживает кодировку '%s'."
|
|
|
|
|
|
|
|
|
|
#: lib/commit.tcl:149
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Last scanned state does not match repository state.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Another Git program has modified this repository since the last scan. A "
|
|
|
|
|
"rescan must be performed before another commit can be created.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"The rescan will be automatically started now.\n"
|
|
|
|
|
msgstr ""
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"С момента последней проверки репозиторий был изменен другой программой Git. "
|
|
|
|
|
"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Это будет сделано сейчас автоматически.\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:172
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Unmerged files cannot be committed.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"File %s has merge conflicts. You must resolve them and stage the file "
|
|
|
|
|
"before committing.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
2011-01-17 22:08:28 +01:00
|
|
|
|
"Нельзя сохранить файлы с незавершённой операцией слияния.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Для файла %s возник конфликт слияния. Разрешите конфликт и добавьте к "
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"подготовленным файлам перед сохранением.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:180
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Unknown file state %s detected.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"File %s cannot be committed by this program.\n"
|
|
|
|
|
msgstr ""
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Обнаружено неизвестное состояние файла %s.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Файл %s не может быть сохранен данной программой.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:188
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"No changes to commit.\n"
|
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"You must stage at least 1 file before you can commit.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Отсутствуют изменения для сохранения.\n"
|
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Подготовьте хотя бы один файл до создания сохраненного состояния.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:203
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Please supply a commit message.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"A good commit message has the following format:\n"
|
|
|
|
|
"\n"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
"- First line: Describe in one sentence what you did.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"- Second line: Blank\n"
|
|
|
|
|
"- Remaining lines: Describe why this change is good.\n"
|
|
|
|
|
msgstr ""
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Напишите комментарий к сохраненному состоянию.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Рекомендуется следующий формат комментария:\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"- первая строка: краткое описание сделанных изменений.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"- вторая строка пустая\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"- оставшиеся строки: опишите, что дают ваши изменения.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:234
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Calling pre-commit hook..."
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Вызов программы поддержки репозитория pre-commit..."
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:249
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Commit declined by pre-commit hook."
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Сохранение прервано программой поддержки репозитория pre-commit"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:272
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Calling commit-msg hook..."
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Вызов программы поддержки репозитория commit-msg..."
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:287
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Commit declined by commit-msg hook."
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Сохранение прервано программой поддержки репозитория commit-msg"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:300
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Committing changes..."
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Сохранение изменений..."
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:316
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "write-tree failed:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Программа write-tree завершилась с ошибкой:"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Commit failed."
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Сохранить состояние не удалось."
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:334
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Commit %s appears to be corrupt"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Состояние %s выглядит поврежденным"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:339
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"No changes to commit.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"No files were modified by this commit and it was not a merge commit.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"A rescan will be automatically started now.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Отсутствуют изменения для сохранения.\n"
|
|
|
|
|
"\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Ни один файл не был изменен и не было слияния.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Сейчас автоматически запустится перечитывание репозитория.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:346
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "No changes to commit."
|
2011-01-17 22:08:28 +01:00
|
|
|
|
msgstr "Отсутствуют изменения для сохранения."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:360
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "commit-tree failed:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Программа commit-tree завершилась с ошибкой:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:381
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "update-ref failed:"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Программа update-ref завершилась с ошибкой:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/commit.tcl:469
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Created commit %s: %s"
|
|
|
|
|
msgstr "Создано состояние %s: %s "
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/console.tcl:59
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Working... please wait..."
|
|
|
|
|
msgstr "В процессе... пожалуйста, ждите..."
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/console.tcl:186
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Success"
|
|
|
|
|
msgstr "Процесс успешно завершен"
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/console.tcl:200
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Error: Command Failed"
|
|
|
|
|
msgstr "Ошибка: не удалось выполнить команду"
|
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:43
|
|
|
|
|
msgid "Number of loose objects"
|
|
|
|
|
msgstr "Количество несвязанных объектов"
|
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:44
|
|
|
|
|
msgid "Disk space used by loose objects"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Объем дискового пространства, занятый несвязанными объектами"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:45
|
|
|
|
|
msgid "Number of packed objects"
|
|
|
|
|
msgstr "Количество упакованных объектов"
|
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:46
|
|
|
|
|
msgid "Number of packs"
|
|
|
|
|
msgstr "Количество pack-файлов"
|
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:47
|
|
|
|
|
msgid "Disk space used by packed objects"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Объем дискового пространства, занятый упакованными объектами"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:48
|
|
|
|
|
msgid "Packed objects waiting for pruning"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Несвязанные объекты, которые можно удалить"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:49
|
|
|
|
|
msgid "Garbage files"
|
|
|
|
|
msgstr "Мусор"
|
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:72
|
|
|
|
|
msgid "Compressing the object database"
|
|
|
|
|
msgstr "Сжатие базы объектов"
|
|
|
|
|
|
|
|
|
|
#: lib/database.tcl:83
|
|
|
|
|
msgid "Verifying the object database with fsck-objects"
|
|
|
|
|
msgstr "Проверка базы объектов при помощи fsck"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/database.tcl:107
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"This repository currently has approximately %i loose objects.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"To maintain optimal performance it is strongly recommended that you compress "
|
2011-01-17 22:08:55 +01:00
|
|
|
|
"the database.\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Compress the database now?"
|
|
|
|
|
msgstr ""
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"Этот репозиторий сейчас содержит примерно %i свободных объектов\n"
|
|
|
|
|
"\n"
|
2011-01-17 22:08:55 +01:00
|
|
|
|
"Для лучшей производительности рекомендуется сжать базу данных.\n"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Сжать базу данных сейчас?"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
|
|
|
|
#: lib/date.tcl:25
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Invalid date from Git: %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Неправильная дата в репозитории: %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:64
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No differences detected.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s has no changes.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"The modification date of this file was updated by another application, but "
|
|
|
|
|
"the content within the file was not changed.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"A rescan will be automatically started to find other files which may have "
|
|
|
|
|
"the same state."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Изменений не обнаружено.\n"
|
|
|
|
|
"\n"
|
2011-01-17 22:08:28 +01:00
|
|
|
|
"в %s отсутствуют изменения.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Дата изменения файла была обновлена другой программой, но содержимое файла "
|
|
|
|
|
"осталось прежним.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Сейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:104
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Loading diff of %s..."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Загрузка изменений в %s..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:125
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"LOCAL: deleted\n"
|
|
|
|
|
"REMOTE:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"ЛОКАЛЬНО: удалён\n"
|
|
|
|
|
"ВНЕШНИЙ:\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:130
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"REMOTE: deleted\n"
|
|
|
|
|
"LOCAL:\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"ВНЕШНИЙ: удалён\n"
|
|
|
|
|
"ЛОКАЛЬНО:\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:137
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "LOCAL:\n"
|
|
|
|
|
msgstr "ЛОКАЛЬНО:\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:140
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "REMOTE:\n"
|
|
|
|
|
msgstr "ВНЕШНИЙ:\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:202 lib/diff.tcl:319
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Unable to display %s"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Не могу показать %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:203
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Error loading file:"
|
|
|
|
|
msgstr "Ошибка загрузки файла:"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:210
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Git Repository (subproject)"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Репозиторий Git (подпроект)"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:222
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "* Binary file (not showing content)."
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "* Двоичный файл (содержимое не показано)"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:227
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"* Untracked file is %d bytes.\n"
|
|
|
|
|
"* Showing only first %d bytes.\n"
|
|
|
|
|
msgstr ""
|
2011-01-17 22:08:28 +01:00
|
|
|
|
"* Размер неподготовленного файла %d байт.\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"* Показано первых %d байт.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:233
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"* Untracked file clipped here by %s.\n"
|
|
|
|
|
"* To see the entire file, use an external editor.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
2011-01-17 22:08:28 +01:00
|
|
|
|
"* Неподготовленный файл обрезан: %s.\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"* Чтобы увидеть весь файл, используйте программу-редактор.\n"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:482
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Failed to unstage selected hunk."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не удалось исключить выбранную часть."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:489
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Failed to stage selected hunk."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не удалось подготовить к сохранению выбранную часть."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:568
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Failed to unstage selected line."
|
|
|
|
|
msgstr "Не удалось исключить выбранную строку."
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/diff.tcl:576
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Failed to stage selected line."
|
|
|
|
|
msgstr "Не удалось подготовить к сохранению выбранную строку."
|
|
|
|
|
|
|
|
|
|
#: lib/encoding.tcl:443
|
|
|
|
|
msgid "Default"
|
|
|
|
|
msgstr "По умолчанию"
|
|
|
|
|
|
|
|
|
|
#: lib/encoding.tcl:448
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "System (%s)"
|
|
|
|
|
msgstr "Системная (%s)"
|
|
|
|
|
|
|
|
|
|
#: lib/encoding.tcl:459 lib/encoding.tcl:465
|
|
|
|
|
msgid "Other"
|
|
|
|
|
msgstr "Другая"
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/error.tcl:20 lib/error.tcl:114
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "error"
|
|
|
|
|
msgstr "ошибка"
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/error.tcl:36
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "warning"
|
|
|
|
|
msgstr "предупреждение"
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/error.tcl:94
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "You must correct the above errors before committing."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки."
|
|
|
|
|
|
2007-10-31 22:16:17 +01:00
|
|
|
|
#: lib/index.tcl:6
|
|
|
|
|
msgid "Unable to unlock the index."
|
|
|
|
|
msgstr "Не удалось разблокировать индекс"
|
|
|
|
|
|
|
|
|
|
#: lib/index.tcl:15
|
|
|
|
|
msgid "Index Error"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Ошибка в индексе"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:17
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"Updating the Git index failed. A rescan will be automatically started to "
|
|
|
|
|
"resynchronize git-gui."
|
|
|
|
|
msgstr ""
|
2011-01-17 22:08:28 +01:00
|
|
|
|
"Не удалось обновить индекс Git. Состояние репозитория будет перечитано "
|
2008-03-14 07:36:18 +01:00
|
|
|
|
"автоматически."
|
2007-10-31 22:16:17 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:28
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid "Continue"
|
|
|
|
|
msgstr "Продолжить"
|
|
|
|
|
|
|
|
|
|
#: lib/index.tcl:31
|
|
|
|
|
msgid "Unlock Index"
|
|
|
|
|
msgstr "Разблокировать индекс"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:289
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Unstaging %s from commit"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Удаление %s из подготовленного"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:328
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Ready to commit."
|
|
|
|
|
msgstr "Подготовлено для сохранения"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:341
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Adding %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Добавление %s..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:398
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Revert changes in file %s?"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Отменить изменения в файле %s?"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:400
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Revert changes in these %i files?"
|
|
|
|
|
msgstr "Отменить изменения в %i файле(-ах)?"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:408
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Any unstaged changes will be permanently lost by the revert."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Любые изменения, не подготовленные к сохранению, будут потеряны при данной "
|
|
|
|
|
"операции."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:411
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Do Nothing"
|
|
|
|
|
msgstr "Ничего не делать"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:429
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Reverting selected files"
|
2011-01-17 22:08:28 +01:00
|
|
|
|
msgstr "Удаление изменений в выбранных файлах"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/index.tcl:433
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Reverting %s"
|
|
|
|
|
msgstr "Отмена изменений в %s"
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/merge.tcl:13
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot merge while amending.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You must finish amending this commit before starting any type of merge.\n"
|
|
|
|
|
msgstr ""
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Невозможно выполнить слияние во время исправления.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2009-08-12 17:24:10 +02:00
|
|
|
|
"Завершите исправление данного состояния перед выполнением операции слияния.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/merge.tcl:27
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Last scanned state does not match repository state.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Another Git program has modified this repository since the last scan. A "
|
|
|
|
|
"rescan must be performed before a merge can be performed.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"The rescan will be automatically started now.\n"
|
|
|
|
|
msgstr ""
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"С момента последней проверки репозиторий был изменен другой программой Git. "
|
|
|
|
|
"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Это будет сделано сейчас автоматически.\n"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:45
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"You are in the middle of a conflicted merge.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"File %s has merge conflicts.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"You must resolve them, stage the file, and commit to complete the current "
|
|
|
|
|
"merge. Only then can you begin another merge.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Предыдущее слияние не завершено из-за конфликта.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Для файла %s возник конфликт слияния.\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"\n"
|
|
|
|
|
"Разрешите конфликт, подготовьте файл и сохраните. Только после этого можно "
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"начать следующее слияние.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:55
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You are in the middle of a change.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"File %s is modified.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"You should complete the current commit before starting a merge. Doing so "
|
|
|
|
|
"will help you abort a failed merge, should the need arise.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Изменения не сохранены.\n"
|
|
|
|
|
"\n"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
"Файл %s изменен.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2011-01-17 22:08:28 +01:00
|
|
|
|
"Подготовьте и сохраните изменения перед началом слияния. В случае "
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"необходимости это позволит прервать операцию слияния.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:107
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "%s of %s"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "%s из %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:120
|
|
|
|
|
#, tcl-format
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Merging %s and %s..."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Слияние %s и %s..."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:131
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Merge completed successfully."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Слияние успешно завершено."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:133
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Merge failed. Conflict resolution is required."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Не удалось завершить слияние. Требуется разрешение конфликта."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:158
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Merge Into %s"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Слияние с %s"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:177
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Revision To Merge"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Версия, с которой провести слияние"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:212
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot abort while amending.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You must finish amending this commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Невозможно прервать исправление.\n"
|
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Завершите текущее исправление сохраненного состояния.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:222
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Abort merge?\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Continue with aborting the current merge?"
|
|
|
|
|
msgstr ""
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Прервать операцию слияния?\n"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
"\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Прерывание этой операции приведет к потере *ВСЕХ* несохраненных изменений.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Продолжить?"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:228
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid ""
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Reset changes?\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
"Continue with resetting the current changes?"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgstr ""
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Прервать операцию слияния?\n"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
"\n"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Прерывание этой операции приведет к потере *ВСЕХ* несохраненных изменений.\n"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Продолжить?"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:239
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Aborting"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Прерываю"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:239
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "files reset"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "изменения в файлах отменены"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:267
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Abort failed."
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Прервать не удалось."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/merge.tcl:269
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Abort completed. Ready."
|
|
|
|
|
msgstr "Прервано."
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/mergetool.tcl:8
|
|
|
|
|
msgid "Force resolution to the base version?"
|
|
|
|
|
msgstr "Использовать базовую версию для разрешения конфликта?"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:9
|
|
|
|
|
msgid "Force resolution to this branch?"
|
|
|
|
|
msgstr "Использовать версию этой ветви для разрешения конфликта?"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:10
|
|
|
|
|
msgid "Force resolution to the other branch?"
|
|
|
|
|
msgstr "Использовать версию другой ветви для разрешения конфликта?"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:14
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Note that the diff shows only conflicting changes.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s will be overwritten.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This operation can be undone only by restarting the merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Внимание! Список изменений показывает только конфликтующие отличия.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s будет переписан.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Это действие можно отменить только перезапуском операции слияния."
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:45
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "File %s seems to have unresolved conflicts, still stage?"
|
|
|
|
|
msgstr ""
|
2011-01-19 22:01:32 +01:00
|
|
|
|
"Файл %s, похоже, содержит необработанные конфликты. Продолжить подготовку к "
|
2009-08-12 17:24:10 +02:00
|
|
|
|
"сохранению?"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:60
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Adding resolution for %s"
|
|
|
|
|
msgstr "Добавляю результат разрешения для %s"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:141
|
|
|
|
|
msgid "Cannot resolve deletion or link conflicts using a tool"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Программа слияния не обрабатывает конфликты с удалением или участием ссылок"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:146
|
|
|
|
|
msgid "Conflict file does not exist"
|
|
|
|
|
msgstr "Конфликтующий файл не существует"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:264
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Not a GUI merge tool: '%s'"
|
|
|
|
|
msgstr "'%s' не является программой слияния"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:268
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Unsupported merge tool '%s'"
|
|
|
|
|
msgstr "Неизвестная программа слияния '%s'"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:303
|
|
|
|
|
msgid "Merge tool is already running, terminate it?"
|
|
|
|
|
msgstr "Программа слияния уже работает. Прервать?"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:323
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Error retrieving versions:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Ошибка получения версий:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:343
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not start the merge tool:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Ошибка запуска программы слияния:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:347
|
|
|
|
|
msgid "Running merge tool..."
|
|
|
|
|
msgstr "Запуск программы слияния..."
|
|
|
|
|
|
|
|
|
|
#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
|
|
|
|
|
msgid "Merge tool failed."
|
|
|
|
|
msgstr "Ошибка выполнения программы слияния."
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:11
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Invalid global encoding '%s'"
|
|
|
|
|
msgstr "Ошибка в глобальной установке кодировки '%s'"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:19
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Invalid repo encoding '%s'"
|
|
|
|
|
msgstr "Неверная кодировка репозитория: '%s'"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:117
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Restore Defaults"
|
|
|
|
|
msgstr "Восстановить настройки по умолчанию"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:121
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Save"
|
|
|
|
|
msgstr "Сохранить"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:131
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "%s Repository"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Для репозитория %s"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:132
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Global (All Repositories)"
|
|
|
|
|
msgstr "Общие (для всех репозиториев)"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:138
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "User Name"
|
|
|
|
|
msgstr "Имя пользователя"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:139
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Email Address"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Адрес электронной почты"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:141
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Summarize Merge Commits"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Суммарный комментарий при слиянии"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:142
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Merge Verbosity"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Уровень детальности сообщений при слиянии"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:143
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Show Diffstat After Merge"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Показать отчет об изменениях после слияния"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:144
|
|
|
|
|
msgid "Use Merge Tool"
|
|
|
|
|
msgstr "Использовать для слияния программу"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:146
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Trust File Modification Timestamps"
|
|
|
|
|
msgstr "Доверять времени модификации файла"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:147
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Prune Tracking Branches During Fetch"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Чистка ветвей слежения при получении изменений"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:148
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Match Tracking Branches"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Имя новой ветви взять из имен ветвей слежения"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:149
|
|
|
|
|
msgid "Blame Copy Only On Changed Files"
|
|
|
|
|
msgstr "Поиск копий только в изменённых файлах"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:150
|
|
|
|
|
msgid "Minimum Letters To Blame Copy On"
|
|
|
|
|
msgstr "Минимальное количество символов для поиска копий"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:151
|
|
|
|
|
msgid "Blame History Context Radius (days)"
|
|
|
|
|
msgstr "Радиус исторического контекста (в днях)"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:152
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Number of Diff Context Lines"
|
|
|
|
|
msgstr "Число строк в контексте diff"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:153
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Commit Message Text Width"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Ширина текста комментария"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:154
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "New Branch Name Template"
|
|
|
|
|
msgstr "Шаблон для имени новой ветви"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:155
|
|
|
|
|
msgid "Default File Contents Encoding"
|
|
|
|
|
msgstr "Кодировка содержания файла по умолчанию"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:203
|
|
|
|
|
msgid "Change"
|
|
|
|
|
msgstr "Изменить"
|
|
|
|
|
|
|
|
|
|
#: lib/option.tcl:230
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Spelling Dictionary:"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Словарь для проверки правописания:"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:254
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Change Font"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Изменить"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:258
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Choose %s"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Выберите %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2007-10-20 21:35:53 +02:00
|
|
|
|
# carbon copy
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:264
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "pt."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "pt."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:278
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Preferences"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Настройки"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/option.tcl:314
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Failed to completely save options:"
|
|
|
|
|
msgstr "Не удалось полностью сохранить настройки:"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/remote.tcl:163
|
|
|
|
|
msgid "Remove Remote"
|
|
|
|
|
msgstr "Удалить ссылку на внешний репозиторий"
|
|
|
|
|
|
|
|
|
|
#: lib/remote.tcl:168
|
|
|
|
|
msgid "Prune from"
|
|
|
|
|
msgstr "Чистка"
|
|
|
|
|
|
|
|
|
|
#: lib/remote.tcl:173
|
|
|
|
|
msgid "Fetch from"
|
|
|
|
|
msgstr "Получение из"
|
|
|
|
|
|
|
|
|
|
#: lib/remote.tcl:215
|
|
|
|
|
msgid "Push to"
|
|
|
|
|
msgstr "Отправить"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:19
|
|
|
|
|
msgid "Add Remote"
|
|
|
|
|
msgstr "Зарегистрировать внешний репозиторий"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:24
|
|
|
|
|
msgid "Add New Remote"
|
|
|
|
|
msgstr "Добавить внешний репозиторий"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
|
|
|
|
|
msgid "Add"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:37
|
|
|
|
|
msgid "Remote Details"
|
|
|
|
|
msgstr "Информация о внешнем репозитории"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:50
|
|
|
|
|
msgid "Location:"
|
|
|
|
|
msgstr "Положение:"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:62
|
|
|
|
|
msgid "Further Action"
|
|
|
|
|
msgstr "Следующая операция"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:65
|
|
|
|
|
msgid "Fetch Immediately"
|
|
|
|
|
msgstr "Скачать сразу"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:71
|
|
|
|
|
msgid "Initialize Remote Repository and Push"
|
|
|
|
|
msgstr "Инициализировать внешний репозиторий и отправить"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:77
|
|
|
|
|
msgid "Do Nothing Else Now"
|
|
|
|
|
msgstr "Больше ничего не делать"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:101
|
|
|
|
|
msgid "Please supply a remote name."
|
|
|
|
|
msgstr "Укажите название внешнего репозитория."
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:114
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "'%s' is not an acceptable remote name."
|
|
|
|
|
msgstr "Недопустимое название внешнего репозитория '%s'."
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:125
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Failed to add remote '%s' of location '%s'."
|
|
|
|
|
msgstr "Не удалось добавить '%s' из '%s'. "
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:133 lib/transport.tcl:6
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "fetch %s"
|
|
|
|
|
msgstr "получение %s"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:134
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Fetching the %s"
|
|
|
|
|
msgstr "Получение %s"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:157
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Do not know how to initialize repository at location '%s'."
|
2011-01-17 22:08:28 +01:00
|
|
|
|
msgstr "Невозможно инициализировать репозиторий в '%s'."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
|
|
|
|
|
#: lib/transport.tcl:81
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "push %s"
|
|
|
|
|
msgstr "отправить %s"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_add.tcl:164
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Setting up the %s (at %s)"
|
|
|
|
|
msgstr "Настройка %s (в %s)"
|
|
|
|
|
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Delete Branch Remotely"
|
|
|
|
|
msgstr "Удаление ветви во внешнем репозитории"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:47
|
|
|
|
|
msgid "From Repository"
|
|
|
|
|
msgstr "Из репозитория"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Remote:"
|
|
|
|
|
msgstr "внешний:"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
|
|
|
|
|
msgid "Arbitrary Location:"
|
2011-01-17 22:08:28 +01:00
|
|
|
|
msgstr "Указанное положение:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:84
|
|
|
|
|
msgid "Branches"
|
|
|
|
|
msgstr "Ветви"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:109
|
|
|
|
|
msgid "Delete Only If"
|
|
|
|
|
msgstr "Удалить только в случае, если"
|
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:111
|
|
|
|
|
msgid "Merged Into:"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Слияние с:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:152
|
|
|
|
|
msgid "A branch is required for 'Merged Into'."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Для опции 'Слияние с' требуется указать ветвь."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:184
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"The following branches are not completely merged into %s:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" - %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr ""
|
2009-04-29 07:56:06 +02:00
|
|
|
|
"Следующие ветви могут быть объединены с %s при помощи операции слияния:\n"
|
|
|
|
|
"\n"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
" - %s"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:189
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"One or more of the merge tests failed because you have not fetched the "
|
|
|
|
|
"necessary commits. Try fetching from %s first."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr ""
|
2009-08-12 17:24:10 +02:00
|
|
|
|
"Некоторые тесты на слияние не прошли, потому что Вы не получили необходимые "
|
|
|
|
|
"состояния. Попытайтесь получить их из %s."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:207
|
|
|
|
|
msgid "Please select one or more branches to delete."
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgstr "Укажите одну или несколько ветвей для удаления."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
|
|
|
|
#: lib/remote_branch_delete.tcl:226
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Deleting branches from %s"
|
|
|
|
|
msgstr "Удаление ветвей из %s"
|
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/remote_branch_delete.tcl:292
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "No repository selected."
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Не указан репозиторий."
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/remote_branch_delete.tcl:297
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Scanning %s..."
|
|
|
|
|
msgstr "Перечитывание %s... "
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/search.tcl:21
|
|
|
|
|
msgid "Find:"
|
|
|
|
|
msgstr "Поиск:"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/search.tcl:23
|
|
|
|
|
msgid "Next"
|
|
|
|
|
msgstr "Дальше"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/search.tcl:24
|
|
|
|
|
msgid "Prev"
|
|
|
|
|
msgstr "Обратно"
|
|
|
|
|
|
|
|
|
|
#: lib/search.tcl:25
|
|
|
|
|
msgid "Case-Sensitive"
|
|
|
|
|
msgstr "Игн. большие/маленькие"
|
2007-10-31 22:16:17 +01:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
|
2007-10-31 22:16:17 +01:00
|
|
|
|
msgid "Cannot write shortcut:"
|
|
|
|
|
msgstr "Невозможно записать ссылку:"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2011-01-17 22:08:55 +01:00
|
|
|
|
#: lib/shortcut.tcl:137
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Cannot write icon:"
|
|
|
|
|
msgstr "Невозможно записать значок:"
|
|
|
|
|
|
2008-03-14 07:36:18 +01:00
|
|
|
|
#: lib/spellcheck.tcl:57
|
|
|
|
|
msgid "Unsupported spell checker"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Неподдерживаемая программа проверки правописания"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
|
|
|
|
#: lib/spellcheck.tcl:65
|
|
|
|
|
msgid "Spell checking is unavailable"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Проверка правописания не доступна"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
|
|
|
|
#: lib/spellcheck.tcl:68
|
|
|
|
|
msgid "Invalid spell checking configuration"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Неправильная конфигурация программы проверки правописания"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
|
|
|
|
#: lib/spellcheck.tcl:70
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Reverting dictionary to %s."
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Словарь вернут к %s."
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
|
|
|
|
#: lib/spellcheck.tcl:73
|
|
|
|
|
msgid "Spell checker silently failed on startup"
|
2011-01-17 22:08:24 +01:00
|
|
|
|
msgstr "Программа проверки правописания не смогла запуститься"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
|
|
|
|
#: lib/spellcheck.tcl:80
|
|
|
|
|
msgid "Unrecognized spell checker"
|
2011-01-17 22:08:24 +01:00
|
|
|
|
msgstr "Нераспознанная программа проверки правописания"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/spellcheck.tcl:186
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "No Suggestions"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Исправлений не найдено"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/spellcheck.tcl:388
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Unexpected EOF from spell checker"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Программа проверки правописания прервала передачу данных"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/spellcheck.tcl:392
|
2008-03-14 07:36:18 +01:00
|
|
|
|
msgid "Spell Checker Failed"
|
2008-03-14 23:25:57 +01:00
|
|
|
|
msgstr "Ошибка проверки правописания"
|
2008-03-14 07:36:18 +01:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/sshkey.tcl:31
|
|
|
|
|
msgid "No keys found."
|
|
|
|
|
msgstr "Ключ не найден"
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:34
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Found a public key in: %s"
|
|
|
|
|
msgstr "Публичный ключ из %s"
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:40
|
|
|
|
|
msgid "Generate Key"
|
|
|
|
|
msgstr "Создать ключ"
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:56
|
|
|
|
|
msgid "Copy To Clipboard"
|
|
|
|
|
msgstr "Скопировать в буфер обмена"
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:70
|
|
|
|
|
msgid "Your OpenSSH Public Key"
|
|
|
|
|
msgstr "Ваш публичный ключ OpenSSH"
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:78
|
|
|
|
|
msgid "Generating..."
|
|
|
|
|
msgstr "Создание..."
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:84
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not start ssh-keygen:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Ошибка запуска ssh-keygen:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:111
|
|
|
|
|
msgid "Generation failed."
|
|
|
|
|
msgstr "Ключ не создан."
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:118
|
|
|
|
|
msgid "Generation succeded, but no keys found."
|
|
|
|
|
msgstr "Создание ключа завершилось, но результат не был найден"
|
|
|
|
|
|
|
|
|
|
#: lib/sshkey.tcl:121
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Your key is in: %s"
|
|
|
|
|
msgstr "Ваш ключ находится в: %s"
|
|
|
|
|
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/status_bar.tcl:83
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
2007-09-26 21:31:42 +02:00
|
|
|
|
msgid "%s ... %*i of %*i %s (%3i%%)"
|
|
|
|
|
msgstr "%s ... %*i из %*i %s (%3i%%)"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/tools.tcl:75
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgid "Running %s requires a selected file."
|
|
|
|
|
msgstr "Запуск %s требует выбранного файла."
|
|
|
|
|
|
|
|
|
|
#: lib/tools.tcl:90
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Are you sure you want to run %s?"
|
|
|
|
|
msgstr "Действительно запустить %s?"
|
|
|
|
|
|
|
|
|
|
#: lib/tools.tcl:110
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Tool: %s"
|
|
|
|
|
msgstr "Вспомогательная операция: %s"
|
|
|
|
|
|
|
|
|
|
#: lib/tools.tcl:111
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Running: %s"
|
|
|
|
|
msgstr "Выполнение: %s"
|
|
|
|
|
|
|
|
|
|
#: lib/tools.tcl:149
|
|
|
|
|
#, tcl-format
|
2009-08-12 17:24:10 +02:00
|
|
|
|
msgid "Tool completed successfully: %s"
|
|
|
|
|
msgstr "Программа %s завершилась успешно."
|
2009-04-29 07:56:06 +02:00
|
|
|
|
|
|
|
|
|
#: lib/tools.tcl:151
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Tool failed: %s"
|
|
|
|
|
msgstr "Ошибка выполнения программы: %s"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:22
|
|
|
|
|
msgid "Add Tool"
|
|
|
|
|
msgstr "Добавить вспомогательную операцию"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:28
|
|
|
|
|
msgid "Add New Tool Command"
|
|
|
|
|
msgstr "Новая вспомогательная операция"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:33
|
|
|
|
|
msgid "Add globally"
|
|
|
|
|
msgstr "Добавить для всех репозиториев"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:45
|
|
|
|
|
msgid "Tool Details"
|
|
|
|
|
msgstr "Описание вспомогательной операции"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:48
|
|
|
|
|
msgid "Use '/' separators to create a submenu tree:"
|
2011-01-17 22:08:28 +01:00
|
|
|
|
msgstr "Используйте '/' для создания подменю"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:61
|
|
|
|
|
msgid "Command:"
|
|
|
|
|
msgstr "Команда:"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:74
|
|
|
|
|
msgid "Show a dialog before running"
|
|
|
|
|
msgstr "Показать диалог перед запуском"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:80
|
|
|
|
|
msgid "Ask the user to select a revision (sets $REVISION)"
|
|
|
|
|
msgstr "Запрос на выбор версии (устанавливает $REVISION)"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:85
|
|
|
|
|
msgid "Ask the user for additional arguments (sets $ARGS)"
|
|
|
|
|
msgstr "Запрос дополнительных аргументов (устанавливает $ARGS)"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:92
|
|
|
|
|
msgid "Don't show the command output window"
|
|
|
|
|
msgstr "Не показывать окно вывода команды"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:97
|
|
|
|
|
msgid "Run only if a diff is selected ($FILENAME not empty)"
|
|
|
|
|
msgstr "Запуск только если показан список изменений ($FILENAME не пусто)"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:121
|
|
|
|
|
msgid "Please supply a name for the tool."
|
|
|
|
|
msgstr "Укажите название вспомогательной операции."
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:129
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Tool '%s' already exists."
|
|
|
|
|
msgstr "Вспомогательная операция '%s' уже существует."
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:151
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not add tool:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Ошибка добавления программы:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:190
|
|
|
|
|
msgid "Remove Tool"
|
|
|
|
|
msgstr "Удалить программу"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:196
|
|
|
|
|
msgid "Remove Tool Commands"
|
|
|
|
|
msgstr "Удалить команды программы"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:200
|
|
|
|
|
msgid "Remove"
|
|
|
|
|
msgstr "Удалить"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:236
|
|
|
|
|
msgid "(Blue denotes repository-local tools)"
|
|
|
|
|
msgstr "(Синим выделены программы локальные репозиторию)"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:297
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Run Command: %s"
|
|
|
|
|
msgstr "Запуск команды: %s"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:311
|
|
|
|
|
msgid "Arguments"
|
|
|
|
|
msgstr "Аргументы"
|
|
|
|
|
|
|
|
|
|
#: lib/tools_dlg.tcl:348
|
|
|
|
|
msgid "OK"
|
|
|
|
|
msgstr "OK"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#: lib/transport.tcl:7
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Fetching new changes from %s"
|
|
|
|
|
msgstr "Получение изменений из %s "
|
|
|
|
|
|
2007-10-20 21:35:53 +02:00
|
|
|
|
# carbon copy
|
2007-10-10 10:11:43 +02:00
|
|
|
|
#: lib/transport.tcl:18
|
2007-10-22 22:28:48 +02:00
|
|
|
|
#, tcl-format
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "remote prune %s"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "чистка внешнего %s"
|
2007-10-10 10:11:43 +02:00
|
|
|
|
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#: lib/transport.tcl:19
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Pruning tracking branches deleted from %s"
|
|
|
|
|
msgstr "Чистка ветвей слежения, удаленных из %s"
|
|
|
|
|
|
|
|
|
|
#: lib/transport.tcl:26
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Pushing changes to %s"
|
|
|
|
|
msgstr "Отправка изменений в %s "
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:64
|
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Mirroring to %s"
|
|
|
|
|
msgstr "Точное копирование в %s"
|
|
|
|
|
|
|
|
|
|
#: lib/transport.tcl:82
|
2007-07-22 13:57:12 +02:00
|
|
|
|
#, tcl-format
|
|
|
|
|
msgid "Pushing %s %s to %s"
|
|
|
|
|
msgstr "Отправка %s %s в %s"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:100
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Push Branches"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Отправить изменения в ветвях"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:114
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Source Branches"
|
|
|
|
|
msgstr "Исходные ветви"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:131
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Destination Repository"
|
|
|
|
|
msgstr "Репозиторий назначения"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:169
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Transfer Options"
|
2007-10-22 22:28:48 +02:00
|
|
|
|
msgstr "Настройки отправки"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:171
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Force overwrite existing branch (may discard changes)"
|
2007-10-20 21:35:53 +02:00
|
|
|
|
msgstr "Намеренно переписать существующую ветвь (возможна потеря изменений)"
|
2007-07-22 13:57:12 +02:00
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:175
|
2007-10-10 10:11:43 +02:00
|
|
|
|
msgid "Use thin pack (for slow network connections)"
|
|
|
|
|
msgstr "Использовать thin pack (для медленных сетевых подключений)"
|
|
|
|
|
|
2009-04-29 07:56:06 +02:00
|
|
|
|
#: lib/transport.tcl:179
|
2007-07-22 13:57:12 +02:00
|
|
|
|
msgid "Include tags"
|
2009-04-29 07:56:06 +02:00
|
|
|
|
msgstr "Передать метки"
|