Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1 | # SOME DESCRIPTIVE TITLE. |
| 2 | # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
| 3 | # This file is distributed under the same license as the PACKAGE package. |
| 4 | # |
| 5 | # Translators: |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6 | # Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2016 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7 | # insolor <insolor@gmail.com>, 2014 |
| 8 | # insolor <insolor@gmail.com>, 2014 |
| 9 | msgid "" |
| 10 | msgstr "" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11 | "Project-Id-Version: Git Russian Localization Project\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 12 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" |
Dimitriy Ryazantcev | da0e97d | 2016-03-15 20:55:36 +0200 | [diff] [blame] | 13 | "POT-Creation-Date: 2016-03-16 00:16+0800\n" |
| 14 | "PO-Revision-Date: 2016-03-15 18:54+0000\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 15 | "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 16 | "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 17 | "MIME-Version: 1.0\n" |
| 18 | "Content-Type: text/plain; charset=UTF-8\n" |
| 19 | "Content-Transfer-Encoding: 8bit\n" |
| 20 | "Language: ru\n" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 21 | "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 22 | |
| 23 | #: advice.c:55 |
| 24 | #, c-format |
| 25 | msgid "hint: %.*s\n" |
| 26 | msgstr "подсказка: %.*s\n" |
| 27 | |
| 28 | #: advice.c:88 |
| 29 | msgid "" |
| 30 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
| 31 | "as appropriate to mark resolution and make a commit." |
| 32 | msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит." |
| 33 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 34 | #: advice.c:101 builtin/merge.c:1226 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 35 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
| 36 | msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." |
| 37 | |
| 38 | #: advice.c:103 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 39 | msgid "Please, commit your changes before merging." |
| 40 | msgstr "Перед слиянием, выполните коммит ваших изменений." |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 41 | |
| 42 | #: advice.c:104 |
| 43 | msgid "Exiting because of unfinished merge." |
| 44 | msgstr "Выход из-за незавершенного слияния." |
| 45 | |
| 46 | #: archive.c:12 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 47 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
| 48 | msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 49 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 50 | #: archive.c:13 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 51 | msgid "git archive --list" |
| 52 | msgstr "git archive --list" |
| 53 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 54 | #: archive.c:14 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 55 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 56 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> " |
| 57 | "[<path>...]" |
| 58 | msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 59 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 60 | #: archive.c:15 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 61 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
| 62 | msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" |
| 63 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 64 | #: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 65 | #, c-format |
| 66 | msgid "pathspec '%s' did not match any files" |
| 67 | msgstr "спецификация пути «%s» не соответствует ни одному файлу" |
| 68 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 69 | #: archive.c:429 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 70 | msgid "fmt" |
| 71 | msgstr "формат" |
| 72 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 73 | #: archive.c:429 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 74 | msgid "archive format" |
| 75 | msgstr "формат архива" |
| 76 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 77 | #: archive.c:430 builtin/log.c:1232 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 78 | msgid "prefix" |
| 79 | msgstr "префикс" |
| 80 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 81 | #: archive.c:431 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 82 | msgid "prepend prefix to each pathname in the archive" |
| 83 | msgstr "добавлять префикс перед каждым путем файла в архиве" |
| 84 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 85 | #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 |
| 86 | #: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 |
| 87 | #: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 |
| 88 | #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 |
| 89 | #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 90 | msgid "file" |
| 91 | msgstr "файл" |
| 92 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 93 | #: archive.c:433 builtin/archive.c:89 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 94 | msgid "write the archive to this file" |
| 95 | msgstr "запись архива в этот файл" |
| 96 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 97 | #: archive.c:435 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 98 | msgid "read .gitattributes in working directory" |
| 99 | msgstr "читать .gitattributes в рабочем каталоге" |
| 100 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 101 | #: archive.c:436 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 102 | msgid "report archived files on stderr" |
| 103 | msgstr "отчет об архивированных файлах в stderr" |
| 104 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 105 | #: archive.c:437 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 106 | msgid "store only" |
| 107 | msgstr "только хранение" |
| 108 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 109 | #: archive.c:438 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 110 | msgid "compress faster" |
| 111 | msgstr "сжимать быстрее" |
| 112 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 113 | #: archive.c:446 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 114 | msgid "compress better" |
| 115 | msgstr "сжимать лучше" |
| 116 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 117 | #: archive.c:449 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 118 | msgid "list supported archive formats" |
| 119 | msgstr "перечислить поддерживаемые форматы архивов" |
| 120 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 121 | #: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 122 | msgid "repo" |
| 123 | msgstr "репозиторий" |
| 124 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 125 | #: archive.c:452 builtin/archive.c:91 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 126 | msgid "retrieve the archive from remote repository <repo>" |
| 127 | msgstr "получить архив из внешнего <репозитория>" |
| 128 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 129 | #: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 130 | msgid "command" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 131 | msgstr "команда" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 132 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 133 | #: archive.c:454 builtin/archive.c:93 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 134 | msgid "path to the remote git-upload-archive command" |
| 135 | msgstr "путь к команде git-upload-archive на машине с внешним репозиторием" |
| 136 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 137 | #: attr.c:263 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 138 | msgid "" |
| 139 | "Negative patterns are ignored in git attributes\n" |
| 140 | "Use '\\!' for literal leading exclamation." |
| 141 | msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»." |
| 142 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 143 | #: branch.c:53 |
| 144 | #, c-format |
| 145 | msgid "" |
| 146 | "\n" |
| 147 | "After fixing the error cause you may try to fix up\n" |
| 148 | "the remote tracking information by invoking\n" |
| 149 | "\"git branch --set-upstream-to=%s%s%s\"." |
| 150 | msgstr "\nПосле исправления причины ошибки,\nвы можете исправить информацию об отслеживаемой\nвнешней ветке, с помощью команды\n«git branch --set-upstream-to=%s%s%s»." |
| 151 | |
| 152 | #: branch.c:67 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 153 | #, c-format |
| 154 | msgid "Not setting branch %s as its own upstream." |
| 155 | msgstr "Не устанавливаю ветку %s, так так она принадлежит вышестоящему репозиторию." |
| 156 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 157 | #: branch.c:93 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 158 | #, c-format |
| 159 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." |
| 160 | msgstr "Ветка %s отслеживает внешнюю ветку %s из %s перемещением." |
| 161 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 162 | #: branch.c:94 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 163 | #, c-format |
| 164 | msgid "Branch %s set up to track remote branch %s from %s." |
| 165 | msgstr "Ветка %s отслеживает внешнюю ветку %s из %s." |
| 166 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 167 | #: branch.c:98 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 168 | #, c-format |
| 169 | msgid "Branch %s set up to track local branch %s by rebasing." |
| 170 | msgstr "Ветка %s отслеживает локальную ветку %s перемещением." |
| 171 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 172 | #: branch.c:99 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 173 | #, c-format |
| 174 | msgid "Branch %s set up to track local branch %s." |
| 175 | msgstr "Ветка %s отслеживает локальную ветку %s." |
| 176 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 177 | #: branch.c:104 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 178 | #, c-format |
| 179 | msgid "Branch %s set up to track remote ref %s by rebasing." |
| 180 | msgstr "Ветка %s отслеживает внешнюю ссылку %s перемещением." |
| 181 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 182 | #: branch.c:105 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 183 | #, c-format |
| 184 | msgid "Branch %s set up to track remote ref %s." |
| 185 | msgstr "Ветка %s отслеживает внешнюю ссылку %s." |
| 186 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 187 | #: branch.c:109 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 188 | #, c-format |
| 189 | msgid "Branch %s set up to track local ref %s by rebasing." |
| 190 | msgstr "Ветка %s отслеживает локальную ссылку %s перемещением." |
| 191 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 192 | #: branch.c:110 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 193 | #, c-format |
| 194 | msgid "Branch %s set up to track local ref %s." |
| 195 | msgstr "Ветка %s отслеживает локальную ссылку %s." |
| 196 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 197 | #: branch.c:119 |
| 198 | msgid "Unable to write upstream branch configuration" |
| 199 | msgstr "Не удалось записать настройки вышестоящей ветки" |
| 200 | |
| 201 | #: branch.c:156 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 202 | #, c-format |
| 203 | msgid "Not tracking: ambiguous information for ref %s" |
| 204 | msgstr "Не отслеживается: неоднозначная информация для ссылки %s" |
| 205 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 206 | #: branch.c:185 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 207 | #, c-format |
| 208 | msgid "'%s' is not a valid branch name." |
| 209 | msgstr "«%s» не является действительным именем ветки." |
| 210 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 211 | #: branch.c:190 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 212 | #, c-format |
| 213 | msgid "A branch named '%s' already exists." |
| 214 | msgstr "Ветка с именем «%s» уже существует." |
| 215 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 216 | #: branch.c:198 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 217 | msgid "Cannot force update the current branch." |
| 218 | msgstr "Не удалось принудительно обновить текущую ветку." |
| 219 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 220 | #: branch.c:218 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 221 | #, c-format |
| 222 | msgid "" |
| 223 | "Cannot setup tracking information; starting point '%s' is not a branch." |
| 224 | msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой." |
| 225 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 226 | #: branch.c:220 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 227 | #, c-format |
| 228 | msgid "the requested upstream branch '%s' does not exist" |
| 229 | msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует" |
| 230 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 231 | #: branch.c:222 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 232 | msgid "" |
| 233 | "\n" |
| 234 | "If you are planning on basing your work on an upstream\n" |
| 235 | "branch that already exists at the remote, you may need to\n" |
| 236 | "run \"git fetch\" to retrieve it.\n" |
| 237 | "\n" |
| 238 | "If you are planning to push out a new local branch that\n" |
| 239 | "will track its remote counterpart, you may want to use\n" |
| 240 | "\"git push -u\" to set the upstream config as you push." |
| 241 | msgstr "\nЕсли вы планируете основывать свою работу на вышестоящей ветке, которая уже существует во внешнем репозитории, вам может потребоваться запустить «git fetch» для ее получения.\n\nЕсли вы планируете отправить новую локальную ветку, которая будет отслеживаться, во внешний репозиторий, вам может потребоваться запустить «git push -u» — чтобы сохранить настройку вышестоящего репозитория для отправки." |
| 242 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 243 | #: branch.c:266 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 244 | #, c-format |
| 245 | msgid "Not a valid object name: '%s'." |
| 246 | msgstr "Недопустимое имя объекта: «%s»." |
| 247 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 248 | #: branch.c:286 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 249 | #, c-format |
| 250 | msgid "Ambiguous object name: '%s'." |
| 251 | msgstr "Неоднозначное имя объекта: «%s»." |
| 252 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 253 | #: branch.c:291 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 254 | #, c-format |
| 255 | msgid "Not a valid branch point: '%s'." |
| 256 | msgstr "Недопустимая точка ветки: «%s»." |
| 257 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 258 | #: branch.c:344 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 259 | #, c-format |
| 260 | msgid "'%s' is already checked out at '%s'" |
| 261 | msgstr "«%s» уже находится на «%s»" |
| 262 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 263 | #: bundle.c:34 |
| 264 | #, c-format |
| 265 | msgid "'%s' does not look like a v2 bundle file" |
| 266 | msgstr "«%s» не похож на файл пакета версии 2" |
| 267 | |
| 268 | #: bundle.c:61 |
| 269 | #, c-format |
| 270 | msgid "unrecognized header: %s%s (%d)" |
| 271 | msgstr "неопознанный заголовок: %s%s (%d)" |
| 272 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 273 | #: bundle.c:87 builtin/commit.c:766 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 274 | #, c-format |
| 275 | msgid "could not open '%s'" |
| 276 | msgstr "не удалось открыть «%s»" |
| 277 | |
| 278 | #: bundle.c:139 |
| 279 | msgid "Repository lacks these prerequisite commits:" |
| 280 | msgstr "В репозитории отсутствуют необходимые коммиты:" |
| 281 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 282 | #: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 |
| 283 | #: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 |
| 284 | #: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 |
| 285 | #: builtin/shortlog.c:170 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 286 | msgid "revision walk setup failed" |
| 287 | msgstr "сбой инициализации прохода по редакциям" |
| 288 | |
| 289 | #: bundle.c:185 |
| 290 | #, c-format |
| 291 | msgid "The bundle contains this ref:" |
| 292 | msgid_plural "The bundle contains these %d refs:" |
| 293 | msgstr[0] "Пакет содержит эту %d ссылку:" |
| 294 | msgstr[1] "Пакет содержит эти %d ссылки:" |
| 295 | msgstr[2] "Пакет содержит эти %d ссылок:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 296 | msgstr[3] "Пакет содержит эти %d ссылок:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 297 | |
| 298 | #: bundle.c:192 |
| 299 | msgid "The bundle records a complete history." |
| 300 | msgstr "Пакет содержит полную историю." |
| 301 | |
| 302 | #: bundle.c:194 |
| 303 | #, c-format |
| 304 | msgid "The bundle requires this ref:" |
| 305 | msgid_plural "The bundle requires these %d refs:" |
| 306 | msgstr[0] "Пакет требует эту %d ссылку:" |
| 307 | msgstr[1] "Пакет требует эти %d ссылки:" |
| 308 | msgstr[2] "Пакет требует эти %d ссылок:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 309 | msgstr[3] "Пакет требует эти %d ссылок:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 310 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 311 | #: bundle.c:253 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 312 | msgid "Could not spawn pack-objects" |
| 313 | msgstr "Не удалось создать объекты пакета" |
| 314 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 315 | #: bundle.c:264 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 316 | msgid "pack-objects died" |
| 317 | msgstr "критическая ошибка pack-objects" |
| 318 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 319 | #: bundle.c:304 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 320 | msgid "rev-list died" |
| 321 | msgstr "критическая ошибка rev-list" |
| 322 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 323 | #: bundle.c:353 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 324 | #, c-format |
| 325 | msgid "ref '%s' is excluded by the rev-list options" |
| 326 | msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" |
| 327 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 328 | #: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 329 | #, c-format |
| 330 | msgid "unrecognized argument: %s" |
| 331 | msgstr "неопознанный аргумент: %s" |
| 332 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 333 | #: bundle.c:449 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 334 | msgid "Refusing to create empty bundle." |
| 335 | msgstr "Отклонение создания пустого пакета." |
| 336 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 337 | #: bundle.c:459 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 338 | #, c-format |
| 339 | msgid "cannot create '%s'" |
| 340 | msgstr "не удалось создать «%s»" |
| 341 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 342 | #: bundle.c:480 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 343 | msgid "index-pack died" |
| 344 | msgstr "критическая ошибка index-pack" |
| 345 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 346 | #: color.c:275 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 347 | #, c-format |
| 348 | msgid "invalid color value: %.*s" |
| 349 | msgstr "недопустимое значение цвета: %.*s" |
| 350 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 351 | #: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 |
| 352 | #: builtin/am.c:2135 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 353 | #, c-format |
| 354 | msgid "could not parse %s" |
| 355 | msgstr "не удалось разобрать %s" |
| 356 | |
| 357 | #: commit.c:42 |
| 358 | #, c-format |
| 359 | msgid "%s %s is not a commit!" |
| 360 | msgstr "%s %s не является коммитом!" |
| 361 | |
| 362 | #: compat/obstack.c:406 compat/obstack.c:408 |
| 363 | msgid "memory exhausted" |
| 364 | msgstr "память исчерпана" |
| 365 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 366 | #: config.c:475 config.c:477 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 367 | #, c-format |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 368 | msgid "bad config line %d in %s %s" |
| 369 | msgstr "ошибка в %d строке файла конфигурации в %s %s" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 370 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 371 | #: config.c:593 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 372 | #, c-format |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 373 | msgid "bad numeric config value '%s' for '%s' in %s %s: %s" |
| 374 | msgstr "неправильное числовое значение «%s» для «%s» в %s %s: %s" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 375 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 376 | #: config.c:595 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 377 | #, c-format |
| 378 | msgid "bad numeric config value '%s' for '%s': %s" |
| 379 | msgstr "неправильное числовое значение «%s» для «%s»: %s" |
| 380 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 381 | #: config.c:680 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 382 | #, c-format |
| 383 | msgid "failed to expand user dir in: '%s'" |
| 384 | msgstr "сбой разворачивания пути каталога пользователя: «%s»" |
| 385 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 386 | #: config.c:758 config.c:769 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 387 | #, c-format |
| 388 | msgid "bad zlib compression level %d" |
| 389 | msgstr "неправильный уровень сжатия zlib %d" |
| 390 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 391 | #: config.c:891 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 392 | #, c-format |
| 393 | msgid "invalid mode for object creation: %s" |
| 394 | msgstr "недопустимый режим создания объекта: %s" |
| 395 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 396 | #: config.c:1220 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 397 | msgid "unable to parse command-line config" |
| 398 | msgstr "не удалось разобрать конфигурацию из командной строки" |
| 399 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 400 | #: config.c:1281 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 401 | msgid "unknown error occured while reading the configuration files" |
| 402 | msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" |
| 403 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 404 | #: config.c:1629 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 405 | #, c-format |
| 406 | msgid "unable to parse '%s' from command-line config" |
| 407 | msgstr "не удалось разобрать «%s» в конфигурации из командной строки" |
| 408 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 409 | #: config.c:1631 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 410 | #, c-format |
| 411 | msgid "bad config variable '%s' in file '%s' at line %d" |
| 412 | msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d" |
| 413 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 414 | #: config.c:1690 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 415 | #, c-format |
| 416 | msgid "%s has multiple values" |
| 417 | msgstr "%s имеет несколько значений" |
| 418 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 419 | #: config.c:2226 |
| 420 | #, c-format |
| 421 | msgid "Could not set '%s' to '%s'" |
| 422 | msgstr "Не удалось установить «%s» в «%s»" |
| 423 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 424 | #: connected.c:69 |
| 425 | msgid "Could not run 'git rev-list'" |
| 426 | msgstr "Не удалось запустить «git rev-list»" |
| 427 | |
| 428 | #: connected.c:89 |
| 429 | #, c-format |
| 430 | msgid "failed write to rev-list: %s" |
| 431 | msgstr "сбой записи в rev-list: %s" |
| 432 | |
| 433 | #: connected.c:97 |
| 434 | #, c-format |
| 435 | msgid "failed to close rev-list's stdin: %s" |
| 436 | msgstr "сбой закрытия стандартного ввода у rev-list: %s" |
| 437 | |
| 438 | #: date.c:95 |
| 439 | msgid "in the future" |
| 440 | msgstr "в будущем" |
| 441 | |
| 442 | #: date.c:101 |
| 443 | #, c-format |
| 444 | msgid "%lu second ago" |
| 445 | msgid_plural "%lu seconds ago" |
| 446 | msgstr[0] "%lu секунду назад" |
| 447 | msgstr[1] "%lu секунды назад" |
| 448 | msgstr[2] "%lu секунд назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 449 | msgstr[3] "%lu секунд назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 450 | |
| 451 | #: date.c:108 |
| 452 | #, c-format |
| 453 | msgid "%lu minute ago" |
| 454 | msgid_plural "%lu minutes ago" |
| 455 | msgstr[0] "%lu минуту назад" |
| 456 | msgstr[1] "%lu минуты назад" |
| 457 | msgstr[2] "%lu минут назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 458 | msgstr[3] "%lu минут назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 459 | |
| 460 | #: date.c:115 |
| 461 | #, c-format |
| 462 | msgid "%lu hour ago" |
| 463 | msgid_plural "%lu hours ago" |
| 464 | msgstr[0] "%lu час назад" |
| 465 | msgstr[1] "%lu часа назад" |
| 466 | msgstr[2] "%lu часов назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 467 | msgstr[3] "%lu часов назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 468 | |
| 469 | #: date.c:122 |
| 470 | #, c-format |
| 471 | msgid "%lu day ago" |
| 472 | msgid_plural "%lu days ago" |
| 473 | msgstr[0] "%lu день назад" |
| 474 | msgstr[1] "%lu дня назад" |
| 475 | msgstr[2] "%lu дней назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 476 | msgstr[3] "%lu дней назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 477 | |
| 478 | #: date.c:128 |
| 479 | #, c-format |
| 480 | msgid "%lu week ago" |
| 481 | msgid_plural "%lu weeks ago" |
| 482 | msgstr[0] "%lu неделю назад" |
| 483 | msgstr[1] "%lu недели назад" |
| 484 | msgstr[2] "%lu недель назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 485 | msgstr[3] "%lu недель назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 486 | |
| 487 | #: date.c:135 |
| 488 | #, c-format |
| 489 | msgid "%lu month ago" |
| 490 | msgid_plural "%lu months ago" |
| 491 | msgstr[0] "%lu месяц назад" |
| 492 | msgstr[1] "%lu месяца назад" |
| 493 | msgstr[2] "%lu месяцев назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 494 | msgstr[3] "%lu месяцев назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 495 | |
| 496 | #: date.c:146 |
| 497 | #, c-format |
| 498 | msgid "%lu year" |
| 499 | msgid_plural "%lu years" |
| 500 | msgstr[0] "%lu год" |
| 501 | msgstr[1] "%lu года" |
| 502 | msgstr[2] "%lu лет" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 503 | msgstr[3] "%lu лет" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 504 | |
| 505 | #. TRANSLATORS: "%s" is "<n> years" |
| 506 | #: date.c:149 |
| 507 | #, c-format |
| 508 | msgid "%s, %lu month ago" |
| 509 | msgid_plural "%s, %lu months ago" |
| 510 | msgstr[0] "%s и %lu месяц назад" |
| 511 | msgstr[1] "%s и %lu месяца назад" |
| 512 | msgstr[2] "%s и %lu месяцев назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 513 | msgstr[3] "%s и %lu месяцев назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 514 | |
| 515 | #: date.c:154 date.c:159 |
| 516 | #, c-format |
| 517 | msgid "%lu year ago" |
| 518 | msgid_plural "%lu years ago" |
| 519 | msgstr[0] "%lu год назад" |
| 520 | msgstr[1] "%lu года назад" |
| 521 | msgstr[2] "%lu лет назад" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 522 | msgstr[3] "%lu лет назад" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 523 | |
| 524 | #: diffcore-order.c:24 |
| 525 | #, c-format |
| 526 | msgid "failed to read orderfile '%s'" |
| 527 | msgstr "сбой чтения orderfile «%s»" |
| 528 | |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 529 | #: diffcore-rename.c:536 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 530 | msgid "Performing inexact rename detection" |
| 531 | msgstr "Выполняется неточное определение переименования" |
| 532 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 533 | #: diff.c:115 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 534 | #, c-format |
| 535 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
| 536 | msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n" |
| 537 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 538 | #: diff.c:120 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 539 | #, c-format |
| 540 | msgid " Unknown dirstat parameter '%s'\n" |
| 541 | msgstr "Неизвестный параметр dirstat: «%s»\n" |
| 542 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 543 | #: diff.c:215 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 544 | #, c-format |
| 545 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
| 546 | msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»" |
| 547 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 548 | #: diff.c:267 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 549 | #, c-format |
| 550 | msgid "" |
| 551 | "Found errors in 'diff.dirstat' config variable:\n" |
| 552 | "%s" |
| 553 | msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s" |
| 554 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 555 | #: diff.c:2997 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 556 | #, c-format |
| 557 | msgid "external diff died, stopping at %s" |
| 558 | msgstr "критическая ошибка при внешнем сравнении, останов на %s" |
| 559 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 560 | #: diff.c:3393 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 561 | msgid "--follow requires exactly one pathspec" |
| 562 | msgstr "--follow требует ровно одной спецификации пути" |
| 563 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 564 | #: diff.c:3556 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 565 | #, c-format |
| 566 | msgid "" |
| 567 | "Failed to parse --dirstat/-X option parameter:\n" |
| 568 | "%s" |
| 569 | msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" |
| 570 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 571 | #: diff.c:3570 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 572 | #, c-format |
| 573 | msgid "Failed to parse --submodule option parameter: '%s'" |
| 574 | msgstr "Сбой разбора параметра опции --submodule: «%s»" |
| 575 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 576 | #: dir.c:2004 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 577 | msgid "failed to get kernel name and information" |
| 578 | msgstr "не удалось получить имя ядра и информацию" |
| 579 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 580 | #: dir.c:2123 |
| 581 | msgid "Untracked cache is disabled on this system or location." |
| 582 | msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте." |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 583 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 584 | #: gpg-interface.c:166 gpg-interface.c:237 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 585 | msgid "could not run gpg." |
| 586 | msgstr "не удалось запустить gpg." |
| 587 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 588 | #: gpg-interface.c:178 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 589 | msgid "gpg did not accept the data" |
| 590 | msgstr "gpg не принял данные" |
| 591 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 592 | #: gpg-interface.c:189 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 593 | msgid "gpg failed to sign the data" |
| 594 | msgstr "gpg не удалось подписать данные" |
| 595 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 596 | #: gpg-interface.c:222 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 597 | #, c-format |
| 598 | msgid "could not create temporary file '%s': %s" |
| 599 | msgstr "не удалось создать временный файл «%s»: %s" |
| 600 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 601 | #: gpg-interface.c:225 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 602 | #, c-format |
| 603 | msgid "failed writing detached signature to '%s': %s" |
| 604 | msgstr "сбой записи отсоединенной подписи в «%s»: %s" |
| 605 | |
| 606 | #: grep.c:1718 |
| 607 | #, c-format |
| 608 | msgid "'%s': unable to read %s" |
| 609 | msgstr "«%s»: не удалось прочесть %s" |
| 610 | |
| 611 | #: grep.c:1735 |
| 612 | #, c-format |
| 613 | msgid "'%s': %s" |
| 614 | msgstr "«%s»: %s" |
| 615 | |
| 616 | #: grep.c:1746 |
| 617 | #, c-format |
| 618 | msgid "'%s': short read %s" |
| 619 | msgstr "«%s»: слишком мало данных прочитано %s" |
| 620 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 621 | #: help.c:205 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 622 | #, c-format |
| 623 | msgid "available git commands in '%s'" |
| 624 | msgstr "доступные команды git в «%s»" |
| 625 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 626 | #: help.c:212 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 627 | msgid "git commands available from elsewhere on your $PATH" |
| 628 | msgstr "команды git, доступные в других местах вашего $PATH" |
| 629 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 630 | #: help.c:244 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 631 | msgid "These are common Git commands used in various situations:" |
| 632 | msgstr "Стандартные команды Git используемые в различных ситуациях:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 633 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 634 | #: help.c:309 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 635 | #, c-format |
| 636 | msgid "" |
| 637 | "'%s' appears to be a git command, but we were not\n" |
| 638 | "able to execute it. Maybe git-%s is broken?" |
| 639 | msgstr "«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-%s не работает?" |
| 640 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 641 | #: help.c:366 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 642 | msgid "Uh oh. Your system reports no Git commands at all." |
| 643 | msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще." |
| 644 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 645 | #: help.c:388 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 646 | #, c-format |
| 647 | msgid "" |
| 648 | "WARNING: You called a Git command named '%s', which does not exist.\n" |
| 649 | "Continuing under the assumption that you meant '%s'" |
| 650 | msgstr "ВНИМАНИЕ: Вы вызвали команду Git «%s», но такой не существует.\nПродолжаем с предположением, что вы имели в виду «%s»" |
| 651 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 652 | #: help.c:393 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 653 | #, c-format |
| 654 | msgid "in %0.1f seconds automatically..." |
| 655 | msgstr "через %0.1f секунд автоматически…" |
| 656 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 657 | #: help.c:400 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 658 | #, c-format |
| 659 | msgid "git: '%s' is not a git command. See 'git --help'." |
| 660 | msgstr "git: «%s» не является командой git. Смотрите «git --help»." |
| 661 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 662 | #: help.c:404 help.c:464 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 663 | msgid "" |
| 664 | "\n" |
| 665 | "Did you mean this?" |
| 666 | msgid_plural "" |
| 667 | "\n" |
| 668 | "Did you mean one of these?" |
| 669 | msgstr[0] "\nВозможно, вы имели в виду это?" |
| 670 | msgstr[1] "\nВозможно, вы имели в виду что-то из этого?" |
| 671 | msgstr[2] "\nВозможно, вы имели в виду что-то из этого?" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 672 | msgstr[3] "\nВозможно, вы имели в виду что-то из этого?" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 673 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 674 | #: help.c:460 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 675 | #, c-format |
| 676 | msgid "%s: %s - %s" |
| 677 | msgstr "%s: %s — %s" |
| 678 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 679 | #: merge.c:41 |
| 680 | msgid "failed to read the cache" |
| 681 | msgstr "сбой чтения кэша" |
| 682 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 683 | #: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 |
| 684 | #: builtin/checkout.c:587 builtin/clone.c:730 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 685 | msgid "unable to write new index file" |
| 686 | msgstr "не удалось записать новый файл индекса" |
| 687 | |
| 688 | #: merge-recursive.c:189 |
| 689 | #, c-format |
| 690 | msgid "(bad commit)\n" |
| 691 | msgstr "(плохой коммит)\n" |
| 692 | |
| 693 | #: merge-recursive.c:209 |
| 694 | #, c-format |
| 695 | msgid "addinfo_cache failed for path '%s'" |
| 696 | msgstr "сбой addinfo_cache для пути «%s»" |
| 697 | |
| 698 | #: merge-recursive.c:270 |
| 699 | msgid "error building trees" |
| 700 | msgstr "ошибка при построении деревьев" |
| 701 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 702 | #: merge-recursive.c:689 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 703 | #, c-format |
| 704 | msgid "failed to create path '%s'%s" |
| 705 | msgstr "не удалось создать путь «%s»%s" |
| 706 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 707 | #: merge-recursive.c:700 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 708 | #, c-format |
| 709 | msgid "Removing %s to make room for subdirectory\n" |
| 710 | msgstr "Удаление %s, чтобы освободить место для подкаталогов\n" |
| 711 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 712 | #: merge-recursive.c:714 merge-recursive.c:735 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 713 | msgid ": perhaps a D/F conflict?" |
| 714 | msgstr ": возможно, конфликт каталогов/файлов?" |
| 715 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 716 | #: merge-recursive.c:725 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 717 | #, c-format |
| 718 | msgid "refusing to lose untracked file at '%s'" |
| 719 | msgstr "отказ потери неотслеживаемого файла в «%s»" |
| 720 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 721 | #: merge-recursive.c:765 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 722 | #, c-format |
| 723 | msgid "cannot read object %s '%s'" |
| 724 | msgstr "невозможно прочитать объект %s «%s»" |
| 725 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 726 | #: merge-recursive.c:767 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 727 | #, c-format |
| 728 | msgid "blob expected for %s '%s'" |
| 729 | msgstr "ожидается двоичный объект для %s «%s»" |
| 730 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 731 | #: merge-recursive.c:790 builtin/clone.c:374 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 732 | #, c-format |
| 733 | msgid "failed to open '%s'" |
| 734 | msgstr "не удалось открыть «%s»" |
| 735 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 736 | #: merge-recursive.c:798 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 737 | #, c-format |
| 738 | msgid "failed to symlink '%s'" |
| 739 | msgstr "не удалось создать символьную ссылку «%s»" |
| 740 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 741 | #: merge-recursive.c:801 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 742 | #, c-format |
| 743 | msgid "do not know what to do with %06o %s '%s'" |
| 744 | msgstr "не понятно, что делать с %06o %s «%s»" |
| 745 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 746 | #: merge-recursive.c:939 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 747 | msgid "Failed to execute internal merge" |
| 748 | msgstr "Не удалось запустить внутреннее слияние" |
| 749 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 750 | #: merge-recursive.c:943 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 751 | #, c-format |
| 752 | msgid "Unable to add %s to database" |
| 753 | msgstr "Не удалось добавить %s в базу данных" |
| 754 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 755 | #: merge-recursive.c:959 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 756 | msgid "unsupported object type in the tree" |
| 757 | msgstr "объект неподдерживаемого типа в дереве" |
| 758 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 759 | #: merge-recursive.c:1034 merge-recursive.c:1048 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 760 | #, c-format |
| 761 | msgid "" |
| 762 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 763 | "in tree." |
| 764 | msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве." |
| 765 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 766 | #: merge-recursive.c:1040 merge-recursive.c:1053 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 767 | #, c-format |
| 768 | msgid "" |
| 769 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 770 | "in tree at %s." |
| 771 | msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s." |
| 772 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 773 | #: merge-recursive.c:1094 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 774 | msgid "rename" |
| 775 | msgstr "переименование" |
| 776 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 777 | #: merge-recursive.c:1094 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 778 | msgid "renamed" |
| 779 | msgstr "переименовано" |
| 780 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 781 | #: merge-recursive.c:1150 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 782 | #, c-format |
| 783 | msgid "%s is a directory in %s adding as %s instead" |
| 784 | msgstr "%s — это каталог в %s, добавляем как %s вместо этого" |
| 785 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 786 | #: merge-recursive.c:1172 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 787 | #, c-format |
| 788 | msgid "" |
| 789 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " |
| 790 | "\"%s\"->\"%s\" in \"%s\"%s" |
| 791 | msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" |
| 792 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 793 | #: merge-recursive.c:1177 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 794 | msgid " (left unresolved)" |
| 795 | msgstr " (оставлено неразрешенным)" |
| 796 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 797 | #: merge-recursive.c:1231 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 798 | #, c-format |
| 799 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
| 800 | msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»" |
| 801 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 802 | #: merge-recursive.c:1261 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 803 | #, c-format |
| 804 | msgid "Renaming %s to %s and %s to %s instead" |
| 805 | msgstr "Переименовываю %s в %s и %s в %s вместо этого" |
| 806 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 807 | #: merge-recursive.c:1460 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 808 | #, c-format |
| 809 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
| 810 | msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»" |
| 811 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 812 | #: merge-recursive.c:1470 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 813 | #, c-format |
| 814 | msgid "Adding merged %s" |
| 815 | msgstr "Добавление слитого %s" |
| 816 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 817 | #: merge-recursive.c:1475 merge-recursive.c:1677 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 818 | #, c-format |
| 819 | msgid "Adding as %s instead" |
| 820 | msgstr "Добавление вместо этого как %s" |
| 821 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 822 | #: merge-recursive.c:1526 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 823 | #, c-format |
| 824 | msgid "cannot read object %s" |
| 825 | msgstr "невозможно прочитать объект «%s»" |
| 826 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 827 | #: merge-recursive.c:1529 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 828 | #, c-format |
| 829 | msgid "object %s is not a blob" |
| 830 | msgstr "объект %s не является двоичным объектом" |
| 831 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 832 | #: merge-recursive.c:1581 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 833 | msgid "modify" |
| 834 | msgstr "изменение" |
| 835 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 836 | #: merge-recursive.c:1581 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 837 | msgid "modified" |
| 838 | msgstr "изменено" |
| 839 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 840 | #: merge-recursive.c:1591 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 841 | msgid "content" |
| 842 | msgstr "содержимое" |
| 843 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 844 | #: merge-recursive.c:1598 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 845 | msgid "add/add" |
| 846 | msgstr "добавление/добавление" |
| 847 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 848 | #: merge-recursive.c:1632 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 849 | #, c-format |
| 850 | msgid "Skipped %s (merged same as existing)" |
| 851 | msgstr "Пропуск %s (слиты одинаковые изменения как существующие)" |
| 852 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 853 | #: merge-recursive.c:1646 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 854 | #, c-format |
| 855 | msgid "Auto-merging %s" |
| 856 | msgstr "Автослияние %s" |
| 857 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 858 | #: merge-recursive.c:1650 git-submodule.sh:1048 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 859 | msgid "submodule" |
| 860 | msgstr "подмодуль" |
| 861 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 862 | #: merge-recursive.c:1651 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 863 | #, c-format |
| 864 | msgid "CONFLICT (%s): Merge conflict in %s" |
| 865 | msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s" |
| 866 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 867 | #: merge-recursive.c:1737 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 868 | #, c-format |
| 869 | msgid "Removing %s" |
| 870 | msgstr "Удаление %s" |
| 871 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 872 | #: merge-recursive.c:1762 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 873 | msgid "file/directory" |
| 874 | msgstr "файл/каталог" |
| 875 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 876 | #: merge-recursive.c:1768 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 877 | msgid "directory/file" |
| 878 | msgstr "каталог/файл" |
| 879 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 880 | #: merge-recursive.c:1773 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 881 | #, c-format |
| 882 | msgid "" |
| 883 | "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
| 884 | msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»" |
| 885 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 886 | #: merge-recursive.c:1783 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 887 | #, c-format |
| 888 | msgid "Adding %s" |
| 889 | msgstr "Добавление %s" |
| 890 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 891 | #: merge-recursive.c:1800 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 892 | msgid "Fatal merge failure, shouldn't happen." |
| 893 | msgstr "Критическая ошибка слияния, такого не должно случаться." |
| 894 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 895 | #: merge-recursive.c:1819 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 896 | msgid "Already up-to-date!" |
| 897 | msgstr "Уже обновлено!" |
| 898 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 899 | #: merge-recursive.c:1828 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 900 | #, c-format |
| 901 | msgid "merging of trees %s and %s failed" |
| 902 | msgstr "сбой слияния деревьев «%s» и «%s»" |
| 903 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 904 | #: merge-recursive.c:1858 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 905 | #, c-format |
| 906 | msgid "Unprocessed path??? %s" |
| 907 | msgstr "Необработанный путь??? %s" |
| 908 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 909 | #: merge-recursive.c:1906 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 910 | msgid "Merging:" |
| 911 | msgstr "Слияние:" |
| 912 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 913 | #: merge-recursive.c:1919 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 914 | #, c-format |
| 915 | msgid "found %u common ancestor:" |
| 916 | msgid_plural "found %u common ancestors:" |
| 917 | msgstr[0] "найден %u общий предок:" |
| 918 | msgstr[1] "найдено %u общих предка:" |
| 919 | msgstr[2] "найдено %u общих предков:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 920 | msgstr[3] "найдено %u общих предков:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 921 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 922 | #: merge-recursive.c:1956 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 923 | msgid "merge returned no commit" |
| 924 | msgstr "слияние не вернуло коммит" |
| 925 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 926 | #: merge-recursive.c:2013 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 927 | #, c-format |
| 928 | msgid "Could not parse object '%s'" |
| 929 | msgstr "Не удалось разобрать объект «%s»" |
| 930 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 931 | #: merge-recursive.c:2024 builtin/merge.c:646 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 932 | msgid "Unable to write index." |
| 933 | msgstr "Не удается записать индекс." |
| 934 | |
| 935 | #: notes-utils.c:41 |
| 936 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
| 937 | msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок" |
| 938 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 939 | #: notes-utils.c:100 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 940 | #, c-format |
| 941 | msgid "Bad notes.rewriteMode value: '%s'" |
| 942 | msgstr "Неправильное значение notes.rewriteMode: «%s»" |
| 943 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 944 | #: notes-utils.c:110 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 945 | #, c-format |
| 946 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
| 947 | msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)" |
| 948 | |
| 949 | #. TRANSLATORS: The first %s is the name of the |
| 950 | #. environment variable, the second %s is its value |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 951 | #: notes-utils.c:137 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 952 | #, c-format |
| 953 | msgid "Bad %s value: '%s'" |
| 954 | msgstr "Неправильное значение переменной %s: «%s»" |
| 955 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 956 | #: object.c:242 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 957 | #, c-format |
| 958 | msgid "unable to parse object: %s" |
| 959 | msgstr "не удалось разобрать объект: %s" |
| 960 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 961 | #: parse-options.c:570 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 962 | msgid "..." |
| 963 | msgstr "…" |
| 964 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 965 | #: parse-options.c:588 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 966 | #, c-format |
| 967 | msgid "usage: %s" |
| 968 | msgstr "использование: %s" |
| 969 | |
| 970 | #. TRANSLATORS: the colon here should align with the |
| 971 | #. one in "usage: %s" translation |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 972 | #: parse-options.c:592 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 973 | #, c-format |
| 974 | msgid " or: %s" |
| 975 | msgstr " или: %s" |
| 976 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 977 | #: parse-options.c:595 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 978 | #, c-format |
| 979 | msgid " %s" |
| 980 | msgstr " %s" |
| 981 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 982 | #: parse-options.c:629 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 983 | msgid "-NUM" |
| 984 | msgstr "-КОЛИЧЕСТВО" |
| 985 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 986 | #: parse-options-cb.c:108 |
| 987 | #, c-format |
| 988 | msgid "malformed object name '%s'" |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 989 | msgstr "Неправильное имя объекта «%s»" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 990 | |
| 991 | #: path.c:752 |
| 992 | #, c-format |
| 993 | msgid "Could not make %s writable by group" |
| 994 | msgstr "Не удалось предоставить доступ к %s на запись" |
| 995 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 996 | #: pathspec.c:133 |
| 997 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
| 998 | msgstr "глобальные опции спецификации пути «glob» и «noglob» нельзя использовать одновременно" |
| 999 | |
| 1000 | #: pathspec.c:143 |
| 1001 | msgid "" |
| 1002 | "global 'literal' pathspec setting is incompatible with all other global " |
| 1003 | "pathspec settings" |
| 1004 | msgstr "глобальная опция спецификации пути «literal» не совместима с другими глобальными спецификаторами доступа" |
| 1005 | |
| 1006 | #: pathspec.c:177 |
| 1007 | msgid "invalid parameter for pathspec magic 'prefix'" |
| 1008 | msgstr "неправильный параметр для магического слова «prefix» в спецификации пути " |
| 1009 | |
| 1010 | #: pathspec.c:183 |
| 1011 | #, c-format |
| 1012 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
| 1013 | msgstr "неправильное магическое слово «%.*s» в спецификации пути «%s»" |
| 1014 | |
| 1015 | #: pathspec.c:187 |
| 1016 | #, c-format |
| 1017 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
| 1018 | msgstr "Пропущено «)» в конце магического слова спецификации пути «%s»" |
| 1019 | |
| 1020 | #: pathspec.c:205 |
| 1021 | #, c-format |
| 1022 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
| 1023 | msgstr "Нереализованное магическое слово «%c» спецификации пути «%s»" |
| 1024 | |
| 1025 | #: pathspec.c:230 |
| 1026 | #, c-format |
| 1027 | msgid "%s: 'literal' and 'glob' are incompatible" |
| 1028 | msgstr "%s: «literal» и «glob» не совместимы" |
| 1029 | |
| 1030 | #: pathspec.c:241 |
| 1031 | #, c-format |
| 1032 | msgid "%s: '%s' is outside repository" |
| 1033 | msgstr "%s: «%s» вне репозитория" |
| 1034 | |
| 1035 | #: pathspec.c:291 |
| 1036 | #, c-format |
| 1037 | msgid "Pathspec '%s' is in submodule '%.*s'" |
| 1038 | msgstr "Спецификация пути «%s» в подмодуле «%.*s»" |
| 1039 | |
| 1040 | #: pathspec.c:353 |
| 1041 | #, c-format |
| 1042 | msgid "%s: pathspec magic not supported by this command: %s" |
| 1043 | msgstr "%s: магические слова в спецификации пути не поддерживаются командой: %s" |
| 1044 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1045 | #: pathspec.c:433 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1046 | #, c-format |
| 1047 | msgid "pathspec '%s' is beyond a symbolic link" |
| 1048 | msgstr "спецификация пути «%s» находится за символической ссылкой" |
| 1049 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1050 | #: pathspec.c:442 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1051 | msgid "" |
| 1052 | "There is nothing to exclude from by :(exclude) patterns.\n" |
| 1053 | "Perhaps you forgot to add either ':/' or '.' ?" |
| 1054 | msgstr "Не указан шаблон для исключения с помощью :(exclude).\nВозможно, вы забыли «:/» или «.» ?" |
| 1055 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1056 | #: pretty.c:969 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1057 | msgid "unable to parse --pretty format" |
| 1058 | msgstr "не удалось разобрать формат для --pretty" |
| 1059 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1060 | #: progress.c:235 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1061 | msgid "done" |
| 1062 | msgstr "готово" |
| 1063 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1064 | #: read-cache.c:1281 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1065 | #, c-format |
| 1066 | msgid "" |
| 1067 | "index.version set, but the value is invalid.\n" |
| 1068 | "Using version %i" |
| 1069 | msgstr "index.version указан, но значение недействительное.\nИспользую версию %i" |
| 1070 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1071 | #: read-cache.c:1291 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1072 | #, c-format |
| 1073 | msgid "" |
| 1074 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
| 1075 | "Using version %i" |
| 1076 | msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i" |
| 1077 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1078 | #: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 |
| 1079 | #: builtin/merge.c:984 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1080 | #, c-format |
| 1081 | msgid "Could not open '%s' for writing" |
| 1082 | msgstr "Не удалось открыть «%s» для записи" |
| 1083 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1084 | #: refs/files-backend.c:2374 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1085 | #, c-format |
| 1086 | msgid "could not delete reference %s: %s" |
| 1087 | msgstr "не удалось удалить ссылку %s: %s" |
| 1088 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1089 | #: refs/files-backend.c:2377 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1090 | #, c-format |
| 1091 | msgid "could not delete references: %s" |
| 1092 | msgstr "не удалось удалить ссылки: %s" |
| 1093 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1094 | #: refs/files-backend.c:2386 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1095 | #, c-format |
| 1096 | msgid "could not remove reference %s" |
| 1097 | msgstr "не удалось удалить ссылки %s" |
| 1098 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1099 | #: ref-filter.c:55 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1100 | #, c-format |
| 1101 | msgid "expected format: %%(color:<color>)" |
| 1102 | msgstr "ожидаемый формат: %%(color:<color>)" |
| 1103 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1104 | #: ref-filter.c:57 |
| 1105 | #, c-format |
| 1106 | msgid "unrecognized color: %%(color:%s)" |
| 1107 | msgstr "неопознанный цвет: %%(color:%s)" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1108 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1109 | #: ref-filter.c:71 |
| 1110 | #, c-format |
| 1111 | msgid "unrecognized format: %%(%s)" |
| 1112 | msgstr "неопознанный формат: %%(%s)" |
| 1113 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1114 | #: ref-filter.c:77 |
| 1115 | #, c-format |
| 1116 | msgid "%%(body) does not take arguments" |
| 1117 | msgstr "%%(body) не принимает аргументов" |
| 1118 | |
| 1119 | #: ref-filter.c:84 |
| 1120 | #, c-format |
| 1121 | msgid "%%(subject) does not take arguments" |
| 1122 | msgstr "%%(subject) не принимает аргументов" |
| 1123 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1124 | #: ref-filter.c:101 |
| 1125 | #, c-format |
| 1126 | msgid "positive value expected contents:lines=%s" |
| 1127 | msgstr "положительное значение ожидает содержимое:lines=%s" |
| 1128 | |
| 1129 | #: ref-filter.c:103 |
| 1130 | #, c-format |
| 1131 | msgid "unrecognized %%(contents) argument: %s" |
| 1132 | msgstr "неопознанный аргумент %%(contents): %s" |
| 1133 | |
| 1134 | #: ref-filter.c:113 |
| 1135 | #, c-format |
| 1136 | msgid "unrecognized %%(objectname) argument: %s" |
| 1137 | msgstr "неопознанный аргумент %%(objectname): %s" |
| 1138 | |
| 1139 | #: ref-filter.c:135 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1140 | #, c-format |
| 1141 | msgid "expected format: %%(align:<width>,<position>)" |
| 1142 | msgstr "ожидаемый формат: %%(align:<width>,<position>)" |
| 1143 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1144 | #: ref-filter.c:147 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1145 | #, c-format |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1146 | msgid "unrecognized position:%s" |
| 1147 | msgstr "неопознанная позиция:%s" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1148 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1149 | #: ref-filter.c:151 |
| 1150 | #, c-format |
| 1151 | msgid "unrecognized width:%s" |
| 1152 | msgstr "неопознанная ширина:%s" |
| 1153 | |
| 1154 | #: ref-filter.c:157 |
| 1155 | #, c-format |
| 1156 | msgid "unrecognized %%(align) argument: %s" |
| 1157 | msgstr "неопознанный аргумент %%(align): %s" |
| 1158 | |
| 1159 | #: ref-filter.c:161 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1160 | #, c-format |
| 1161 | msgid "positive width expected with the %%(align) atom" |
| 1162 | msgstr "ожидается положительная ширина с указанием частицы %%(align)" |
| 1163 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1164 | #: ref-filter.c:244 |
| 1165 | #, c-format |
| 1166 | msgid "malformed field name: %.*s" |
| 1167 | msgstr "неправильное имя поля: %.*s" |
| 1168 | |
| 1169 | #: ref-filter.c:270 |
| 1170 | #, c-format |
| 1171 | msgid "unknown field name: %.*s" |
| 1172 | msgstr "неизвестное имя поля: %.*s" |
| 1173 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1174 | #: ref-filter.c:372 |
| 1175 | #, c-format |
| 1176 | msgid "format: %%(end) atom used without corresponding atom" |
| 1177 | msgstr "формат: частица %%(end) использована без соответствующей частицы" |
| 1178 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1179 | #: ref-filter.c:424 |
| 1180 | #, c-format |
| 1181 | msgid "malformed format string %s" |
| 1182 | msgstr "неправильная строка формата %s" |
| 1183 | |
| 1184 | #: ref-filter.c:878 |
| 1185 | msgid ":strip= requires a positive integer argument" |
| 1186 | msgstr ":strip= требует наличия положительного целого аргумента" |
| 1187 | |
| 1188 | #: ref-filter.c:883 |
| 1189 | #, c-format |
| 1190 | msgid "ref '%s' does not have %ld components to :strip" |
| 1191 | msgstr "ссылка «%s» не содержит %ld компонент для :strip" |
| 1192 | |
| 1193 | #: ref-filter.c:1046 |
| 1194 | #, c-format |
| 1195 | msgid "unknown %.*s format %s" |
| 1196 | msgstr "неизвестный %.*s формат %s" |
| 1197 | |
| 1198 | #: ref-filter.c:1066 ref-filter.c:1097 |
| 1199 | #, c-format |
| 1200 | msgid "missing object %s for %s" |
| 1201 | msgstr "не найден объект %s для %s" |
| 1202 | |
| 1203 | #: ref-filter.c:1069 ref-filter.c:1100 |
| 1204 | #, c-format |
| 1205 | msgid "parse_object_buffer failed on %s for %s" |
| 1206 | msgstr "сбой при выполнении parse_object_buffer на %s для %s" |
| 1207 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1208 | #: ref-filter.c:1311 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1209 | #, c-format |
| 1210 | msgid "malformed object at '%s'" |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1211 | msgstr "Повреждённый объект «%s»" |
| 1212 | |
| 1213 | #: ref-filter.c:1373 |
| 1214 | #, c-format |
| 1215 | msgid "ignoring ref with broken name %s" |
| 1216 | msgstr "игнорирую ссылку с неправильным именем %s" |
| 1217 | |
| 1218 | #: ref-filter.c:1378 |
| 1219 | #, c-format |
| 1220 | msgid "ignoring broken ref %s" |
| 1221 | msgstr "игнорирую неправильную ссылку %s" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1222 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1223 | #: ref-filter.c:1651 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1224 | #, c-format |
| 1225 | msgid "format: %%(end) atom missing" |
| 1226 | msgstr "format: пропущена частица %%(end)" |
| 1227 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1228 | #: ref-filter.c:1705 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1229 | #, c-format |
| 1230 | msgid "malformed object name %s" |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1231 | msgstr "неправильное имя объекта %s" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 1232 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1233 | #: remote.c:745 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1234 | #, c-format |
| 1235 | msgid "Cannot fetch both %s and %s to %s" |
| 1236 | msgstr "Нельзя извлечь одновременно %s и %s в %s" |
| 1237 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1238 | #: remote.c:749 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1239 | #, c-format |
| 1240 | msgid "%s usually tracks %s, not %s" |
| 1241 | msgstr "%s обычно отслеживает %s, а не %s" |
| 1242 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1243 | #: remote.c:753 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1244 | #, c-format |
| 1245 | msgid "%s tracks both %s and %s" |
| 1246 | msgstr "%s отслеживает и %s и %s" |
| 1247 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1248 | #: remote.c:761 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1249 | msgid "Internal error" |
| 1250 | msgstr "Внутренняя ошибка" |
| 1251 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1252 | #: remote.c:1677 remote.c:1720 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1253 | msgid "HEAD does not point to a branch" |
| 1254 | msgstr "HEAD не указывает на ветку" |
| 1255 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1256 | #: remote.c:1686 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1257 | #, c-format |
| 1258 | msgid "no such branch: '%s'" |
| 1259 | msgstr "нет такой ветки: «%s»" |
| 1260 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1261 | #: remote.c:1689 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1262 | #, c-format |
| 1263 | msgid "no upstream configured for branch '%s'" |
| 1264 | msgstr "вышестоящая ветка не настроена для ветки «%s»" |
| 1265 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1266 | #: remote.c:1695 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1267 | #, c-format |
| 1268 | msgid "upstream branch '%s' not stored as a remote-tracking branch" |
| 1269 | msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" |
| 1270 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1271 | #: remote.c:1710 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1272 | #, c-format |
| 1273 | msgid "push destination '%s' on remote '%s' has no local tracking branch" |
| 1274 | msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки" |
| 1275 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1276 | #: remote.c:1725 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1277 | #, c-format |
| 1278 | msgid "branch '%s' has no remote for pushing" |
| 1279 | msgstr "ветка «%s» не имеет внешнего сервера для отправки" |
| 1280 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1281 | #: remote.c:1736 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1282 | #, c-format |
| 1283 | msgid "push refspecs for '%s' do not include '%s'" |
| 1284 | msgstr "спецификации пути для отправки «%s» не включают в себя «%s»" |
| 1285 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1286 | #: remote.c:1749 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1287 | msgid "push has no destination (push.default is 'nothing')" |
| 1288 | msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)" |
| 1289 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1290 | #: remote.c:1771 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1291 | msgid "cannot resolve 'simple' push to a single destination" |
| 1292 | msgstr "не удалось выполнить «simple» отправку в единственную точку назначения" |
| 1293 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1294 | #: remote.c:2073 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1295 | #, c-format |
| 1296 | msgid "Your branch is based on '%s', but the upstream is gone.\n" |
| 1297 | msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n" |
| 1298 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1299 | #: remote.c:2077 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1300 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
| 1301 | msgstr "(для исправления запустите «git branch --unset-upstream»)\n" |
| 1302 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1303 | #: remote.c:2080 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1304 | #, c-format |
| 1305 | msgid "Your branch is up-to-date with '%s'.\n" |
| 1306 | msgstr "Ваша ветка обновлена в соответствии с «%s».\n" |
| 1307 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1308 | #: remote.c:2084 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1309 | #, c-format |
| 1310 | msgid "Your branch is ahead of '%s' by %d commit.\n" |
| 1311 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" |
| 1312 | msgstr[0] "Ваша ветка опережает «%s» на %d коммит.\n" |
| 1313 | msgstr[1] "Ваша ветка опережает «%s» на %d коммита.\n" |
| 1314 | msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1315 | msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1316 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1317 | #: remote.c:2090 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1318 | msgid " (use \"git push\" to publish your local commits)\n" |
| 1319 | msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n" |
| 1320 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1321 | #: remote.c:2093 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1322 | #, c-format |
| 1323 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" |
| 1324 | msgid_plural "" |
| 1325 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" |
| 1326 | msgstr[0] "Ваша ветка отстает от «%s» на %d коммит и может быть перемотана вперед.\n" |
| 1327 | msgstr[1] "Ваша ветка отстает от «%s» на %d коммита и может быть перемотана вперед.\n" |
| 1328 | msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1329 | msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1330 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1331 | #: remote.c:2101 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1332 | msgid " (use \"git pull\" to update your local branch)\n" |
| 1333 | msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n" |
| 1334 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1335 | #: remote.c:2104 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1336 | #, c-format |
| 1337 | msgid "" |
| 1338 | "Your branch and '%s' have diverged,\n" |
| 1339 | "and have %d and %d different commit each, respectively.\n" |
| 1340 | msgid_plural "" |
| 1341 | "Your branch and '%s' have diverged,\n" |
| 1342 | "and have %d and %d different commits each, respectively.\n" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1343 | msgstr[0] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разный коммит в каждой соответственно.\n" |
| 1344 | msgstr[1] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммита в каждой соответственно.\n" |
| 1345 | msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" |
| 1346 | msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1347 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1348 | #: remote.c:2114 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1349 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
| 1350 | msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" |
| 1351 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1352 | #: revision.c:2131 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1353 | msgid "your current branch appears to be broken" |
| 1354 | msgstr "похоже, ваша текущая ветка повреждена" |
| 1355 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1356 | #: revision.c:2134 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1357 | #, c-format |
| 1358 | msgid "your current branch '%s' does not have any commits yet" |
| 1359 | msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита" |
| 1360 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1361 | #: revision.c:2328 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 1362 | msgid "--first-parent is incompatible with --bisect" |
| 1363 | msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" |
| 1364 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1365 | #: run-command.c:92 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1366 | msgid "open /dev/null failed" |
| 1367 | msgstr "сбой открытия /dev/null" |
| 1368 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1369 | #: run-command.c:94 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1370 | #, c-format |
| 1371 | msgid "dup2(%d,%d) failed" |
| 1372 | msgstr "dup2(%d,%d) сбой" |
| 1373 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1374 | #: send-pack.c:295 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1375 | msgid "failed to sign the push certificate" |
| 1376 | msgstr "сбой подписания сертификата отправки" |
| 1377 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1378 | #: send-pack.c:404 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1379 | msgid "the receiving end does not support --signed push" |
Dimitriy Ryazantcev | 9af95af | 2015-04-03 16:30:14 +0300 | [diff] [blame] | 1380 | msgstr "принимающая сторона не поддерживает отправку с опцией --signed" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1381 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1382 | #: send-pack.c:406 |
| 1383 | msgid "" |
| 1384 | "not sending a push certificate since the receiving end does not support " |
| 1385 | "--signed push" |
| 1386 | msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed" |
| 1387 | |
| 1388 | #: send-pack.c:418 |
Dimitriy Ryazantcev | 9af95af | 2015-04-03 16:30:14 +0300 | [diff] [blame] | 1389 | msgid "the receiving end does not support --atomic push" |
| 1390 | msgstr "принимающая сторона не поддерживает отправку с опцией --atomic" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 1391 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1392 | #: sequencer.c:174 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1393 | msgid "" |
| 1394 | "after resolving the conflicts, mark the corrected paths\n" |
| 1395 | "with 'git add <paths>' or 'git rm <paths>'" |
| 1396 | msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»" |
| 1397 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1398 | #: sequencer.c:177 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1399 | msgid "" |
| 1400 | "after resolving the conflicts, mark the corrected paths\n" |
| 1401 | "with 'git add <paths>' or 'git rm <paths>'\n" |
| 1402 | "and commit the result with 'git commit'" |
| 1403 | msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»" |
| 1404 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1405 | #: sequencer.c:190 sequencer.c:833 sequencer.c:913 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1406 | #, c-format |
| 1407 | msgid "Could not write to %s" |
| 1408 | msgstr "Не удалось записать в %s" |
| 1409 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1410 | #: sequencer.c:193 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1411 | #, c-format |
| 1412 | msgid "Error wrapping up %s" |
| 1413 | msgstr "Ошибка оборачивания %s" |
| 1414 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1415 | #: sequencer.c:208 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1416 | msgid "Your local changes would be overwritten by cherry-pick." |
| 1417 | msgstr "Ваши локальные изменение будут перезаписаны отбором лучшего." |
| 1418 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1419 | #: sequencer.c:210 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1420 | msgid "Your local changes would be overwritten by revert." |
| 1421 | msgstr "Ваши локальные изменение будут перезаписаны возвратом коммита." |
| 1422 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1423 | #: sequencer.c:213 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1424 | msgid "Commit your changes or stash them to proceed." |
| 1425 | msgstr "Сделайте коммит или спрячьте ваши изменения для продолжения." |
| 1426 | |
| 1427 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1428 | #: sequencer.c:300 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1429 | #, c-format |
| 1430 | msgid "%s: Unable to write new index file" |
| 1431 | msgstr "%s: Не удалось записать файл индекса" |
| 1432 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1433 | #: sequencer.c:318 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1434 | msgid "Could not resolve HEAD commit\n" |
| 1435 | msgstr "Не удалось определить HEAD коммит\n" |
| 1436 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1437 | #: sequencer.c:338 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1438 | msgid "Unable to update cache tree\n" |
| 1439 | msgstr "Не удалось обновить дерево кэша\n" |
| 1440 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1441 | #: sequencer.c:390 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1442 | #, c-format |
| 1443 | msgid "Could not parse commit %s\n" |
| 1444 | msgstr "Не удалось разобрать коммит %s\n" |
| 1445 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1446 | #: sequencer.c:395 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1447 | #, c-format |
| 1448 | msgid "Could not parse parent commit %s\n" |
| 1449 | msgstr "Не удалось разобрать родительскую коммит %s\n" |
| 1450 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1451 | #: sequencer.c:460 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1452 | msgid "Your index file is unmerged." |
| 1453 | msgstr "Ваш файл индекса не слит." |
| 1454 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1455 | #: sequencer.c:479 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1456 | #, c-format |
| 1457 | msgid "Commit %s is a merge but no -m option was given." |
| 1458 | msgstr "Коммит %s — это коммит-слияние, но опция -m не указана." |
| 1459 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1460 | #: sequencer.c:487 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1461 | #, c-format |
| 1462 | msgid "Commit %s does not have parent %d" |
| 1463 | msgstr "У коммита %s нет предка %d" |
| 1464 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1465 | #: sequencer.c:491 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1466 | #, c-format |
| 1467 | msgid "Mainline was specified but commit %s is not a merge." |
| 1468 | msgstr "Основная ветка указана, но коммит %s не является слиянием." |
| 1469 | |
| 1470 | #. TRANSLATORS: The first %s will be "revert" or |
| 1471 | #. "cherry-pick", the second %s a SHA1 |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1472 | #: sequencer.c:504 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1473 | #, c-format |
| 1474 | msgid "%s: cannot parse parent commit %s" |
| 1475 | msgstr "%s: не удалось разобрать родительский коммит для %s" |
| 1476 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1477 | #: sequencer.c:508 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1478 | #, c-format |
| 1479 | msgid "Cannot get commit message for %s" |
| 1480 | msgstr "Не удалось получить сообщение коммита для %s" |
| 1481 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1482 | #: sequencer.c:594 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1483 | #, c-format |
| 1484 | msgid "could not revert %s... %s" |
| 1485 | msgstr "не удалось возвратить коммит %s… %s" |
| 1486 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1487 | #: sequencer.c:595 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1488 | #, c-format |
| 1489 | msgid "could not apply %s... %s" |
| 1490 | msgstr "не удалось применить коммит %s… %s" |
| 1491 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1492 | #: sequencer.c:630 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1493 | msgid "empty commit set passed" |
| 1494 | msgstr "передан пустой набор коммитов" |
| 1495 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1496 | #: sequencer.c:638 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1497 | #, c-format |
| 1498 | msgid "git %s: failed to read the index" |
| 1499 | msgstr "git %s: сбой чтения индекса" |
| 1500 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1501 | #: sequencer.c:642 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1502 | #, c-format |
| 1503 | msgid "git %s: failed to refresh the index" |
| 1504 | msgstr "git %s: сбой обновления индекса" |
| 1505 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1506 | #: sequencer.c:702 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1507 | #, c-format |
| 1508 | msgid "Cannot %s during a %s" |
| 1509 | msgstr "Не удалось %s во время %s" |
| 1510 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1511 | #: sequencer.c:724 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1512 | #, c-format |
| 1513 | msgid "Could not parse line %d." |
| 1514 | msgstr "Не удалось разобрать строку %d." |
| 1515 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1516 | #: sequencer.c:729 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1517 | msgid "No commits parsed." |
| 1518 | msgstr "Коммиты не разобраны." |
| 1519 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1520 | #: sequencer.c:741 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1521 | #, c-format |
| 1522 | msgid "Could not open %s" |
| 1523 | msgstr "Не удалось открыть %s" |
| 1524 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1525 | #: sequencer.c:745 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1526 | #, c-format |
| 1527 | msgid "Could not read %s." |
| 1528 | msgstr "Не удалось прочитать %s." |
| 1529 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1530 | #: sequencer.c:752 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1531 | #, c-format |
| 1532 | msgid "Unusable instruction sheet: %s" |
| 1533 | msgstr "Непригодная для использования карта с инструкциями: %s" |
| 1534 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1535 | #: sequencer.c:782 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1536 | #, c-format |
| 1537 | msgid "Invalid key: %s" |
| 1538 | msgstr "Недействительный ключ: %s" |
| 1539 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1540 | #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1541 | #, c-format |
| 1542 | msgid "Invalid value for %s: %s" |
| 1543 | msgstr "Неправильное значение %s: %s" |
| 1544 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1545 | #: sequencer.c:795 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1546 | #, c-format |
| 1547 | msgid "Malformed options sheet: %s" |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1548 | msgstr "Повреждённая карта с опциями: %s" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1549 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1550 | #: sequencer.c:814 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1551 | msgid "a cherry-pick or revert is already in progress" |
| 1552 | msgstr "отбор лучшего или возврат коммита уже выполняется" |
| 1553 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1554 | #: sequencer.c:815 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1555 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
| 1556 | msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" |
| 1557 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1558 | #: sequencer.c:819 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1559 | #, c-format |
| 1560 | msgid "Could not create sequencer directory %s" |
| 1561 | msgstr "Не удалось создать каталог для указателя следования коммитов %s" |
| 1562 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1563 | #: sequencer.c:835 sequencer.c:917 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1564 | #, c-format |
| 1565 | msgid "Error wrapping up %s." |
| 1566 | msgstr "Ошибка оборачивания %s." |
| 1567 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1568 | #: sequencer.c:854 sequencer.c:987 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1569 | msgid "no cherry-pick or revert in progress" |
| 1570 | msgstr "отбор лучшего или возврат коммита не выполняется" |
| 1571 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1572 | #: sequencer.c:856 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1573 | msgid "cannot resolve HEAD" |
| 1574 | msgstr "не удалось определить HEAD" |
| 1575 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1576 | #: sequencer.c:858 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1577 | msgid "cannot abort from a branch yet to be born" |
| 1578 | msgstr "нельзя отменить изменения с ветки, которая еще не создана" |
| 1579 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1580 | #: sequencer.c:878 builtin/apply.c:4287 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1581 | #, c-format |
| 1582 | msgid "cannot open %s: %s" |
| 1583 | msgstr "не удалось открыть %s: %s" |
| 1584 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1585 | #: sequencer.c:881 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1586 | #, c-format |
| 1587 | msgid "cannot read %s: %s" |
| 1588 | msgstr "не удалось прочитать %s: %s" |
| 1589 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1590 | #: sequencer.c:882 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1591 | msgid "unexpected end of file" |
| 1592 | msgstr "неожиданный конец файла" |
| 1593 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1594 | #: sequencer.c:888 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1595 | #, c-format |
| 1596 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" |
| 1597 | msgstr "сохраненный файл с HEAD перед отбором лучшего «%s» поврежден" |
| 1598 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1599 | #: sequencer.c:910 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1600 | #, c-format |
| 1601 | msgid "Could not format %s." |
| 1602 | msgstr "Не удалось отформатировать %s." |
| 1603 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1604 | #: sequencer.c:1055 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1605 | #, c-format |
| 1606 | msgid "%s: can't cherry-pick a %s" |
| 1607 | msgstr "%s: не удалось отобрать %s" |
| 1608 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1609 | #: sequencer.c:1058 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1610 | #, c-format |
| 1611 | msgid "%s: bad revision" |
| 1612 | msgstr "%s: плохая редакция" |
| 1613 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1614 | #: sequencer.c:1092 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1615 | msgid "Can't revert as initial commit" |
| 1616 | msgstr "Нельзя возвратить изначальный коммит" |
| 1617 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1618 | #: sequencer.c:1093 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1619 | msgid "Can't cherry-pick into empty head" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1620 | msgstr "Нельзя отобрать лучшее в пустую ветку" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1621 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1622 | #: setup.c:246 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1623 | #, c-format |
| 1624 | msgid "failed to read %s" |
| 1625 | msgstr "не удалось прочитать %s" |
| 1626 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1627 | #: sha1_file.c:1080 |
| 1628 | msgid "offset before end of packfile (broken .idx?)" |
| 1629 | msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" |
| 1630 | |
| 1631 | #: sha1_file.c:2459 |
| 1632 | #, c-format |
| 1633 | msgid "offset before start of pack index for %s (corrupt index?)" |
| 1634 | msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" |
| 1635 | |
| 1636 | #: sha1_file.c:2463 |
| 1637 | #, c-format |
| 1638 | msgid "offset beyond end of pack index for %s (truncated index?)" |
| 1639 | msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" |
| 1640 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1641 | #: sha1_name.c:462 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1642 | msgid "" |
| 1643 | "Git normally never creates a ref that ends with 40 hex characters\n" |
| 1644 | "because it will be ignored when you just specify 40-hex. These refs\n" |
| 1645 | "may be created by mistake. For example,\n" |
| 1646 | "\n" |
| 1647 | " git checkout -b $br $(git rev-parse ...)\n" |
| 1648 | "\n" |
| 1649 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" |
| 1650 | "examine these refs and maybe delete them. Turn this message off by\n" |
| 1651 | "running \"git config advice.objectNameWarning false\"" |
| 1652 | msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»" |
| 1653 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1654 | #: submodule.c:62 submodule.c:96 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1655 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
| 1656 | msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты" |
| 1657 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1658 | #: submodule.c:66 submodule.c:100 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1659 | #, c-format |
| 1660 | msgid "Could not find section in .gitmodules where path=%s" |
| 1661 | msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s" |
| 1662 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1663 | #: submodule.c:74 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1664 | #, c-format |
| 1665 | msgid "Could not update .gitmodules entry %s" |
| 1666 | msgstr " Не удалось обновить .gitmodules запись %s" |
| 1667 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1668 | #: submodule.c:107 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1669 | #, c-format |
| 1670 | msgid "Could not remove .gitmodules entry for %s" |
| 1671 | msgstr "Не удалось удалить запись в .gitmodules для %s" |
| 1672 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1673 | #: submodule.c:118 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1674 | msgid "staging updated .gitmodules failed" |
| 1675 | msgstr "сбой индексирования обновленного .gitmodules" |
| 1676 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 1677 | #: trailer.c:237 |
| 1678 | #, c-format |
| 1679 | msgid "running trailer command '%s' failed" |
| 1680 | msgstr "сбой при запуске команды завершителя «%s»" |
| 1681 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1682 | #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 |
| 1683 | #: trailer.c:562 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1684 | #, c-format |
| 1685 | msgid "unknown value '%s' for key '%s'" |
| 1686 | msgstr "неизвестное значение «%s» для ключа «%s»" |
| 1687 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1688 | #: trailer.c:544 trailer.c:549 builtin/remote.c:289 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1689 | #, c-format |
| 1690 | msgid "more than one %s" |
| 1691 | msgstr "больше одного %s" |
| 1692 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1693 | #: trailer.c:582 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1694 | #, c-format |
| 1695 | msgid "empty trailer token in trailer '%.*s'" |
| 1696 | msgstr "пустая последняя лексема в завершителе «%.*s»" |
| 1697 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1698 | #: trailer.c:702 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1699 | #, c-format |
| 1700 | msgid "could not read input file '%s'" |
| 1701 | msgstr "не удалось прочитать входной файл «%s»" |
| 1702 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1703 | #: trailer.c:705 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1704 | msgid "could not read from stdin" |
| 1705 | msgstr "не удалось прочитать из стандартного ввода" |
| 1706 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1707 | #: trailer.c:857 builtin/am.c:42 |
| 1708 | #, c-format |
| 1709 | msgid "could not stat %s" |
| 1710 | msgstr "не удалось выполнить stat для %s" |
| 1711 | |
| 1712 | #: trailer.c:859 |
| 1713 | #, c-format |
| 1714 | msgid "file %s is not a regular file" |
| 1715 | msgstr "файл %s не является обычным файлом" |
| 1716 | |
| 1717 | #: trailer.c:861 |
| 1718 | #, c-format |
| 1719 | msgid "file %s is not writable by user" |
| 1720 | msgstr "файл %s не доступен на запись пользователю" |
| 1721 | |
| 1722 | #: trailer.c:873 |
| 1723 | msgid "could not open temporary file" |
| 1724 | msgstr "не удалось создать временный файл" |
| 1725 | |
| 1726 | #: trailer.c:912 |
| 1727 | #, c-format |
| 1728 | msgid "could not rename temporary file to %s" |
| 1729 | msgstr "не удалось переименовать временный файл в %s" |
| 1730 | |
| 1731 | #: transport-helper.c:1041 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1732 | #, c-format |
| 1733 | msgid "Could not read ref %s" |
| 1734 | msgstr "Не удалось прочитать ссылку %s" |
| 1735 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1736 | #: unpack-trees.c:203 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1737 | msgid "Checking out files" |
| 1738 | msgstr "Распаковка файлов" |
| 1739 | |
| 1740 | #: urlmatch.c:120 |
| 1741 | msgid "invalid URL scheme name or missing '://' suffix" |
| 1742 | msgstr "Неправильная имя URL схемы или пропущен суффикс «://»" |
| 1743 | |
| 1744 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 |
| 1745 | #, c-format |
| 1746 | msgid "invalid %XX escape sequence" |
| 1747 | msgstr "неправильная управляющая последовательность %XX" |
| 1748 | |
| 1749 | #: urlmatch.c:172 |
| 1750 | msgid "missing host and scheme is not 'file:'" |
| 1751 | msgstr "пропущено имя сервера и схема доступа не «file:»" |
| 1752 | |
| 1753 | #: urlmatch.c:189 |
| 1754 | msgid "a 'file:' URL may not have a port number" |
| 1755 | msgstr "URL со схемой «file:» не может содержать номер порта" |
| 1756 | |
| 1757 | #: urlmatch.c:199 |
| 1758 | msgid "invalid characters in host name" |
| 1759 | msgstr "неправильные символы в имени сервера" |
| 1760 | |
| 1761 | #: urlmatch.c:244 urlmatch.c:255 |
| 1762 | msgid "invalid port number" |
| 1763 | msgstr "неправильный номер порта" |
| 1764 | |
| 1765 | #: urlmatch.c:322 |
| 1766 | msgid "invalid '..' path segment" |
| 1767 | msgstr "неправильная часть пути «..»" |
| 1768 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1769 | #: wrapper.c:222 wrapper.c:381 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1770 | #, c-format |
| 1771 | msgid "could not open '%s' for reading and writing" |
| 1772 | msgstr "не удалось открыть «%s» для чтения и записи" |
| 1773 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1774 | #: wrapper.c:224 wrapper.c:383 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1775 | #, c-format |
| 1776 | msgid "could not open '%s' for writing" |
| 1777 | msgstr "не удалось открыть «%s» для записи" |
| 1778 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1779 | #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 |
| 1780 | #: builtin/merge.c:1075 builtin/pull.c:387 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1781 | #, c-format |
| 1782 | msgid "could not open '%s' for reading" |
| 1783 | msgstr "не удалось открыть «%s» для чтения" |
| 1784 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1785 | #: wrapper.c:611 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1786 | #, c-format |
| 1787 | msgid "unable to access '%s': %s" |
| 1788 | msgstr "«%s» недоступно: %s" |
| 1789 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1790 | #: wrapper.c:632 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1791 | #, c-format |
| 1792 | msgid "unable to access '%s'" |
| 1793 | msgstr "«%s» недоступно" |
| 1794 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1795 | #: wrapper.c:640 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1796 | msgid "unable to get current working directory" |
| 1797 | msgstr "не удалось получить текущий рабочий каталог" |
| 1798 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1799 | #: wrapper.c:667 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1800 | #, c-format |
| 1801 | msgid "could not open %s for writing" |
| 1802 | msgstr "не удалось открыть «%s» для записи" |
| 1803 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1804 | #: wrapper.c:678 builtin/am.c:410 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1805 | #, c-format |
| 1806 | msgid "could not write to %s" |
| 1807 | msgstr "не удалось записать в %s" |
| 1808 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 1809 | #: wrapper.c:684 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 1810 | #, c-format |
| 1811 | msgid "could not close %s" |
| 1812 | msgstr "не удалось закрыть %s" |
| 1813 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1814 | #: wt-status.c:149 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1815 | msgid "Unmerged paths:" |
| 1816 | msgstr "Не слитые пути:" |
| 1817 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1818 | #: wt-status.c:176 wt-status.c:203 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1819 | #, c-format |
| 1820 | msgid " (use \"git reset %s <file>...\" to unstage)" |
| 1821 | msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)" |
| 1822 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1823 | #: wt-status.c:178 wt-status.c:205 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1824 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
| 1825 | msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)" |
| 1826 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1827 | #: wt-status.c:182 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1828 | msgid " (use \"git add <file>...\" to mark resolution)" |
| 1829 | msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)" |
| 1830 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1831 | #: wt-status.c:184 wt-status.c:188 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1832 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
| 1833 | msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" |
| 1834 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1835 | #: wt-status.c:186 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1836 | msgid " (use \"git rm <file>...\" to mark resolution)" |
| 1837 | msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" |
| 1838 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1839 | #: wt-status.c:197 wt-status.c:880 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1840 | msgid "Changes to be committed:" |
| 1841 | msgstr "Изменения, которые будут включены в коммит:" |
| 1842 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1843 | #: wt-status.c:215 wt-status.c:889 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1844 | msgid "Changes not staged for commit:" |
| 1845 | msgstr "Изменения, которые не в индексе для коммита:" |
| 1846 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1847 | #: wt-status.c:219 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1848 | msgid " (use \"git add <file>...\" to update what will be committed)" |
| 1849 | msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)" |
| 1850 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1851 | #: wt-status.c:221 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1852 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
| 1853 | msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)" |
| 1854 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1855 | #: wt-status.c:222 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1856 | msgid "" |
| 1857 | " (use \"git checkout -- <file>...\" to discard changes in working " |
| 1858 | "directory)" |
| 1859 | msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)" |
| 1860 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1861 | #: wt-status.c:224 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1862 | msgid " (commit or discard the untracked or modified content in submodules)" |
| 1863 | msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)" |
| 1864 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1865 | #: wt-status.c:236 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1866 | #, c-format |
| 1867 | msgid " (use \"git %s <file>...\" to include in what will be committed)" |
| 1868 | msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" |
| 1869 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1870 | #: wt-status.c:251 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1871 | msgid "both deleted:" |
| 1872 | msgstr "оба удалены:" |
| 1873 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1874 | #: wt-status.c:253 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1875 | msgid "added by us:" |
| 1876 | msgstr "добавлено нами:" |
| 1877 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1878 | #: wt-status.c:255 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1879 | msgid "deleted by them:" |
| 1880 | msgstr "удалено ими:" |
| 1881 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1882 | #: wt-status.c:257 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1883 | msgid "added by them:" |
| 1884 | msgstr "добавлено ими:" |
| 1885 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1886 | #: wt-status.c:259 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1887 | msgid "deleted by us:" |
| 1888 | msgstr "удалено нами:" |
| 1889 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1890 | #: wt-status.c:261 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1891 | msgid "both added:" |
| 1892 | msgstr "оба добавлены:" |
| 1893 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1894 | #: wt-status.c:263 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1895 | msgid "both modified:" |
| 1896 | msgstr "оба измены:" |
| 1897 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1898 | #: wt-status.c:265 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1899 | #, c-format |
| 1900 | msgid "bug: unhandled unmerged status %x" |
| 1901 | msgstr "ошибка: необработанный статус не слитых изменений %x" |
| 1902 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1903 | #: wt-status.c:273 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1904 | msgid "new file:" |
| 1905 | msgstr "новый файл:" |
| 1906 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1907 | #: wt-status.c:275 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1908 | msgid "copied:" |
| 1909 | msgstr "скопировано:" |
| 1910 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1911 | #: wt-status.c:277 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1912 | msgid "deleted:" |
| 1913 | msgstr "удалено:" |
| 1914 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1915 | #: wt-status.c:279 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1916 | msgid "modified:" |
| 1917 | msgstr "изменено:" |
| 1918 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1919 | #: wt-status.c:281 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1920 | msgid "renamed:" |
| 1921 | msgstr "переименовано:" |
| 1922 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1923 | #: wt-status.c:283 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1924 | msgid "typechange:" |
| 1925 | msgstr "изменен тип:" |
| 1926 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1927 | #: wt-status.c:285 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1928 | msgid "unknown:" |
| 1929 | msgstr "неизвестно:" |
| 1930 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1931 | #: wt-status.c:287 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1932 | msgid "unmerged:" |
| 1933 | msgstr "не слитые:" |
| 1934 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1935 | #: wt-status.c:369 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1936 | msgid "new commits, " |
| 1937 | msgstr "новые коммиты, " |
| 1938 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1939 | #: wt-status.c:371 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1940 | msgid "modified content, " |
| 1941 | msgstr "изменено содержимое, " |
| 1942 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1943 | #: wt-status.c:373 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1944 | msgid "untracked content, " |
| 1945 | msgstr "неотслеживаемое содержимое, " |
| 1946 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1947 | #: wt-status.c:390 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1948 | #, c-format |
| 1949 | msgid "bug: unhandled diff status %c" |
| 1950 | msgstr "ошибка: необработанный статус изменений %c" |
| 1951 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1952 | #: wt-status.c:754 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1953 | msgid "Submodules changed but not updated:" |
| 1954 | msgstr "Измененные, но не обновленные подмодули:" |
| 1955 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1956 | #: wt-status.c:756 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1957 | msgid "Submodule changes to be committed:" |
| 1958 | msgstr "Изменения в подмодулях, которые будут закоммичены:" |
| 1959 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1960 | #: wt-status.c:837 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1961 | msgid "" |
| 1962 | "Do not touch the line above.\n" |
| 1963 | "Everything below will be removed." |
| 1964 | msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено." |
| 1965 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1966 | #: wt-status.c:948 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1967 | msgid "You have unmerged paths." |
| 1968 | msgstr "У вас есть не слитые пути." |
| 1969 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1970 | #: wt-status.c:951 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1971 | msgid " (fix conflicts and run \"git commit\")" |
| 1972 | msgstr " (разрешите конфликты, затем запустите «git commit»)" |
| 1973 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1974 | #: wt-status.c:954 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1975 | msgid "All conflicts fixed but you are still merging." |
| 1976 | msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." |
| 1977 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1978 | #: wt-status.c:957 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1979 | msgid " (use \"git commit\" to conclude merge)" |
| 1980 | msgstr " (используйте «git commit», чтобы завершить слияние)" |
| 1981 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1982 | #: wt-status.c:967 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1983 | msgid "You are in the middle of an am session." |
| 1984 | msgstr "Вы в процессе сессии am." |
| 1985 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1986 | #: wt-status.c:970 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1987 | msgid "The current patch is empty." |
| 1988 | msgstr "Текущий патч пустой." |
| 1989 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1990 | #: wt-status.c:974 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1991 | msgid " (fix conflicts and then run \"git am --continue\")" |
| 1992 | msgstr " (разрешите конфликты, затем запустите «git am --continue»)" |
| 1993 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1994 | #: wt-status.c:976 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1995 | msgid " (use \"git am --skip\" to skip this patch)" |
| 1996 | msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" |
| 1997 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 1998 | #: wt-status.c:978 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 1999 | msgid " (use \"git am --abort\" to restore the original branch)" |
| 2000 | msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" |
| 2001 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2002 | #: wt-status.c:1105 |
| 2003 | msgid "No commands done." |
| 2004 | msgstr "Команды не выполнены." |
| 2005 | |
| 2006 | #: wt-status.c:1108 |
| 2007 | #, c-format |
| 2008 | msgid "Last command done (%d command done):" |
| 2009 | msgid_plural "Last commands done (%d commands done):" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2010 | msgstr[0] "Последняя команда выполнена (%d команда выполнена):" |
| 2011 | msgstr[1] "Последняя команда выполнена (%d команды выполнено):" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2012 | msgstr[2] "Последняя команда выполнена (%d команд выполнено):" |
| 2013 | msgstr[3] "Последняя команда выполнена (%d команд выполнено):" |
| 2014 | |
| 2015 | #: wt-status.c:1119 |
| 2016 | #, c-format |
| 2017 | msgid " (see more in file %s)" |
| 2018 | msgstr " (смотрите дополнительно в файле %s)" |
| 2019 | |
| 2020 | #: wt-status.c:1124 |
| 2021 | msgid "No commands remaining." |
| 2022 | msgstr "Команд больше не осталось." |
| 2023 | |
| 2024 | #: wt-status.c:1127 |
| 2025 | #, c-format |
| 2026 | msgid "Next command to do (%d remaining command):" |
| 2027 | msgid_plural "Next commands to do (%d remaining commands):" |
| 2028 | msgstr[0] "Следующая команда для выполнения (%d команда осталась):" |
| 2029 | msgstr[1] "Следующая команда для выполнения (%d команды осталось):" |
| 2030 | msgstr[2] "Следующая команда для выполнения (%d команд осталось):" |
| 2031 | msgstr[3] "Следующая команда для выполнения (%d команд осталось):" |
| 2032 | |
| 2033 | #: wt-status.c:1135 |
| 2034 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
| 2035 | msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)" |
| 2036 | |
| 2037 | #: wt-status.c:1148 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2038 | #, c-format |
| 2039 | msgid "You are currently rebasing branch '%s' on '%s'." |
| 2040 | msgstr "Вы сейчас перемещаете ветку «%s» над «%s»." |
| 2041 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2042 | #: wt-status.c:1153 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2043 | msgid "You are currently rebasing." |
| 2044 | msgstr "Вы сейчас перемещаете ветку." |
| 2045 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2046 | #: wt-status.c:1167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2047 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
| 2048 | msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)" |
| 2049 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2050 | #: wt-status.c:1169 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2051 | msgid " (use \"git rebase --skip\" to skip this patch)" |
| 2052 | msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)" |
| 2053 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2054 | #: wt-status.c:1171 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2055 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
| 2056 | msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)" |
| 2057 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2058 | #: wt-status.c:1177 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2059 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
| 2060 | msgstr " (все конфликты разрешены: запустите «git rebase --continue»)" |
| 2061 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2062 | #: wt-status.c:1181 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2063 | #, c-format |
| 2064 | msgid "" |
| 2065 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
| 2066 | msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»." |
| 2067 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2068 | #: wt-status.c:1186 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2069 | msgid "You are currently splitting a commit during a rebase." |
| 2070 | msgstr "Вы сейчас разделяете коммит при перемещении ветки." |
| 2071 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2072 | #: wt-status.c:1189 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2073 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
| 2074 | msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)" |
| 2075 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2076 | #: wt-status.c:1193 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2077 | #, c-format |
| 2078 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." |
| 2079 | msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»." |
| 2080 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2081 | #: wt-status.c:1198 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2082 | msgid "You are currently editing a commit during a rebase." |
| 2083 | msgstr "Вы сейчас редактируете коммит при перемещении ветки." |
| 2084 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2085 | #: wt-status.c:1201 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2086 | msgid " (use \"git commit --amend\" to amend the current commit)" |
| 2087 | msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)" |
| 2088 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2089 | #: wt-status.c:1203 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2090 | msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" |
| 2091 | msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)" |
| 2092 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2093 | #: wt-status.c:1213 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2094 | #, c-format |
| 2095 | msgid "You are currently cherry-picking commit %s." |
| 2096 | msgstr "Вы сейчас отбираете лучший коммит %s." |
| 2097 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2098 | #: wt-status.c:1218 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2099 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
| 2100 | msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)" |
| 2101 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2102 | #: wt-status.c:1221 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2103 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
| 2104 | msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)" |
| 2105 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2106 | #: wt-status.c:1223 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2107 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
| 2108 | msgstr " (используйте «git cherry-pick --abort», чтобы отменить операцию отбора лучшего)" |
| 2109 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2110 | #: wt-status.c:1232 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2111 | #, c-format |
| 2112 | msgid "You are currently reverting commit %s." |
| 2113 | msgstr "Вы сейчас возвращаете коммит %s." |
| 2114 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2115 | #: wt-status.c:1237 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2116 | msgid " (fix conflicts and run \"git revert --continue\")" |
| 2117 | msgstr " (разрешите конфликты, затем запустите «git revert --continue»)" |
| 2118 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2119 | #: wt-status.c:1240 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2120 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
| 2121 | msgstr " (все конфликты разрешены: запустите «git revert --continue»)" |
| 2122 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2123 | #: wt-status.c:1242 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2124 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
| 2125 | msgstr " (используйте «git revert --abort», чтобы отменить операцию возврата)" |
| 2126 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2127 | #: wt-status.c:1253 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2128 | #, c-format |
| 2129 | msgid "You are currently bisecting, started from branch '%s'." |
| 2130 | msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»." |
| 2131 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2132 | #: wt-status.c:1257 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2133 | msgid "You are currently bisecting." |
| 2134 | msgstr "Вы сейчас в процессе двоичного поиска." |
| 2135 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2136 | #: wt-status.c:1260 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2137 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
| 2138 | msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)" |
| 2139 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2140 | #: wt-status.c:1438 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2141 | msgid "On branch " |
| 2142 | msgstr "На ветке " |
| 2143 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2144 | #: wt-status.c:1444 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2145 | msgid "interactive rebase in progress; onto " |
| 2146 | msgstr "интерактивное перемещение в процессе; над " |
| 2147 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2148 | #: wt-status.c:1446 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2149 | msgid "rebase in progress; onto " |
| 2150 | msgstr "перемещение в процессе; над " |
| 2151 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2152 | #: wt-status.c:1451 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2153 | msgid "HEAD detached at " |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2154 | msgstr "HEAD отделён на " |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2155 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2156 | #: wt-status.c:1453 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2157 | msgid "HEAD detached from " |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2158 | msgstr "HEAD отделён начиная с " |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2159 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2160 | #: wt-status.c:1456 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2161 | msgid "Not currently on any branch." |
| 2162 | msgstr "Сейчас ни на одной из веток" |
| 2163 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2164 | #: wt-status.c:1474 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2165 | msgid "Initial commit" |
| 2166 | msgstr "Начальный коммит" |
| 2167 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2168 | #: wt-status.c:1488 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2169 | msgid "Untracked files" |
| 2170 | msgstr "Неотслеживаемые файлы" |
| 2171 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2172 | #: wt-status.c:1490 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2173 | msgid "Ignored files" |
| 2174 | msgstr "Игнорируемые файлы" |
| 2175 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2176 | #: wt-status.c:1494 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2177 | #, c-format |
| 2178 | msgid "" |
| 2179 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" |
| 2180 | "may speed it up, but you have to be careful not to forget to add\n" |
| 2181 | "new files yourself (see 'git help status')." |
| 2182 | msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)." |
| 2183 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2184 | #: wt-status.c:1500 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2185 | #, c-format |
| 2186 | msgid "Untracked files not listed%s" |
| 2187 | msgstr "Неотслеживаемые файлы не показаны%s" |
| 2188 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2189 | #: wt-status.c:1502 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2190 | msgid " (use -u option to show untracked files)" |
| 2191 | msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)" |
| 2192 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2193 | #: wt-status.c:1508 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2194 | msgid "No changes" |
| 2195 | msgstr "Нет изменений" |
| 2196 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2197 | #: wt-status.c:1513 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2198 | #, c-format |
| 2199 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
| 2200 | msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n" |
| 2201 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2202 | #: wt-status.c:1516 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2203 | #, c-format |
| 2204 | msgid "no changes added to commit\n" |
| 2205 | msgstr "нет изменений добавленных для коммита\n" |
| 2206 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2207 | #: wt-status.c:1519 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2208 | #, c-format |
| 2209 | msgid "" |
| 2210 | "nothing added to commit but untracked files present (use \"git add\" to " |
| 2211 | "track)\n" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2212 | msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2213 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2214 | #: wt-status.c:1522 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2215 | #, c-format |
| 2216 | msgid "nothing added to commit but untracked files present\n" |
| 2217 | msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n" |
| 2218 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2219 | #: wt-status.c:1525 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2220 | #, c-format |
| 2221 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
| 2222 | msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n" |
| 2223 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2224 | #: wt-status.c:1528 wt-status.c:1533 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2225 | #, c-format |
| 2226 | msgid "nothing to commit\n" |
| 2227 | msgstr "нечего коммитить\n" |
| 2228 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2229 | #: wt-status.c:1531 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2230 | #, c-format |
| 2231 | msgid "nothing to commit (use -u to show untracked files)\n" |
| 2232 | msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n" |
| 2233 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2234 | #: wt-status.c:1535 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2235 | #, c-format |
| 2236 | msgid "nothing to commit, working directory clean\n" |
| 2237 | msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" |
| 2238 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2239 | #: wt-status.c:1642 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2240 | msgid "Initial commit on " |
| 2241 | msgstr "Начальный коммит на " |
| 2242 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2243 | #: wt-status.c:1646 |
| 2244 | msgid "HEAD (no branch)" |
| 2245 | msgstr "HEAD (нет ветки)" |
| 2246 | |
| 2247 | #: wt-status.c:1675 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2248 | msgid "gone" |
| 2249 | msgstr "исчез" |
| 2250 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2251 | #: wt-status.c:1677 wt-status.c:1685 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2252 | msgid "behind " |
| 2253 | msgstr "позади" |
| 2254 | |
Dimitriy Ryazantcev | da0e97d | 2016-03-15 20:55:36 +0200 | [diff] [blame] | 2255 | #: wt-status.c:1680 wt-status.c:1683 |
| 2256 | msgid "ahead " |
| 2257 | msgstr "впереди " |
| 2258 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2259 | #: compat/precompose_utf8.c:57 builtin/clone.c:413 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2260 | #, c-format |
| 2261 | msgid "failed to unlink '%s'" |
| 2262 | msgstr "сбой отсоединения «%s»" |
| 2263 | |
| 2264 | #: builtin/add.c:22 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 2265 | msgid "git add [<options>] [--] <pathspec>..." |
| 2266 | msgstr "git add [<опции>] [--] <спецификация-пути>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2267 | |
| 2268 | #: builtin/add.c:65 |
| 2269 | #, c-format |
| 2270 | msgid "unexpected diff status %c" |
| 2271 | msgstr "неожиданный статус различий %c" |
| 2272 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2273 | #: builtin/add.c:70 builtin/commit.c:278 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2274 | msgid "updating files failed" |
| 2275 | msgstr "сбой при обновлении файлов" |
| 2276 | |
| 2277 | #: builtin/add.c:80 |
| 2278 | #, c-format |
| 2279 | msgid "remove '%s'\n" |
| 2280 | msgstr "удалить «%s»\n" |
| 2281 | |
| 2282 | #: builtin/add.c:134 |
| 2283 | msgid "Unstaged changes after refreshing the index:" |
| 2284 | msgstr "Непроиндексированные изменения после обновления индекса:" |
| 2285 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2286 | #: builtin/add.c:194 builtin/rev-parse.c:797 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2287 | msgid "Could not read the index" |
| 2288 | msgstr "Не удалось прочитать индекс" |
| 2289 | |
| 2290 | #: builtin/add.c:205 |
| 2291 | #, c-format |
| 2292 | msgid "Could not open '%s' for writing." |
| 2293 | msgstr "Не удалось открыть «%s» для записи." |
| 2294 | |
| 2295 | #: builtin/add.c:209 |
| 2296 | msgid "Could not write patch" |
| 2297 | msgstr "Не удалось записать патч" |
| 2298 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2299 | #: builtin/add.c:212 |
| 2300 | msgid "editing patch failed" |
| 2301 | msgstr "сбой при редактировании патча" |
| 2302 | |
| 2303 | #: builtin/add.c:215 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2304 | #, c-format |
| 2305 | msgid "Could not stat '%s'" |
| 2306 | msgstr "Не удалось выполнить stat для «%s»" |
| 2307 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2308 | #: builtin/add.c:217 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2309 | msgid "Empty patch. Aborted." |
| 2310 | msgstr "Пустой патч. Операция прервана." |
| 2311 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2312 | #: builtin/add.c:222 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2313 | #, c-format |
| 2314 | msgid "Could not apply '%s'" |
| 2315 | msgstr "Не удалось применить «%s»" |
| 2316 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2317 | #: builtin/add.c:232 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2318 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
| 2319 | msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n" |
| 2320 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2321 | #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 |
| 2322 | #: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 |
| 2323 | #: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2324 | msgid "dry run" |
| 2325 | msgstr "пробный запуск" |
| 2326 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2327 | #: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2328 | #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2329 | #: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2330 | msgid "be verbose" |
| 2331 | msgstr "быть многословнее" |
| 2332 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2333 | #: builtin/add.c:252 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2334 | msgid "interactive picking" |
| 2335 | msgstr "интерактивный выбор" |
| 2336 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2337 | #: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2338 | msgid "select hunks interactively" |
| 2339 | msgstr "интерактивный выбор блоков" |
| 2340 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2341 | #: builtin/add.c:254 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2342 | msgid "edit current diff and apply" |
| 2343 | msgstr "отредактировать текущий файл различий и применить его" |
| 2344 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2345 | #: builtin/add.c:255 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2346 | msgid "allow adding otherwise ignored files" |
| 2347 | msgstr "разрешить добавление игнорируемых иначе файлов" |
| 2348 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2349 | #: builtin/add.c:256 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2350 | msgid "update tracked files" |
| 2351 | msgstr "обновить отслеживаемые файлы" |
| 2352 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2353 | #: builtin/add.c:257 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2354 | msgid "record only the fact that the path will be added later" |
| 2355 | msgstr "записать только факт, что путь будет добавлен позже" |
| 2356 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2357 | #: builtin/add.c:258 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2358 | msgid "add changes from all tracked and untracked files" |
| 2359 | msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов" |
| 2360 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2361 | #: builtin/add.c:261 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2362 | msgid "ignore paths removed in the working tree (same as --no-all)" |
| 2363 | msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" |
| 2364 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2365 | #: builtin/add.c:263 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2366 | msgid "don't add, only refresh the index" |
| 2367 | msgstr "не добавлять, только обновить индекс" |
| 2368 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2369 | #: builtin/add.c:264 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2370 | msgid "just skip files which cannot be added because of errors" |
| 2371 | msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок" |
| 2372 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2373 | #: builtin/add.c:265 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2374 | msgid "check if - even missing - files are ignored in dry run" |
| 2375 | msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске" |
| 2376 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2377 | #: builtin/add.c:287 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2378 | #, c-format |
| 2379 | msgid "Use -f if you really want to add them.\n" |
| 2380 | msgstr "Используйте -f, если вы действительно хотите добавить их.\n" |
| 2381 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2382 | #: builtin/add.c:294 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2383 | msgid "adding files failed" |
| 2384 | msgstr "ошибка при добавлении файлов" |
| 2385 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2386 | #: builtin/add.c:330 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2387 | msgid "-A and -u are mutually incompatible" |
| 2388 | msgstr "-A и -u нельзя использовать одновременно" |
| 2389 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2390 | #: builtin/add.c:337 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2391 | msgid "Option --ignore-missing can only be used together with --dry-run" |
| 2392 | msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run" |
| 2393 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2394 | #: builtin/add.c:352 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2395 | #, c-format |
| 2396 | msgid "Nothing specified, nothing added.\n" |
| 2397 | msgstr "Ничего не указано, ничего не добавлено.\n" |
| 2398 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2399 | #: builtin/add.c:353 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2400 | #, c-format |
| 2401 | msgid "Maybe you wanted to say 'git add .'?\n" |
| 2402 | msgstr "Возможно, вы имели в виду «git add .»?\n" |
| 2403 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2404 | #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 |
| 2405 | #: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 |
| 2406 | #: builtin/submodule--helper.c:35 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2407 | msgid "index file corrupt" |
| 2408 | msgstr "файл индекса поврежден" |
| 2409 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2410 | #: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2411 | msgid "Unable to write new index file" |
| 2412 | msgstr "Не удалось записать новый файл индекса" |
| 2413 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2414 | #: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2415 | #, c-format |
| 2416 | msgid "could not read '%s'" |
| 2417 | msgstr "не удалось прочитать «%s»" |
| 2418 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2419 | #: builtin/am.c:430 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2420 | msgid "could not parse author script" |
| 2421 | msgstr "не удалось разобрать сценарий авторства" |
| 2422 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2423 | #: builtin/am.c:507 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2424 | #, c-format |
| 2425 | msgid "'%s' was deleted by the applypatch-msg hook" |
| 2426 | msgstr "«%s» был удален перехватчиком applypatch-msg" |
| 2427 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2428 | #: builtin/am.c:548 builtin/notes.c:300 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2429 | #, c-format |
| 2430 | msgid "Malformed input line: '%s'." |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 2431 | msgstr "Неправильная строка ввода: «%s»." |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2432 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2433 | #: builtin/am.c:585 builtin/notes.c:315 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2434 | #, c-format |
| 2435 | msgid "Failed to copy notes from '%s' to '%s'" |
| 2436 | msgstr "Не удалось скопировать заметку из «%s» в «%s»" |
| 2437 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2438 | #: builtin/am.c:611 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2439 | msgid "fseek failed" |
| 2440 | msgstr "сбой при выполнении fseek" |
| 2441 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2442 | #: builtin/am.c:772 builtin/am.c:860 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2443 | #, c-format |
| 2444 | msgid "could not open '%s' for reading: %s" |
| 2445 | msgstr "не удалось открыть «%s» для чтения: %s" |
| 2446 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2447 | #: builtin/am.c:779 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2448 | #, c-format |
| 2449 | msgid "could not open '%s' for writing: %s" |
| 2450 | msgstr "не удалось открыть «%s» для записи: %s" |
| 2451 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2452 | #: builtin/am.c:788 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2453 | #, c-format |
| 2454 | msgid "could not parse patch '%s'" |
| 2455 | msgstr "не удалось разобрать патч «%s»" |
| 2456 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2457 | #: builtin/am.c:853 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2458 | msgid "Only one StGIT patch series can be applied at once" |
| 2459 | msgstr "Только серия патчей StGIT может быть применена за раз" |
| 2460 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2461 | #: builtin/am.c:901 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2462 | msgid "invalid timestamp" |
| 2463 | msgstr "недопустимая метка даты/времени" |
| 2464 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2465 | #: builtin/am.c:904 builtin/am.c:912 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2466 | msgid "invalid Date line" |
| 2467 | msgstr "недопустимая строка даты" |
| 2468 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2469 | #: builtin/am.c:909 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2470 | msgid "invalid timezone offset" |
| 2471 | msgstr "недопустимое смещение часового пояса" |
| 2472 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2473 | #: builtin/am.c:996 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2474 | msgid "Patch format detection failed." |
| 2475 | msgstr "Сбой определения формата патча." |
| 2476 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2477 | #: builtin/am.c:1001 builtin/clone.c:378 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2478 | #, c-format |
| 2479 | msgid "failed to create directory '%s'" |
| 2480 | msgstr "не удалось создать каталог «%s»" |
| 2481 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2482 | #: builtin/am.c:1005 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2483 | msgid "Failed to split patches." |
| 2484 | msgstr "Не удалось разделить патчи на части." |
| 2485 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2486 | #: builtin/am.c:1137 builtin/commit.c:363 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2487 | msgid "unable to write index file" |
| 2488 | msgstr "не удалось записать индекс" |
| 2489 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2490 | #: builtin/am.c:1188 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2491 | #, c-format |
| 2492 | msgid "When you have resolved this problem, run \"%s --continue\"." |
| 2493 | msgstr "Когда вы устраните эту проблему, запустите «%s --continue»." |
| 2494 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2495 | #: builtin/am.c:1189 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2496 | #, c-format |
| 2497 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
| 2498 | msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»." |
| 2499 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2500 | #: builtin/am.c:1190 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2501 | #, c-format |
| 2502 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
| 2503 | msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»." |
| 2504 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2505 | #: builtin/am.c:1328 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2506 | msgid "Patch is empty. Was it split wrong?" |
| 2507 | msgstr "Патч пуст. Возможно, он был неправильно разделён?" |
| 2508 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2509 | #: builtin/am.c:1402 builtin/log.c:1350 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2510 | #, c-format |
| 2511 | msgid "invalid ident line: %s" |
| 2512 | msgstr "неправильная строка идентификации: %s" |
| 2513 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2514 | #: builtin/am.c:1429 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2515 | #, c-format |
| 2516 | msgid "unable to parse commit %s" |
| 2517 | msgstr "не удалось разобрать коммит %s" |
| 2518 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2519 | #: builtin/am.c:1631 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2520 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
| 2521 | msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию." |
| 2522 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2523 | #: builtin/am.c:1633 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2524 | msgid "Using index info to reconstruct a base tree..." |
| 2525 | msgstr "Использую индекс для реконструкции базового дерева…" |
| 2526 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2527 | #: builtin/am.c:1652 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2528 | msgid "" |
| 2529 | "Did you hand edit your patch?\n" |
| 2530 | "It does not apply to blobs recorded in its index." |
| 2531 | msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке." |
| 2532 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2533 | #: builtin/am.c:1658 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2534 | msgid "Falling back to patching base and 3-way merge..." |
| 2535 | msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…" |
| 2536 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2537 | #: builtin/am.c:1673 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2538 | msgid "Failed to merge in the changes." |
| 2539 | msgstr "Не удалось слить изменения." |
| 2540 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2541 | #: builtin/am.c:1697 builtin/merge.c:633 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2542 | msgid "git write-tree failed to write a tree" |
| 2543 | msgstr "git write-tree не удалось записать дерево" |
| 2544 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2545 | #: builtin/am.c:1704 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2546 | msgid "applying to an empty history" |
| 2547 | msgstr "применение к пустой истории" |
| 2548 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2549 | #: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 |
| 2550 | #: builtin/merge.c:855 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2551 | msgid "failed to write commit object" |
| 2552 | msgstr "сбой записи объекта коммита" |
| 2553 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2554 | #: builtin/am.c:1749 builtin/am.c:1753 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2555 | #, c-format |
| 2556 | msgid "cannot resume: %s does not exist." |
| 2557 | msgstr "нельзя продолжнить: %s не существует " |
| 2558 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2559 | #: builtin/am.c:1769 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2560 | msgid "cannot be interactive without stdin connected to a terminal." |
| 2561 | msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу." |
| 2562 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2563 | #: builtin/am.c:1774 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2564 | msgid "Commit Body is:" |
| 2565 | msgstr "Тело коммита:" |
| 2566 | |
| 2567 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
| 2568 | #. in your translation. The program will only accept English |
| 2569 | #. input at this point. |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2570 | #: builtin/am.c:1784 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2571 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
| 2572 | msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: " |
| 2573 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2574 | #: builtin/am.c:1834 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2575 | #, c-format |
| 2576 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
| 2577 | msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)" |
| 2578 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2579 | #: builtin/am.c:1869 builtin/am.c:1941 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2580 | #, c-format |
| 2581 | msgid "Applying: %.*s" |
| 2582 | msgstr "Применение: %.*s" |
| 2583 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2584 | #: builtin/am.c:1885 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2585 | msgid "No changes -- Patch already applied." |
| 2586 | msgstr "Нет изменений — Патч уже применен." |
| 2587 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2588 | #: builtin/am.c:1893 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2589 | #, c-format |
| 2590 | msgid "Patch failed at %s %.*s" |
| 2591 | msgstr "Ошибка применения изменений на %s %.*s" |
| 2592 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2593 | #: builtin/am.c:1899 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2594 | #, c-format |
| 2595 | msgid "The copy of the patch that failed is found in: %s" |
| 2596 | msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s" |
| 2597 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2598 | #: builtin/am.c:1944 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2599 | msgid "" |
| 2600 | "No changes - did you forget to use 'git add'?\n" |
| 2601 | "If there is nothing left to stage, chances are that something else\n" |
| 2602 | "already introduced the same changes; you might want to skip this patch." |
| 2603 | msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч." |
| 2604 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2605 | #: builtin/am.c:1951 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2606 | msgid "" |
| 2607 | "You still have unmerged paths in your index.\n" |
| 2608 | "Did you forget to use 'git add'?" |
| 2609 | msgstr "У вас все еще имеются не слитые пути в индексе.\nВозможно, вы забыли вызвать «git add»?" |
| 2610 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2611 | #: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2612 | #: builtin/reset.c:316 |
| 2613 | #, c-format |
| 2614 | msgid "Could not parse object '%s'." |
| 2615 | msgstr "Не удалось разобрать объект «%s»." |
| 2616 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2617 | #: builtin/am.c:2111 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2618 | msgid "failed to clean index" |
| 2619 | msgstr "не удалось очистить индекс" |
| 2620 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2621 | #: builtin/am.c:2145 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2622 | msgid "" |
| 2623 | "You seem to have moved HEAD since the last 'am' failure.\n" |
| 2624 | "Not rewinding to ORIG_HEAD" |
| 2625 | msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется" |
| 2626 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2627 | #: builtin/am.c:2206 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2628 | #, c-format |
| 2629 | msgid "Invalid value for --patch-format: %s" |
| 2630 | msgstr "Неправильное значение для --patch-format: %s" |
| 2631 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2632 | #: builtin/am.c:2239 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2633 | msgid "git am [<options>] [(<mbox>|<Maildir>)...]" |
| 2634 | msgstr "git am [<опции>] [(<mbox>|<Maildir>)…]" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2635 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2636 | #: builtin/am.c:2240 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2637 | msgid "git am [<options>] (--continue | --skip | --abort)" |
| 2638 | msgstr "git am [<опции>] (--continue | --skip | --abort)" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2639 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2640 | #: builtin/am.c:2246 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2641 | msgid "run interactively" |
| 2642 | msgstr "запустить в интерактивном режиме" |
| 2643 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2644 | #: builtin/am.c:2248 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2645 | msgid "historical option -- no-op" |
| 2646 | msgstr "историческая опция — ничего не делает" |
| 2647 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2648 | #: builtin/am.c:2250 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2649 | msgid "allow fall back on 3way merging if needed" |
| 2650 | msgstr "разрешить откатиться к трехходовому слиянию, если нужно" |
| 2651 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2652 | #: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2653 | #: builtin/repack.c:171 |
| 2654 | msgid "be quiet" |
| 2655 | msgstr "тихий режим" |
| 2656 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2657 | #: builtin/am.c:2253 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2658 | msgid "add a Signed-off-by line to the commit message" |
| 2659 | msgstr "добавить строку Signed-off-by к сообщению коммита" |
| 2660 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2661 | #: builtin/am.c:2256 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2662 | msgid "recode into utf8 (default)" |
| 2663 | msgstr "перекодировать в utf8 (по умолчанию)" |
| 2664 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2665 | #: builtin/am.c:2258 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2666 | msgid "pass -k flag to git-mailinfo" |
| 2667 | msgstr "передать флаг -k в git-mailinfo" |
| 2668 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2669 | #: builtin/am.c:2260 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2670 | msgid "pass -b flag to git-mailinfo" |
| 2671 | msgstr "передать флаг -b в git-mailinfo" |
| 2672 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2673 | #: builtin/am.c:2262 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2674 | msgid "pass -m flag to git-mailinfo" |
| 2675 | msgstr "передать флаг -m в git-mailinfo" |
| 2676 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2677 | #: builtin/am.c:2264 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2678 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
| 2679 | msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox" |
| 2680 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2681 | #: builtin/am.c:2267 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2682 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
| 2683 | msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr" |
| 2684 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2685 | #: builtin/am.c:2270 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2686 | msgid "strip everything before a scissors line" |
| 2687 | msgstr "обрезать все до строки обрезки" |
| 2688 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2689 | #: builtin/am.c:2271 builtin/apply.c:4544 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2690 | msgid "action" |
| 2691 | msgstr "действие" |
| 2692 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2693 | #: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 |
| 2694 | #: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 |
| 2695 | #: builtin/am.c:2299 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2696 | msgid "pass it through git-apply" |
| 2697 | msgstr "передать его в git-apply" |
| 2698 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2699 | #: builtin/am.c:2280 builtin/apply.c:4568 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2700 | msgid "root" |
| 2701 | msgstr "корень" |
| 2702 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2703 | #: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 |
| 2704 | #: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 |
| 2705 | #: builtin/pull.c:171 builtin/submodule--helper.c:72 |
| 2706 | #: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2707 | msgid "path" |
| 2708 | msgstr "путь" |
| 2709 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2710 | #: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 |
| 2711 | #: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 |
| 2712 | #: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 |
| 2713 | #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 |
| 2714 | #: parse-options.h:132 parse-options.h:134 parse-options.h:244 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2715 | msgid "n" |
| 2716 | msgstr "n" |
| 2717 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2718 | #: builtin/am.c:2292 builtin/apply.c:4512 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2719 | msgid "num" |
| 2720 | msgstr "количество" |
| 2721 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2722 | #: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2723 | #: builtin/tag.c:372 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2724 | msgid "format" |
| 2725 | msgstr "формат" |
| 2726 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2727 | #: builtin/am.c:2296 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2728 | msgid "format the patch(es) are in" |
| 2729 | msgstr "формат, в котором находятся патчи" |
| 2730 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2731 | #: builtin/am.c:2302 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2732 | msgid "override error message when patch failure occurs" |
| 2733 | msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения" |
| 2734 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2735 | #: builtin/am.c:2304 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2736 | msgid "continue applying patches after resolving a conflict" |
| 2737 | msgstr "продолжить применение изменений после разрешения конфиликта" |
| 2738 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2739 | #: builtin/am.c:2307 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2740 | msgid "synonyms for --continue" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2741 | msgstr "синоним для --continue" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2742 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2743 | #: builtin/am.c:2310 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2744 | msgid "skip the current patch" |
| 2745 | msgstr "пропустить текущий патч" |
| 2746 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2747 | #: builtin/am.c:2313 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2748 | msgid "restore the original branch and abort the patching operation." |
| 2749 | msgstr "восстановить оригинальную ветку и отменить операцию применения изменений." |
| 2750 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2751 | #: builtin/am.c:2317 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2752 | msgid "lie about committer date" |
| 2753 | msgstr "соврать о дате коммитера" |
| 2754 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2755 | #: builtin/am.c:2319 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2756 | msgid "use current timestamp for author date" |
| 2757 | msgstr "использовать текущее время как время авторства" |
| 2758 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2759 | #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 |
| 2760 | #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2761 | msgid "key-id" |
| 2762 | msgstr "key-id" |
| 2763 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2764 | #: builtin/am.c:2322 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2765 | msgid "GPG-sign commits" |
| 2766 | msgstr "подписать коммиты с помощью GPG" |
| 2767 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2768 | #: builtin/am.c:2325 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2769 | msgid "(internal use for git-rebase)" |
| 2770 | msgstr "(внутреннее использование для git-rebase)" |
| 2771 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2772 | #: builtin/am.c:2340 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2773 | msgid "" |
| 2774 | "The -b/--binary option has been a no-op for long time, and\n" |
| 2775 | "it will be removed. Please do not use it anymore." |
| 2776 | msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее." |
| 2777 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2778 | #: builtin/am.c:2347 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2779 | msgid "failed to read the index" |
| 2780 | msgstr "сбой чтения индекса" |
| 2781 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2782 | #: builtin/am.c:2362 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2783 | #, c-format |
| 2784 | msgid "previous rebase directory %s still exists but mbox given." |
| 2785 | msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox." |
| 2786 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2787 | #: builtin/am.c:2386 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2788 | #, c-format |
| 2789 | msgid "" |
| 2790 | "Stray %s directory found.\n" |
| 2791 | "Use \"git am --abort\" to remove it." |
| 2792 | msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его." |
| 2793 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 2794 | #: builtin/am.c:2392 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 2795 | msgid "Resolve operation not in progress, we are not resuming." |
| 2796 | msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." |
| 2797 | |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 2798 | #: builtin/apply.c:59 |
| 2799 | msgid "git apply [<options>] [<patch>...]" |
| 2800 | msgstr "git apply [<опции>] [<патч>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2801 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2802 | #: builtin/apply.c:111 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2803 | #, c-format |
| 2804 | msgid "unrecognized whitespace option '%s'" |
| 2805 | msgstr "неопознанная опция для пробелов «%s»" |
| 2806 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2807 | #: builtin/apply.c:126 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2808 | #, c-format |
| 2809 | msgid "unrecognized whitespace ignore option '%s'" |
| 2810 | msgstr "неопознанная опция для игнорирования пробелов «%s»" |
| 2811 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2812 | #: builtin/apply.c:818 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2813 | #, c-format |
| 2814 | msgid "Cannot prepare timestamp regexp %s" |
| 2815 | msgstr "Не удалось подготовить регулярное выражение для метки времени %s" |
| 2816 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2817 | #: builtin/apply.c:827 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2818 | #, c-format |
| 2819 | msgid "regexec returned %d for input: %s" |
| 2820 | msgstr "regexec возвратил %d для ввода: %s" |
| 2821 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2822 | #: builtin/apply.c:908 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2823 | #, c-format |
| 2824 | msgid "unable to find filename in patch at line %d" |
| 2825 | msgstr "не удалось найти имя файла в строке патча %d" |
| 2826 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2827 | #: builtin/apply.c:940 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2828 | #, c-format |
| 2829 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" |
| 2830 | msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d" |
| 2831 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2832 | #: builtin/apply.c:944 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2833 | #, c-format |
| 2834 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" |
| 2835 | msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d" |
| 2836 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2837 | #: builtin/apply.c:945 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2838 | #, c-format |
| 2839 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" |
| 2840 | msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d" |
| 2841 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2842 | #: builtin/apply.c:952 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2843 | #, c-format |
| 2844 | msgid "git apply: bad git-diff - expected /dev/null on line %d" |
| 2845 | msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d" |
| 2846 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2847 | #: builtin/apply.c:1415 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2848 | #, c-format |
| 2849 | msgid "recount: unexpected line: %.*s" |
| 2850 | msgstr "recount: не ожидаемая строка: %.*s" |
| 2851 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2852 | #: builtin/apply.c:1472 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2853 | #, c-format |
| 2854 | msgid "patch fragment without header at line %d: %.*s" |
| 2855 | msgstr "фрагмент изменений без заголовка на строке %d: %.*s" |
| 2856 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2857 | #: builtin/apply.c:1489 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2858 | #, c-format |
| 2859 | msgid "" |
| 2860 | "git diff header lacks filename information when removing %d leading pathname" |
| 2861 | " component (line %d)" |
| 2862 | msgid_plural "" |
| 2863 | "git diff header lacks filename information when removing %d leading pathname" |
| 2864 | " components (line %d)" |
| 2865 | msgstr[0] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущего компонента пути к файлу (строка %d)" |
| 2866 | msgstr[1] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" |
| 2867 | msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2868 | msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2869 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2870 | #: builtin/apply.c:1655 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2871 | msgid "new file depends on old contents" |
| 2872 | msgstr "новый файл зависит от старого содержимого" |
| 2873 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2874 | #: builtin/apply.c:1657 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2875 | msgid "deleted file still has contents" |
| 2876 | msgstr "удаленный файл все еще имеет содержимое" |
| 2877 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2878 | #: builtin/apply.c:1683 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2879 | #, c-format |
| 2880 | msgid "corrupt patch at line %d" |
| 2881 | msgstr "патч поврежден на строке %d" |
| 2882 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2883 | #: builtin/apply.c:1719 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2884 | #, c-format |
| 2885 | msgid "new file %s depends on old contents" |
| 2886 | msgstr "новый файл %s зависит от старого содержимого" |
| 2887 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2888 | #: builtin/apply.c:1721 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2889 | #, c-format |
| 2890 | msgid "deleted file %s still has contents" |
| 2891 | msgstr "удаленный файл %s все еще имеет содержимое" |
| 2892 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2893 | #: builtin/apply.c:1724 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2894 | #, c-format |
| 2895 | msgid "** warning: file %s becomes empty but is not deleted" |
| 2896 | msgstr "** предупреждение: файл %s становится пустым, но не удаляется" |
| 2897 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2898 | #: builtin/apply.c:1870 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2899 | #, c-format |
| 2900 | msgid "corrupt binary patch at line %d: %.*s" |
| 2901 | msgstr "поврежденный двоичный патч на строке %d: %.*s" |
| 2902 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2903 | #: builtin/apply.c:1899 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2904 | #, c-format |
| 2905 | msgid "unrecognized binary patch at line %d" |
| 2906 | msgstr "неопознанный двоичный патч на строке %d" |
| 2907 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2908 | #: builtin/apply.c:2050 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2909 | #, c-format |
| 2910 | msgid "patch with only garbage at line %d" |
| 2911 | msgstr "патч с мусором на строке %d" |
| 2912 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2913 | #: builtin/apply.c:2140 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2914 | #, c-format |
| 2915 | msgid "unable to read symlink %s" |
| 2916 | msgstr "не удалось прочитать символьную ссылку %s" |
| 2917 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2918 | #: builtin/apply.c:2144 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2919 | #, c-format |
| 2920 | msgid "unable to open or read %s" |
| 2921 | msgstr "не удалось открыть или прочесть %s" |
| 2922 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2923 | #: builtin/apply.c:2777 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2924 | #, c-format |
| 2925 | msgid "invalid start of line: '%c'" |
| 2926 | msgstr "неправильное начало строки: «%c»" |
| 2927 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2928 | #: builtin/apply.c:2896 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2929 | #, c-format |
| 2930 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
| 2931 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." |
| 2932 | msgstr[0] "Часть #%d успешно применена на %d (со сдвигом в %d строку)." |
| 2933 | msgstr[1] "Часть #%d успешно применена на %d (со сдвигом в %d строки)." |
| 2934 | msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 2935 | msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2936 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2937 | #: builtin/apply.c:2908 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2938 | #, c-format |
| 2939 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
| 2940 | msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" |
| 2941 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2942 | #: builtin/apply.c:2914 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2943 | #, c-format |
| 2944 | msgid "" |
| 2945 | "while searching for:\n" |
| 2946 | "%.*s" |
| 2947 | msgstr "при поиске:\n%.*s" |
| 2948 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2949 | #: builtin/apply.c:2934 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2950 | #, c-format |
| 2951 | msgid "missing binary patch data for '%s'" |
| 2952 | msgstr "пропущены данные двоичного патча для «%s»" |
| 2953 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2954 | #: builtin/apply.c:3035 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2955 | #, c-format |
| 2956 | msgid "binary patch does not apply to '%s'" |
| 2957 | msgstr "не удалось применить двоичный патч к «%s»" |
| 2958 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2959 | #: builtin/apply.c:3041 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2960 | #, c-format |
| 2961 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
| 2962 | msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)" |
| 2963 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2964 | #: builtin/apply.c:3062 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2965 | #, c-format |
| 2966 | msgid "patch failed: %s:%ld" |
| 2967 | msgstr "ошибка применения изменений: %s:%ld" |
| 2968 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2969 | #: builtin/apply.c:3186 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2970 | #, c-format |
| 2971 | msgid "cannot checkout %s" |
| 2972 | msgstr "не удалось перейти на %s" |
| 2973 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2974 | #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2975 | #, c-format |
| 2976 | msgid "read of %s failed" |
| 2977 | msgstr "ошибка чтения %s" |
| 2978 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2979 | #: builtin/apply.c:3239 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 2980 | #, c-format |
| 2981 | msgid "reading from '%s' beyond a symbolic link" |
| 2982 | msgstr "чтение из «%s» за символической ссылкой" |
| 2983 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2984 | #: builtin/apply.c:3267 builtin/apply.c:3489 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2985 | #, c-format |
| 2986 | msgid "path %s has been renamed/deleted" |
| 2987 | msgstr "путь %s был переименован/удален" |
| 2988 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2989 | #: builtin/apply.c:3348 builtin/apply.c:3503 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2990 | #, c-format |
| 2991 | msgid "%s: does not exist in index" |
| 2992 | msgstr "%s: нет в индексе" |
| 2993 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2994 | #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 2995 | #, c-format |
| 2996 | msgid "%s: %s" |
| 2997 | msgstr "%s: %s" |
| 2998 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 2999 | #: builtin/apply.c:3357 builtin/apply.c:3511 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3000 | #, c-format |
| 3001 | msgid "%s: does not match index" |
| 3002 | msgstr "%s: не совпадает с индексом" |
| 3003 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3004 | #: builtin/apply.c:3459 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3005 | msgid "removal patch leaves file contents" |
| 3006 | msgstr "патч удаления не удалил содержимое файла" |
| 3007 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3008 | #: builtin/apply.c:3528 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3009 | #, c-format |
| 3010 | msgid "%s: wrong type" |
| 3011 | msgstr "%s: неправильный тип" |
| 3012 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3013 | #: builtin/apply.c:3530 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3014 | #, c-format |
| 3015 | msgid "%s has type %o, expected %o" |
| 3016 | msgstr "%s имеет тип %o, а ожидался %o" |
| 3017 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3018 | #: builtin/apply.c:3689 builtin/apply.c:3691 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3019 | #, c-format |
| 3020 | msgid "invalid path '%s'" |
| 3021 | msgstr "неправильный путь «%s»" |
| 3022 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3023 | #: builtin/apply.c:3746 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3024 | #, c-format |
| 3025 | msgid "%s: already exists in index" |
| 3026 | msgstr "%s: уже содержится в индексе" |
| 3027 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3028 | #: builtin/apply.c:3749 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3029 | #, c-format |
| 3030 | msgid "%s: already exists in working directory" |
| 3031 | msgstr "%s: уже содержится в рабочем каталоге" |
| 3032 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3033 | #: builtin/apply.c:3769 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3034 | #, c-format |
| 3035 | msgid "new mode (%o) of %s does not match old mode (%o)" |
| 3036 | msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)" |
| 3037 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3038 | #: builtin/apply.c:3774 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3039 | #, c-format |
| 3040 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
| 3041 | msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s" |
| 3042 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3043 | #: builtin/apply.c:3794 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3044 | #, c-format |
| 3045 | msgid "affected file '%s' is beyond a symbolic link" |
| 3046 | msgstr "затронутый файл «%s» находится за символической ссылкой" |
| 3047 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3048 | #: builtin/apply.c:3798 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3049 | #, c-format |
| 3050 | msgid "%s: patch does not apply" |
| 3051 | msgstr "%s: не удалось применить патч" |
| 3052 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3053 | #: builtin/apply.c:3812 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3054 | #, c-format |
| 3055 | msgid "Checking patch %s..." |
| 3056 | msgstr "Проверка патча %s…" |
| 3057 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3058 | #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3059 | #, c-format |
| 3060 | msgid "make_cache_entry failed for path '%s'" |
| 3061 | msgstr "сбой make_cache_entry для пути «%s»" |
| 3062 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3063 | #: builtin/apply.c:4048 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3064 | #, c-format |
| 3065 | msgid "unable to remove %s from index" |
| 3066 | msgstr "не удалось удалить %s из индекса" |
| 3067 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3068 | #: builtin/apply.c:4077 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3069 | #, c-format |
| 3070 | msgid "corrupt patch for submodule %s" |
| 3071 | msgstr "поврежденный патч для подмодуля %s" |
| 3072 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3073 | #: builtin/apply.c:4081 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3074 | #, c-format |
| 3075 | msgid "unable to stat newly created file '%s'" |
| 3076 | msgstr "не удалось выполнить stat для созданного файла «%s»" |
| 3077 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3078 | #: builtin/apply.c:4086 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3079 | #, c-format |
| 3080 | msgid "unable to create backing store for newly created file %s" |
| 3081 | msgstr "не удалось создать вспомогательный файл для созданного файла %s" |
| 3082 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3083 | #: builtin/apply.c:4089 builtin/apply.c:4197 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3084 | #, c-format |
| 3085 | msgid "unable to add cache entry for %s" |
| 3086 | msgstr "не удалось создать запись в кэше для %s" |
| 3087 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3088 | #: builtin/apply.c:4122 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3089 | #, c-format |
| 3090 | msgid "closing file '%s'" |
| 3091 | msgstr "закрытие файла «%s»" |
| 3092 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3093 | #: builtin/apply.c:4171 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3094 | #, c-format |
| 3095 | msgid "unable to write file '%s' mode %o" |
| 3096 | msgstr "не удалось записать файл «%s» с режимом доступа %o" |
| 3097 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3098 | #: builtin/apply.c:4258 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3099 | #, c-format |
| 3100 | msgid "Applied patch %s cleanly." |
| 3101 | msgstr "Патч %s применен без ошибок." |
| 3102 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3103 | #: builtin/apply.c:4266 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3104 | msgid "internal error" |
| 3105 | msgstr "внутренняя ошибка" |
| 3106 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3107 | #: builtin/apply.c:4269 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3108 | #, c-format |
| 3109 | msgid "Applying patch %%s with %d reject..." |
| 3110 | msgid_plural "Applying patch %%s with %d rejects..." |
| 3111 | msgstr[0] "Применение патча %%s с %d отказом…" |
| 3112 | msgstr[1] "Применение патча %%s с %d отказами…" |
| 3113 | msgstr[2] "Применение патча %%s с %d отказами…" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3114 | msgstr[3] "Применение патча %%s с %d отказами…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3115 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3116 | #: builtin/apply.c:4279 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3117 | #, c-format |
| 3118 | msgid "truncating .rej filename to %.*s.rej" |
| 3119 | msgstr "усечение имени .rej файла до %.*s.rej" |
| 3120 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3121 | #: builtin/apply.c:4300 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3122 | #, c-format |
| 3123 | msgid "Hunk #%d applied cleanly." |
| 3124 | msgstr "Блок №%d применен без ошибок." |
| 3125 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3126 | #: builtin/apply.c:4303 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3127 | #, c-format |
| 3128 | msgid "Rejected hunk #%d." |
| 3129 | msgstr "Блок №%d отклонен." |
| 3130 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3131 | #: builtin/apply.c:4393 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3132 | msgid "unrecognized input" |
| 3133 | msgstr "не распознанный ввод" |
| 3134 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3135 | #: builtin/apply.c:4404 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3136 | msgid "unable to read index file" |
| 3137 | msgstr "не удалось прочитать файл индекса" |
| 3138 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3139 | #: builtin/apply.c:4507 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3140 | msgid "don't apply changes matching the given path" |
| 3141 | msgstr "не применять изменения по указанному пути" |
| 3142 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3143 | #: builtin/apply.c:4510 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3144 | msgid "apply changes matching the given path" |
| 3145 | msgstr "применять изменения по указанному пути" |
| 3146 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3147 | #: builtin/apply.c:4513 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3148 | msgid "remove <num> leading slashes from traditional diff paths" |
| 3149 | msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений" |
| 3150 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3151 | #: builtin/apply.c:4516 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3152 | msgid "ignore additions made by the patch" |
| 3153 | msgstr "игнорировать добавления, сделанные этим патчем" |
| 3154 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3155 | #: builtin/apply.c:4518 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3156 | msgid "instead of applying the patch, output diffstat for the input" |
| 3157 | msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода" |
| 3158 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3159 | #: builtin/apply.c:4522 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3160 | msgid "show number of added and deleted lines in decimal notation" |
| 3161 | msgstr "показать количество добавленных и удаленных строк в десятичном представлении" |
| 3162 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3163 | #: builtin/apply.c:4524 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3164 | msgid "instead of applying the patch, output a summary for the input" |
| 3165 | msgstr "вместо применения патча вывести статистику изменений для ввода" |
| 3166 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3167 | #: builtin/apply.c:4526 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3168 | msgid "instead of applying the patch, see if the patch is applicable" |
| 3169 | msgstr "вместо применения патча проверить подходит ли он" |
| 3170 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3171 | #: builtin/apply.c:4528 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3172 | msgid "make sure the patch is applicable to the current index" |
| 3173 | msgstr "проверить, что патч применяется к текущему индексу" |
| 3174 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3175 | #: builtin/apply.c:4530 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3176 | msgid "apply a patch without touching the working tree" |
| 3177 | msgstr "применить патч, не изменяя рабочий каталог" |
| 3178 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3179 | #: builtin/apply.c:4532 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3180 | msgid "accept a patch that touches outside the working area" |
| 3181 | msgstr "принять патч, который затрагивает файлы за рабочим каталогом" |
| 3182 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3183 | #: builtin/apply.c:4534 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3184 | msgid "also apply the patch (use with --stat/--summary/--check)" |
| 3185 | msgstr "а также применить патч (используйте с --stat/--summary/--check)" |
| 3186 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3187 | #: builtin/apply.c:4536 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3188 | msgid "attempt three-way merge if a patch does not apply" |
| 3189 | msgstr "попытаться сделать трехходовое слияние, если патч не применяется" |
| 3190 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3191 | #: builtin/apply.c:4538 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3192 | msgid "build a temporary index based on embedded index information" |
| 3193 | msgstr "построить временный индекс, основанный на встроенной информации об индексе" |
| 3194 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3195 | #: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3196 | msgid "paths are separated with NUL character" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3197 | msgstr "пути, отделённые НУЛЕВЫМ символом" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3198 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3199 | #: builtin/apply.c:4543 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3200 | msgid "ensure at least <n> lines of context match" |
| 3201 | msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают" |
| 3202 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3203 | #: builtin/apply.c:4545 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3204 | msgid "detect new or modified lines that have whitespace errors" |
| 3205 | msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах" |
| 3206 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3207 | #: builtin/apply.c:4548 builtin/apply.c:4551 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3208 | msgid "ignore changes in whitespace when finding context" |
| 3209 | msgstr "игнорировать изменения в пробельных символах при поиске контекста" |
| 3210 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3211 | #: builtin/apply.c:4554 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3212 | msgid "apply the patch in reverse" |
| 3213 | msgstr "применить патч с обращением изменений" |
| 3214 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3215 | #: builtin/apply.c:4556 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3216 | msgid "don't expect at least one line of context" |
| 3217 | msgstr "не ожидать как минимум одной строки контекста" |
| 3218 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3219 | #: builtin/apply.c:4558 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3220 | msgid "leave the rejected hunks in corresponding *.rej files" |
| 3221 | msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" |
| 3222 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3223 | #: builtin/apply.c:4560 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3224 | msgid "allow overlapping hunks" |
| 3225 | msgstr "разрешить перекрывающиеся блоки изменений" |
| 3226 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3227 | #: builtin/apply.c:4563 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3228 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
| 3229 | msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла" |
| 3230 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3231 | #: builtin/apply.c:4566 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3232 | msgid "do not trust the line counts in the hunk headers" |
| 3233 | msgstr "не доверять количеству строк из заголовка блока изменений" |
| 3234 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3235 | #: builtin/apply.c:4569 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3236 | msgid "prepend <root> to all filenames" |
| 3237 | msgstr "добавить <корень> спереди ко всем именам файлов" |
| 3238 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3239 | #: builtin/apply.c:4591 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3240 | msgid "--3way outside a repository" |
| 3241 | msgstr "--3way вне репозитория" |
| 3242 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3243 | #: builtin/apply.c:4599 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3244 | msgid "--index outside a repository" |
| 3245 | msgstr "--index вне репозитория" |
| 3246 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3247 | #: builtin/apply.c:4602 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3248 | msgid "--cached outside a repository" |
| 3249 | msgstr "--cached вне репозитория" |
| 3250 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3251 | #: builtin/apply.c:4621 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3252 | #, c-format |
| 3253 | msgid "can't open patch '%s'" |
| 3254 | msgstr "не удалось открыть патч «%s»" |
| 3255 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3256 | #: builtin/apply.c:4635 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3257 | #, c-format |
| 3258 | msgid "squelched %d whitespace error" |
| 3259 | msgid_plural "squelched %d whitespace errors" |
| 3260 | msgstr[0] "пропущена %d ошибка в пробельных символах" |
| 3261 | msgstr[1] "пропущено %d ошибки в пробельных символах" |
| 3262 | msgstr[2] "пропущено %d ошибок в пробельных символах" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3263 | msgstr[3] "пропущено %d ошибок в пробельных символах" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3264 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3265 | #: builtin/apply.c:4641 builtin/apply.c:4651 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3266 | #, c-format |
| 3267 | msgid "%d line adds whitespace errors." |
| 3268 | msgid_plural "%d lines add whitespace errors." |
| 3269 | msgstr[0] "%d строка добавила ошибки в пробельных символах." |
| 3270 | msgstr[1] "%d строки добавили ошибки в пробельных символах." |
| 3271 | msgstr[2] "%d строк добавили ошибки в пробельных символах." |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3272 | msgstr[3] "%d строк добавили ошибки в пробельных символах." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3273 | |
| 3274 | #: builtin/archive.c:17 |
| 3275 | #, c-format |
| 3276 | msgid "could not create archive file '%s'" |
| 3277 | msgstr "не удалось создать файл архива «%s»" |
| 3278 | |
| 3279 | #: builtin/archive.c:20 |
| 3280 | msgid "could not redirect output" |
| 3281 | msgstr "не удалось перенаправить вывод" |
| 3282 | |
| 3283 | #: builtin/archive.c:37 |
| 3284 | msgid "git archive: Remote with no URL" |
| 3285 | msgstr "git archive: внешний репозиторий без URL" |
| 3286 | |
| 3287 | #: builtin/archive.c:58 |
| 3288 | msgid "git archive: expected ACK/NAK, got EOF" |
| 3289 | msgstr "git archive: ожидался ACK/NAK, а получен EOF" |
| 3290 | |
| 3291 | #: builtin/archive.c:61 |
| 3292 | #, c-format |
| 3293 | msgid "git archive: NACK %s" |
| 3294 | msgstr "git archive: NACK %s" |
| 3295 | |
| 3296 | #: builtin/archive.c:63 |
| 3297 | #, c-format |
| 3298 | msgid "remote error: %s" |
| 3299 | msgstr "ошибка внешнего репозитория: %s" |
| 3300 | |
| 3301 | #: builtin/archive.c:64 |
| 3302 | msgid "git archive: protocol error" |
| 3303 | msgstr "git archive: ошибка протокола" |
| 3304 | |
| 3305 | #: builtin/archive.c:68 |
| 3306 | msgid "git archive: expected a flush" |
| 3307 | msgstr "git archive: ожидался сброс буфера" |
| 3308 | |
| 3309 | #: builtin/bisect--helper.c:7 |
| 3310 | msgid "git bisect--helper --next-all [--no-checkout]" |
| 3311 | msgstr "git bisect--helper --next-all [--no-checkout]" |
| 3312 | |
| 3313 | #: builtin/bisect--helper.c:17 |
| 3314 | msgid "perform 'git bisect next'" |
| 3315 | msgstr "выполнить «git bisect next»" |
| 3316 | |
| 3317 | #: builtin/bisect--helper.c:19 |
| 3318 | msgid "update BISECT_HEAD instead of checking out the current commit" |
| 3319 | msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит" |
| 3320 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3321 | #: builtin/blame.c:33 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3322 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
| 3323 | msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3324 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3325 | #: builtin/blame.c:38 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3326 | msgid "<rev-opts> are documented in git-rev-list(1)" |
| 3327 | msgstr "<опции-rev-list> документированы в git-rev-list(1)" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3328 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3329 | #: builtin/blame.c:1782 |
| 3330 | msgid "Blaming lines" |
| 3331 | msgstr "Просмотр авторов строк" |
| 3332 | |
| 3333 | #: builtin/blame.c:2530 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3334 | msgid "Show blame entries as we find them, incrementally" |
| 3335 | msgstr "Показать записи авторства постепенно, в процессе нахождения" |
| 3336 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3337 | #: builtin/blame.c:2531 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3338 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
| 3339 | msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)" |
| 3340 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3341 | #: builtin/blame.c:2532 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3342 | msgid "Do not treat root commits as boundaries (Default: off)" |
| 3343 | msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)" |
| 3344 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3345 | #: builtin/blame.c:2533 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3346 | msgid "Show work cost statistics" |
| 3347 | msgstr "Показать статистику расходов на выполнение запроса" |
| 3348 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3349 | #: builtin/blame.c:2534 |
| 3350 | msgid "Force progress reporting" |
| 3351 | msgstr "Принудительно выводить прогресс выполнения" |
| 3352 | |
| 3353 | #: builtin/blame.c:2535 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3354 | msgid "Show output score for blame entries" |
| 3355 | msgstr "Показать оценку для записей авторства" |
| 3356 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3357 | #: builtin/blame.c:2536 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3358 | msgid "Show original filename (Default: auto)" |
| 3359 | msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)" |
| 3360 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3361 | #: builtin/blame.c:2537 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3362 | msgid "Show original linenumber (Default: off)" |
| 3363 | msgstr "Показать оригинальные номера строк (По умолчанию: отключено)" |
| 3364 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3365 | #: builtin/blame.c:2538 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3366 | msgid "Show in a format designed for machine consumption" |
| 3367 | msgstr "Показать в формате для программного разбора" |
| 3368 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3369 | #: builtin/blame.c:2539 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3370 | msgid "Show porcelain format with per-line commit information" |
| 3371 | msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите" |
| 3372 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3373 | #: builtin/blame.c:2540 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3374 | msgid "Use the same output mode as git-annotate (Default: off)" |
| 3375 | msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" |
| 3376 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3377 | #: builtin/blame.c:2541 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3378 | msgid "Show raw timestamp (Default: off)" |
| 3379 | msgstr "Показать необработанные временные метки (По умолчанию: отключено)" |
| 3380 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3381 | #: builtin/blame.c:2542 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3382 | msgid "Show long commit SHA1 (Default: off)" |
| 3383 | msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" |
| 3384 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3385 | #: builtin/blame.c:2543 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3386 | msgid "Suppress author name and timestamp (Default: off)" |
| 3387 | msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)" |
| 3388 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3389 | #: builtin/blame.c:2544 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3390 | msgid "Show author email instead of name (Default: off)" |
| 3391 | msgstr "Показать почту автора вместо имени (По умолчанию: отключено)" |
| 3392 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3393 | #: builtin/blame.c:2545 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3394 | msgid "Ignore whitespace differences" |
| 3395 | msgstr "Игнорировать различия в пробелах" |
| 3396 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3397 | #: builtin/blame.c:2546 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3398 | msgid "Spend extra cycles to find better match" |
| 3399 | msgstr "Потратить больше времени, для нахождения лучших совпадений" |
| 3400 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3401 | #: builtin/blame.c:2547 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3402 | msgid "Use revisions from <file> instead of calling git-rev-list" |
| 3403 | msgstr "Использовать редакции из <файла> вместо вызова git-rev-list" |
| 3404 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3405 | #: builtin/blame.c:2548 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3406 | msgid "Use <file>'s contents as the final image" |
| 3407 | msgstr "Использовать содержимое <файла> как финальный снимок" |
| 3408 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3409 | #: builtin/blame.c:2549 builtin/blame.c:2550 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3410 | msgid "score" |
| 3411 | msgstr "мин-длина" |
| 3412 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3413 | #: builtin/blame.c:2549 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3414 | msgid "Find line copies within and across files" |
| 3415 | msgstr "Найти копирование строк в пределах и между файлами" |
| 3416 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3417 | #: builtin/blame.c:2550 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3418 | msgid "Find line movements within and across files" |
| 3419 | msgstr "Найти перемещения строк в пределах и между файлами" |
| 3420 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3421 | #: builtin/blame.c:2551 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3422 | msgid "n,m" |
| 3423 | msgstr "начало,конец" |
| 3424 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3425 | #: builtin/blame.c:2551 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3426 | msgid "Process only line range n,m, counting from 1" |
| 3427 | msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1" |
| 3428 | |
| 3429 | #. TRANSLATORS: This string is used to tell us the maximum |
| 3430 | #. display width for a relative timestamp in "git blame" |
| 3431 | #. output. For C locale, "4 years, 11 months ago", which |
| 3432 | #. takes 22 places, is the longest among various forms of |
| 3433 | #. relative timestamps, but your language may need more or |
| 3434 | #. fewer display columns. |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3435 | #: builtin/blame.c:2640 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3436 | msgid "4 years, 11 months ago" |
| 3437 | msgstr "4 года и 11 месяцев назад" |
| 3438 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3439 | #: builtin/branch.c:25 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3440 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
| 3441 | msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3442 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3443 | #: builtin/branch.c:26 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3444 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
| 3445 | msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3446 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3447 | #: builtin/branch.c:27 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3448 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
| 3449 | msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3450 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3451 | #: builtin/branch.c:28 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3452 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
| 3453 | msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3454 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3455 | #: builtin/branch.c:29 |
| 3456 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
| 3457 | msgstr "git branch [<опции>] [-r | -a] [--points-at]" |
| 3458 | |
| 3459 | #: builtin/branch.c:142 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3460 | #, c-format |
| 3461 | msgid "" |
| 3462 | "deleting branch '%s' that has been merged to\n" |
| 3463 | " '%s', but not yet merged to HEAD." |
| 3464 | msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD." |
| 3465 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3466 | #: builtin/branch.c:146 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3467 | #, c-format |
| 3468 | msgid "" |
| 3469 | "not deleting branch '%s' that is not yet merged to\n" |
| 3470 | " '%s', even though it is merged to HEAD." |
| 3471 | msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD." |
| 3472 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3473 | #: builtin/branch.c:160 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3474 | #, c-format |
| 3475 | msgid "Couldn't look up commit object for '%s'" |
| 3476 | msgstr "Не удалось найти объект коммита для «%s»" |
| 3477 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3478 | #: builtin/branch.c:164 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3479 | #, c-format |
| 3480 | msgid "" |
| 3481 | "The branch '%s' is not fully merged.\n" |
| 3482 | "If you are sure you want to delete it, run 'git branch -D %s'." |
| 3483 | msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»." |
| 3484 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3485 | #: builtin/branch.c:177 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3486 | msgid "Update of config-file failed" |
| 3487 | msgstr "Не удалось обновить файл конфигурации" |
| 3488 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3489 | #: builtin/branch.c:205 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3490 | msgid "cannot use -a with -d" |
| 3491 | msgstr "нельзя использовать одновременно ключи -a и -d" |
| 3492 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3493 | #: builtin/branch.c:211 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3494 | msgid "Couldn't look up commit object for HEAD" |
| 3495 | msgstr "Не удалось найти объект коммита для HEAD" |
| 3496 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3497 | #: builtin/branch.c:219 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3498 | #, c-format |
| 3499 | msgid "Cannot delete the branch '%s' which you are currently on." |
| 3500 | msgstr "Нельзя удалить ветку «%s», так как вы сейчас на ней находитесь." |
| 3501 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3502 | #: builtin/branch.c:235 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3503 | #, c-format |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3504 | msgid "remote-tracking branch '%s' not found." |
| 3505 | msgstr "внешняя отслеживаемая ветка «%s» не найдена." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3506 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3507 | #: builtin/branch.c:236 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3508 | #, c-format |
| 3509 | msgid "branch '%s' not found." |
| 3510 | msgstr "ветка «%s» не найдена." |
| 3511 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3512 | #: builtin/branch.c:251 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3513 | #, c-format |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3514 | msgid "Error deleting remote-tracking branch '%s'" |
| 3515 | msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3516 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3517 | #: builtin/branch.c:252 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3518 | #, c-format |
| 3519 | msgid "Error deleting branch '%s'" |
| 3520 | msgstr "Ошибка удаления ветки «%s»" |
| 3521 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3522 | #: builtin/branch.c:259 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3523 | #, c-format |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3524 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
| 3525 | msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3526 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3527 | #: builtin/branch.c:260 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3528 | #, c-format |
| 3529 | msgid "Deleted branch %s (was %s).\n" |
| 3530 | msgstr "Ветка %s удалена (была %s).\n" |
| 3531 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3532 | #: builtin/branch.c:303 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3533 | #, c-format |
| 3534 | msgid "[%s: gone]" |
| 3535 | msgstr "[%s: пропал]" |
| 3536 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3537 | #: builtin/branch.c:308 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3538 | #, c-format |
| 3539 | msgid "[%s]" |
| 3540 | msgstr "[%s]" |
| 3541 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3542 | #: builtin/branch.c:313 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3543 | #, c-format |
| 3544 | msgid "[%s: behind %d]" |
| 3545 | msgstr "[%s: позади %d]" |
| 3546 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3547 | #: builtin/branch.c:315 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3548 | #, c-format |
| 3549 | msgid "[behind %d]" |
| 3550 | msgstr "[позади %d]" |
| 3551 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3552 | #: builtin/branch.c:319 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3553 | #, c-format |
| 3554 | msgid "[%s: ahead %d]" |
| 3555 | msgstr "[%s: впереди %d]" |
| 3556 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3557 | #: builtin/branch.c:321 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3558 | #, c-format |
| 3559 | msgid "[ahead %d]" |
| 3560 | msgstr "[впереди %d]" |
| 3561 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3562 | #: builtin/branch.c:324 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3563 | #, c-format |
| 3564 | msgid "[%s: ahead %d, behind %d]" |
| 3565 | msgstr "[%s: впереди %d, позади %d]" |
| 3566 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3567 | #: builtin/branch.c:327 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3568 | #, c-format |
| 3569 | msgid "[ahead %d, behind %d]" |
| 3570 | msgstr "[впереди %d, позади %d]" |
| 3571 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3572 | #: builtin/branch.c:340 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3573 | msgid " **** invalid ref ****" |
| 3574 | msgstr " **** недействительная ссылка ****" |
| 3575 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3576 | #: builtin/branch.c:366 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3577 | #, c-format |
| 3578 | msgid "(no branch, rebasing %s)" |
| 3579 | msgstr "(нет ветки, перемещение %s)" |
| 3580 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3581 | #: builtin/branch.c:369 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3582 | #, c-format |
| 3583 | msgid "(no branch, bisect started on %s)" |
| 3584 | msgstr "(нет ветки, двоичный поиск начат на %s)" |
| 3585 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3586 | #: builtin/branch.c:375 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3587 | #, c-format |
| 3588 | msgid "(HEAD detached at %s)" |
| 3589 | msgstr "(HEAD отделён на %s)" |
| 3590 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3591 | #: builtin/branch.c:378 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3592 | #, c-format |
| 3593 | msgid "(HEAD detached from %s)" |
| 3594 | msgstr "(HEAD отделён начиная с %s)" |
| 3595 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3596 | #: builtin/branch.c:382 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3597 | msgid "(no branch)" |
| 3598 | msgstr "(нет ветки)" |
| 3599 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3600 | #: builtin/branch.c:524 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3601 | msgid "cannot rename the current branch while not on any." |
| 3602 | msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них." |
| 3603 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3604 | #: builtin/branch.c:534 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3605 | #, c-format |
| 3606 | msgid "Invalid branch name: '%s'" |
| 3607 | msgstr "Недействительное имя ветки: «%s»" |
| 3608 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3609 | #: builtin/branch.c:549 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3610 | msgid "Branch rename failed" |
| 3611 | msgstr "Сбой переименования ветки" |
| 3612 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3613 | #: builtin/branch.c:553 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3614 | #, c-format |
| 3615 | msgid "Renamed a misnamed branch '%s' away" |
| 3616 | msgstr "Переименована неправильно названная ветка «%s»" |
| 3617 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3618 | #: builtin/branch.c:557 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3619 | #, c-format |
| 3620 | msgid "Branch renamed to %s, but HEAD is not updated!" |
| 3621 | msgstr "Ветка переименована в %s, но HEAD не обновлен!" |
| 3622 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3623 | #: builtin/branch.c:564 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3624 | msgid "Branch is renamed, but update of config-file failed" |
| 3625 | msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации" |
| 3626 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3627 | #: builtin/branch.c:586 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3628 | #, c-format |
| 3629 | msgid "could not write branch description template: %s" |
| 3630 | msgstr "не удалось записать шаблон описания ветки: %s" |
| 3631 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3632 | #: builtin/branch.c:615 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3633 | msgid "Generic options" |
| 3634 | msgstr "Общие параметры" |
| 3635 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3636 | #: builtin/branch.c:617 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3637 | msgid "show hash and subject, give twice for upstream branch" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3638 | msgstr "показывать хэш-сумму и тему, укажите дважды для вышестоящей ветки" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3639 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3640 | #: builtin/branch.c:618 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3641 | msgid "suppress informational messages" |
| 3642 | msgstr "не выводить информационные сообщения" |
| 3643 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3644 | #: builtin/branch.c:619 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3645 | msgid "set up tracking mode (see git-pull(1))" |
| 3646 | msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))" |
| 3647 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3648 | #: builtin/branch.c:621 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3649 | msgid "change upstream info" |
| 3650 | msgstr "изменить информацию о вышестоящей ветке" |
| 3651 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3652 | #: builtin/branch.c:625 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3653 | msgid "use colored output" |
| 3654 | msgstr "использовать цветной вывод" |
| 3655 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3656 | #: builtin/branch.c:626 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3657 | msgid "act on remote-tracking branches" |
| 3658 | msgstr "выполнить действия на отслеживаемых внешних ветках" |
| 3659 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3660 | #: builtin/branch.c:628 builtin/branch.c:629 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3661 | msgid "print only branches that contain the commit" |
| 3662 | msgstr "вывод только веток, которые содержат коммит" |
| 3663 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3664 | #: builtin/branch.c:632 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3665 | msgid "Specific git-branch actions:" |
| 3666 | msgstr "Специфичные для git-branch действия:" |
| 3667 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3668 | #: builtin/branch.c:633 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3669 | msgid "list both remote-tracking and local branches" |
| 3670 | msgstr "показать список и отслеживаемых и локальных веток" |
| 3671 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3672 | #: builtin/branch.c:635 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3673 | msgid "delete fully merged branch" |
| 3674 | msgstr "удалить полностью слитую ветку" |
| 3675 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3676 | #: builtin/branch.c:636 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3677 | msgid "delete branch (even if not merged)" |
| 3678 | msgstr "удалить ветку (даже никуда не слитую)" |
| 3679 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3680 | #: builtin/branch.c:637 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3681 | msgid "move/rename a branch and its reflog" |
| 3682 | msgstr "переместить/переименовать ветки и ее журнал ссылок" |
| 3683 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3684 | #: builtin/branch.c:638 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3685 | msgid "move/rename a branch, even if target exists" |
| 3686 | msgstr "переместить/переименовать ветку, даже если целевое имя уже существует" |
| 3687 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3688 | #: builtin/branch.c:639 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3689 | msgid "list branch names" |
| 3690 | msgstr "показать список имен веток" |
| 3691 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3692 | #: builtin/branch.c:640 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3693 | msgid "create the branch's reflog" |
| 3694 | msgstr "создать журнал ссылок ветки" |
| 3695 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3696 | #: builtin/branch.c:642 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3697 | msgid "edit the description for the branch" |
| 3698 | msgstr "изменить описание ветки" |
| 3699 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3700 | #: builtin/branch.c:643 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3701 | msgid "force creation, move/rename, deletion" |
| 3702 | msgstr "принудительное создание, перемещение или удаление ветки" |
| 3703 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3704 | #: builtin/branch.c:644 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3705 | msgid "print only branches that are merged" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3706 | msgstr "вывод только слитых веток" |
| 3707 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3708 | #: builtin/branch.c:645 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3709 | msgid "print only branches that are not merged" |
| 3710 | msgstr "вывод только не слитых веток" |
| 3711 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3712 | #: builtin/branch.c:646 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3713 | msgid "list branches in columns" |
| 3714 | msgstr "показать список веток по столбцам" |
| 3715 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3716 | #: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3717 | msgid "key" |
| 3718 | msgstr "ключ" |
| 3719 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3720 | #: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3721 | msgid "field name to sort on" |
| 3722 | msgstr "имя поля, по которому выполнить сортировку" |
| 3723 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3724 | #: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 |
| 3725 | #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3726 | #: builtin/tag.c:369 |
| 3727 | msgid "object" |
| 3728 | msgstr "объект" |
| 3729 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3730 | #: builtin/branch.c:651 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3731 | msgid "print only branches of the object" |
| 3732 | msgstr "вывод только веток, определенного объекта" |
| 3733 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3734 | #: builtin/branch.c:669 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3735 | msgid "Failed to resolve HEAD as a valid ref." |
| 3736 | msgstr "Не удалось определить HEAD как действительную ссылку." |
| 3737 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3738 | #: builtin/branch.c:673 builtin/clone.c:705 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3739 | msgid "HEAD not found below refs/heads!" |
| 3740 | msgstr "HEAD не найден в refs/heads!" |
| 3741 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3742 | #: builtin/branch.c:693 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3743 | msgid "--column and --verbose are incompatible" |
| 3744 | msgstr "--column и --verbose нельзя использовать одновременно" |
| 3745 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3746 | #: builtin/branch.c:704 builtin/branch.c:746 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3747 | msgid "branch name required" |
| 3748 | msgstr "требуется имя ветки" |
| 3749 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3750 | #: builtin/branch.c:722 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3751 | msgid "Cannot give description to detached HEAD" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3752 | msgstr "Нельзя дать описание отделённому HEAD" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3753 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3754 | #: builtin/branch.c:727 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3755 | msgid "cannot edit description of more than one branch" |
| 3756 | msgstr "нельзя изменить описание более одной ветки за раз" |
| 3757 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3758 | #: builtin/branch.c:734 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3759 | #, c-format |
| 3760 | msgid "No commit on branch '%s' yet." |
| 3761 | msgstr "Еще нет коммита на ветке «%s»." |
| 3762 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3763 | #: builtin/branch.c:737 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3764 | #, c-format |
| 3765 | msgid "No branch named '%s'." |
| 3766 | msgstr "Нет ветки с именем «%s»." |
| 3767 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3768 | #: builtin/branch.c:752 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3769 | msgid "too many branches for a rename operation" |
| 3770 | msgstr "слишком много веток для операции переименования" |
| 3771 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3772 | #: builtin/branch.c:757 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3773 | msgid "too many branches to set new upstream" |
| 3774 | msgstr "слишком много веток для указания новых вышестоящих" |
| 3775 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3776 | #: builtin/branch.c:761 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3777 | #, c-format |
| 3778 | msgid "" |
| 3779 | "could not set upstream of HEAD to %s when it does not point to any branch." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3780 | msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3781 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3782 | #: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3783 | #, c-format |
| 3784 | msgid "no such branch '%s'" |
| 3785 | msgstr "нет такой ветки «%s»" |
| 3786 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3787 | #: builtin/branch.c:768 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3788 | #, c-format |
| 3789 | msgid "branch '%s' does not exist" |
| 3790 | msgstr "ветка «%s» не существует" |
| 3791 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3792 | #: builtin/branch.c:780 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3793 | msgid "too many branches to unset upstream" |
| 3794 | msgstr "слишком много веток для убирания вышестоящих" |
| 3795 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3796 | #: builtin/branch.c:784 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3797 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3798 | msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3799 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3800 | #: builtin/branch.c:790 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3801 | #, c-format |
| 3802 | msgid "Branch '%s' has no upstream information" |
| 3803 | msgstr "Ветка «%s» не имеет информации о вышестоящей ветке" |
| 3804 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3805 | #: builtin/branch.c:804 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3806 | msgid "it does not make sense to create 'HEAD' manually" |
| 3807 | msgstr "не имеет смысла создавать «HEAD» вручную" |
| 3808 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3809 | #: builtin/branch.c:810 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3810 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
| 3811 | msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки" |
| 3812 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3813 | #: builtin/branch.c:813 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3814 | #, c-format |
| 3815 | msgid "" |
| 3816 | "The --set-upstream flag is deprecated and will be removed. Consider using " |
| 3817 | "--track or --set-upstream-to\n" |
| 3818 | msgstr "Флаг --set-upstream устарел и будет удален в будущем. Вместо него используйте --track или --set-upstream-to\n" |
| 3819 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3820 | #: builtin/branch.c:830 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3821 | #, c-format |
| 3822 | msgid "" |
| 3823 | "\n" |
| 3824 | "If you wanted to make '%s' track '%s', do this:\n" |
| 3825 | "\n" |
| 3826 | msgstr "\nЕсли вы хотите, чтобы «%s» отслеживала «%s», сделайте следующее:\n\n" |
| 3827 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3828 | #: builtin/branch.c:831 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3829 | #, c-format |
| 3830 | msgid " git branch -d %s\n" |
| 3831 | msgstr "git branch -d %s\n" |
| 3832 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3833 | #: builtin/branch.c:832 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3834 | #, c-format |
| 3835 | msgid " git branch --set-upstream-to %s\n" |
| 3836 | msgstr " git branch --set-upstream-to %s\n" |
| 3837 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3838 | #: builtin/bundle.c:51 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3839 | #, c-format |
| 3840 | msgid "%s is okay\n" |
| 3841 | msgstr "%s в порядке\n" |
| 3842 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3843 | #: builtin/bundle.c:64 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3844 | msgid "Need a repository to create a bundle." |
| 3845 | msgstr "Требуется репозиторий для создания пакета." |
| 3846 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3847 | #: builtin/bundle.c:68 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3848 | msgid "Need a repository to unbundle." |
| 3849 | msgstr "Требуется репозиторий для распаковки." |
| 3850 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3851 | #: builtin/cat-file.c:428 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3852 | msgid "" |
| 3853 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-" |
| 3854 | "type]|-e|-p|<type>|--textconv) <object>" |
| 3855 | msgstr "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<тип>|--textconv) <объект>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3856 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3857 | #: builtin/cat-file.c:429 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3858 | msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" |
| 3859 | msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3860 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3861 | #: builtin/cat-file.c:466 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3862 | msgid "<type> can be one of: blob, tree, commit, tag" |
| 3863 | msgstr "<тип> может быть одним из: blob, tree, commit, tag" |
| 3864 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3865 | #: builtin/cat-file.c:467 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3866 | msgid "show object type" |
| 3867 | msgstr "показать тип объекта" |
| 3868 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3869 | #: builtin/cat-file.c:468 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3870 | msgid "show object size" |
| 3871 | msgstr "показать размер объекта" |
| 3872 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3873 | #: builtin/cat-file.c:470 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3874 | msgid "exit with zero when there's no error" |
| 3875 | msgstr "выйти с нулевым кодом возврата, если нет ошибки" |
| 3876 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3877 | #: builtin/cat-file.c:471 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3878 | msgid "pretty-print object's content" |
| 3879 | msgstr "структурированный вывод содержимого объекта" |
| 3880 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3881 | #: builtin/cat-file.c:473 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3882 | msgid "for blob objects, run textconv on object's content" |
| 3883 | msgstr "запустить texconv на содержимом двоичных объектов " |
| 3884 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3885 | #: builtin/cat-file.c:475 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3886 | msgid "allow -s and -t to work with broken/corrupt objects" |
| 3887 | msgstr "разрешить -s и -t работать с повреждёнными объектами" |
| 3888 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3889 | #: builtin/cat-file.c:476 |
| 3890 | msgid "buffer --batch output" |
| 3891 | msgstr "буфферировать вывод --batch" |
| 3892 | |
| 3893 | #: builtin/cat-file.c:478 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3894 | msgid "show info and content of objects fed from the standard input" |
| 3895 | msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода" |
| 3896 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3897 | #: builtin/cat-file.c:481 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3898 | msgid "show info about objects fed from the standard input" |
| 3899 | msgstr "показать информацию об объектах, переданных из стандартного ввода" |
| 3900 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3901 | #: builtin/cat-file.c:484 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 3902 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
| 3903 | msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)" |
| 3904 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 3905 | #: builtin/cat-file.c:486 |
| 3906 | msgid "show all objects with --batch or --batch-check" |
| 3907 | msgstr "показать все объекты с опциями --batch или --batch-check" |
| 3908 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3909 | #: builtin/check-attr.c:11 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3910 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
| 3911 | msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3912 | |
| 3913 | #: builtin/check-attr.c:12 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 3914 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
| 3915 | msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3916 | |
| 3917 | #: builtin/check-attr.c:19 |
| 3918 | msgid "report all attributes set on file" |
| 3919 | msgstr "вывести все атрибуты установленные для файла" |
| 3920 | |
| 3921 | #: builtin/check-attr.c:20 |
| 3922 | msgid "use .gitattributes only from the index" |
| 3923 | msgstr "использовать только .gitattributes из индекса" |
| 3924 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3925 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3926 | msgid "read file names from stdin" |
| 3927 | msgstr "прочитать имена файлов из стандартного ввода" |
| 3928 | |
| 3929 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
| 3930 | msgid "terminate input and output records by a NUL character" |
| 3931 | msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" |
| 3932 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3933 | #: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3934 | msgid "suppress progress reporting" |
| 3935 | msgstr "не выводить прогресс выполнения" |
| 3936 | |
| 3937 | #: builtin/check-ignore.c:26 |
| 3938 | msgid "show non-matching input paths" |
| 3939 | msgstr "показать не совпадающие введенные пути" |
| 3940 | |
| 3941 | #: builtin/check-ignore.c:28 |
| 3942 | msgid "ignore index when checking" |
| 3943 | msgstr "игнорировать индекс при проверке" |
| 3944 | |
| 3945 | #: builtin/check-ignore.c:154 |
| 3946 | msgid "cannot specify pathnames with --stdin" |
| 3947 | msgstr "нельзя указывать пути вместе с параметром --stdin" |
| 3948 | |
| 3949 | #: builtin/check-ignore.c:157 |
| 3950 | msgid "-z only makes sense with --stdin" |
| 3951 | msgstr "-z имеет смысл только вместе с параметром --stdin" |
| 3952 | |
| 3953 | #: builtin/check-ignore.c:159 |
| 3954 | msgid "no path specified" |
| 3955 | msgstr "не указан путь" |
| 3956 | |
| 3957 | #: builtin/check-ignore.c:163 |
| 3958 | msgid "--quiet is only valid with a single pathname" |
| 3959 | msgstr "--quiet можно использовать только при указании одного пути" |
| 3960 | |
| 3961 | #: builtin/check-ignore.c:165 |
| 3962 | msgid "cannot have both --quiet and --verbose" |
| 3963 | msgstr "нельзя использовать одновременно --quiet и --verbose" |
| 3964 | |
| 3965 | #: builtin/check-ignore.c:168 |
| 3966 | msgid "--non-matching is only valid with --verbose" |
| 3967 | msgstr "--non-matching можно использовать только вместе с --verbose" |
| 3968 | |
| 3969 | #: builtin/check-mailmap.c:8 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3970 | msgid "git check-mailmap [<options>] <contact>..." |
| 3971 | msgstr "git check-mailmap [<опции>] <контакт>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3972 | |
| 3973 | #: builtin/check-mailmap.c:13 |
| 3974 | msgid "also read contacts from stdin" |
| 3975 | msgstr "также читать контакты из стандартного ввода" |
| 3976 | |
| 3977 | #: builtin/check-mailmap.c:24 |
| 3978 | #, c-format |
| 3979 | msgid "unable to parse contact: %s" |
| 3980 | msgstr "не удалось разобрать контакт: %s" |
| 3981 | |
| 3982 | #: builtin/check-mailmap.c:47 |
| 3983 | msgid "no contacts specified" |
| 3984 | msgstr "не указаны контакты" |
| 3985 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3986 | #: builtin/checkout-index.c:127 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 3987 | msgid "git checkout-index [<options>] [--] [<file>...]" |
| 3988 | msgstr "git checkout-index [<опции>] [--] [<файл>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3989 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3990 | #: builtin/checkout-index.c:144 |
| 3991 | msgid "stage should be between 1 and 3 or all" |
| 3992 | msgstr "индекс должен быть между 1 и 3 или all" |
| 3993 | |
| 3994 | #: builtin/checkout-index.c:160 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3995 | msgid "check out all files in the index" |
| 3996 | msgstr "перейти на состояние всех файлов из индекса" |
| 3997 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 3998 | #: builtin/checkout-index.c:161 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 3999 | msgid "force overwrite of existing files" |
| 4000 | msgstr "принудительная перезапись существующих файлов" |
| 4001 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4002 | #: builtin/checkout-index.c:163 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4003 | msgid "no warning for existing files and files not in index" |
| 4004 | msgstr "не выводить предупреждения для существующих и непроиндексированных файлов" |
| 4005 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4006 | #: builtin/checkout-index.c:165 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4007 | msgid "don't checkout new files" |
| 4008 | msgstr "не создавать новые файлы" |
| 4009 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4010 | #: builtin/checkout-index.c:167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4011 | msgid "update stat information in the index file" |
| 4012 | msgstr "обновить статистику доступа в файле индекса" |
| 4013 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4014 | #: builtin/checkout-index.c:171 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4015 | msgid "read list of paths from the standard input" |
| 4016 | msgstr "прочитать список путей из стандартного ввода" |
| 4017 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4018 | #: builtin/checkout-index.c:173 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4019 | msgid "write the content to temporary files" |
| 4020 | msgstr "записать содержимое во временные файлы" |
| 4021 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4022 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
| 4023 | #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4024 | #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4025 | msgid "string" |
| 4026 | msgstr "строка" |
| 4027 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4028 | #: builtin/checkout-index.c:175 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4029 | msgid "when creating files, prepend <string>" |
| 4030 | msgstr "добавить спереди <строку> при создании файлов" |
| 4031 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4032 | #: builtin/checkout-index.c:177 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4033 | msgid "copy out the files from named stage" |
| 4034 | msgstr "копировать файлы из указанного индекса" |
| 4035 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4036 | #: builtin/checkout.c:25 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4037 | msgid "git checkout [<options>] <branch>" |
| 4038 | msgstr "git checkout [<опции>] <ветка>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4039 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4040 | #: builtin/checkout.c:26 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4041 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
| 4042 | msgstr "git checkout [<опции>] [<ветка>] -- <файл>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4043 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4044 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4045 | #, c-format |
| 4046 | msgid "path '%s' does not have our version" |
| 4047 | msgstr "путь «%s» не имеет нашей версии" |
| 4048 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4049 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4050 | #, c-format |
| 4051 | msgid "path '%s' does not have their version" |
| 4052 | msgstr "путь «%s» не имеет их версии" |
| 4053 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4054 | #: builtin/checkout.c:152 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4055 | #, c-format |
| 4056 | msgid "path '%s' does not have all necessary versions" |
| 4057 | msgstr "путь «%s» не имеет всех необходимых версий" |
| 4058 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4059 | #: builtin/checkout.c:196 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4060 | #, c-format |
| 4061 | msgid "path '%s' does not have necessary versions" |
| 4062 | msgstr "путь «%s» не имеет необходимых версий" |
| 4063 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4064 | #: builtin/checkout.c:213 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4065 | #, c-format |
| 4066 | msgid "path '%s': cannot merge" |
| 4067 | msgstr "путь «%s»: не удалось слить" |
| 4068 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4069 | #: builtin/checkout.c:230 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4070 | #, c-format |
| 4071 | msgid "Unable to add merge result for '%s'" |
| 4072 | msgstr "Не удалось добавить результат слияния «%s»" |
| 4073 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4074 | #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 |
| 4075 | #: builtin/checkout.c:260 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4076 | #, c-format |
| 4077 | msgid "'%s' cannot be used with updating paths" |
| 4078 | msgstr "«%s» нельзя использовать при обновлении путей" |
| 4079 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4080 | #: builtin/checkout.c:263 builtin/checkout.c:266 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4081 | #, c-format |
| 4082 | msgid "'%s' cannot be used with %s" |
| 4083 | msgstr "«%s» нельзя использовать одновременно с %s" |
| 4084 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4085 | #: builtin/checkout.c:269 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4086 | #, c-format |
| 4087 | msgid "Cannot update paths and switch to branch '%s' at the same time." |
| 4088 | msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." |
| 4089 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4090 | #: builtin/checkout.c:280 builtin/checkout.c:474 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4091 | msgid "corrupt index file" |
| 4092 | msgstr "файл индекса поврежден" |
| 4093 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4094 | #: builtin/checkout.c:340 builtin/checkout.c:347 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4095 | #, c-format |
| 4096 | msgid "path '%s' is unmerged" |
| 4097 | msgstr "путь «%s» не слит" |
| 4098 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4099 | #: builtin/checkout.c:496 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4100 | msgid "you need to resolve your current index first" |
| 4101 | msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" |
| 4102 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4103 | #: builtin/checkout.c:623 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4104 | #, c-format |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4105 | msgid "Can not do reflog for '%s': %s\n" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4106 | msgstr "Не удалось создать журнал ссылок для «%s»: %s\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4107 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4108 | #: builtin/checkout.c:661 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4109 | msgid "HEAD is now at" |
| 4110 | msgstr "HEAD сейчас на" |
| 4111 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 4112 | #: builtin/checkout.c:665 builtin/clone.c:659 |
| 4113 | msgid "unable to update HEAD" |
| 4114 | msgstr "не удалось обновить HEAD" |
| 4115 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4116 | #: builtin/checkout.c:669 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4117 | #, c-format |
| 4118 | msgid "Reset branch '%s'\n" |
| 4119 | msgstr "Сброс ветки «%s»\n" |
| 4120 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4121 | #: builtin/checkout.c:672 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4122 | #, c-format |
| 4123 | msgid "Already on '%s'\n" |
| 4124 | msgstr "Уже на «%s»\n" |
| 4125 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4126 | #: builtin/checkout.c:676 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4127 | #, c-format |
| 4128 | msgid "Switched to and reset branch '%s'\n" |
| 4129 | msgstr "Переключение и сброс ветки «%s»\n" |
| 4130 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4131 | #: builtin/checkout.c:678 builtin/checkout.c:1068 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4132 | #, c-format |
| 4133 | msgid "Switched to a new branch '%s'\n" |
| 4134 | msgstr "Переключено на новую ветку «%s»\n" |
| 4135 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4136 | #: builtin/checkout.c:680 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4137 | #, c-format |
| 4138 | msgid "Switched to branch '%s'\n" |
| 4139 | msgstr "Переключено на ветку «%s»\n" |
| 4140 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4141 | #: builtin/checkout.c:732 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4142 | #, c-format |
| 4143 | msgid " ... and %d more.\n" |
| 4144 | msgstr " … и еще %d.\n" |
| 4145 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4146 | #: builtin/checkout.c:738 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4147 | #, c-format |
| 4148 | msgid "" |
| 4149 | "Warning: you are leaving %d commit behind, not connected to\n" |
| 4150 | "any of your branches:\n" |
| 4151 | "\n" |
| 4152 | "%s\n" |
| 4153 | msgid_plural "" |
| 4154 | "Warning: you are leaving %d commits behind, not connected to\n" |
| 4155 | "any of your branches:\n" |
| 4156 | "\n" |
| 4157 | "%s\n" |
| 4158 | msgstr[0] "Предупреждение: вы оставляете позади %d коммит не соединенную ни с одной из ваших веток:\n\n%s\n" |
| 4159 | msgstr[1] "Предупреждение: вы оставляете позади %d коммита не соединенные ни с одной из ваших веток:\n\n%s\n" |
| 4160 | msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4161 | msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4162 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4163 | #: builtin/checkout.c:757 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4164 | #, c-format |
| 4165 | msgid "" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4166 | "If you want to keep it by creating a new branch, this may be a good time\n" |
| 4167 | "to do so with:\n" |
| 4168 | "\n" |
| 4169 | " git branch <new-branch-name> %s\n" |
| 4170 | "\n" |
| 4171 | msgid_plural "" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4172 | "If you want to keep them by creating a new branch, this may be a good time\n" |
| 4173 | "to do so with:\n" |
| 4174 | "\n" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4175 | " git branch <new-branch-name> %s\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4176 | "\n" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4177 | msgstr[0] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" |
| 4178 | msgstr[1] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" |
| 4179 | msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" |
| 4180 | msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4181 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4182 | #: builtin/checkout.c:793 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4183 | msgid "internal error in revision walk" |
| 4184 | msgstr "внутренняя ошибка при хождении по редакциям" |
| 4185 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4186 | #: builtin/checkout.c:797 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4187 | msgid "Previous HEAD position was" |
| 4188 | msgstr "Предыдущая позиция HEAD была" |
| 4189 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4190 | #: builtin/checkout.c:824 builtin/checkout.c:1063 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4191 | msgid "You are on a branch yet to be born" |
| 4192 | msgstr "Вы находитесь на еще не созданной ветке" |
| 4193 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4194 | #: builtin/checkout.c:969 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4195 | #, c-format |
| 4196 | msgid "only one reference expected, %d given." |
| 4197 | msgstr "ожидается только одна ссылка, а передано %d." |
| 4198 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4199 | #: builtin/checkout.c:1009 builtin/worktree.c:211 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4200 | #, c-format |
| 4201 | msgid "invalid reference: %s" |
| 4202 | msgstr "неправильная ссылка: %s" |
| 4203 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4204 | #: builtin/checkout.c:1038 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4205 | #, c-format |
| 4206 | msgid "reference is not a tree: %s" |
| 4207 | msgstr "в дереве нет такой ссылки: %s" |
| 4208 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4209 | #: builtin/checkout.c:1077 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4210 | msgid "paths cannot be used with switching branches" |
| 4211 | msgstr "нельзя использовать пути при переключении веток" |
| 4212 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4213 | #: builtin/checkout.c:1080 builtin/checkout.c:1084 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4214 | #, c-format |
| 4215 | msgid "'%s' cannot be used with switching branches" |
| 4216 | msgstr "нельзя использовать «%s» при переключении веток" |
| 4217 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4218 | #: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 |
| 4219 | #: builtin/checkout.c:1099 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4220 | #, c-format |
| 4221 | msgid "'%s' cannot be used with '%s'" |
| 4222 | msgstr "«%s» нельзя использовать одновременно с «%s»" |
| 4223 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4224 | #: builtin/checkout.c:1104 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4225 | #, c-format |
| 4226 | msgid "Cannot switch branch to a non-commit '%s'" |
| 4227 | msgstr "Нельзя переключить ветку на не коммит «%s»" |
| 4228 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4229 | #: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 |
| 4230 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 |
| 4231 | #: builtin/worktree.c:320 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4232 | msgid "branch" |
| 4233 | msgstr "ветка" |
| 4234 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4235 | #: builtin/checkout.c:1138 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4236 | msgid "create and checkout a new branch" |
| 4237 | msgstr "создать и перейти на новую ветку" |
| 4238 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4239 | #: builtin/checkout.c:1140 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4240 | msgid "create/reset and checkout a branch" |
| 4241 | msgstr "создать/сбросить и перейти на новую ветку" |
| 4242 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4243 | #: builtin/checkout.c:1141 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4244 | msgid "create reflog for new branch" |
| 4245 | msgstr "создать журнал ссылок для новой ветки" |
| 4246 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4247 | #: builtin/checkout.c:1142 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4248 | msgid "detach the HEAD at named commit" |
| 4249 | msgstr "отсоединить HEAD на указанном коммите" |
| 4250 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4251 | #: builtin/checkout.c:1143 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4252 | msgid "set upstream info for new branch" |
| 4253 | msgstr "установить информацию о вышестоящей ветке для новой ветки" |
| 4254 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4255 | #: builtin/checkout.c:1145 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4256 | msgid "new-branch" |
| 4257 | msgstr "новая-ветка" |
| 4258 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4259 | #: builtin/checkout.c:1145 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4260 | msgid "new unparented branch" |
| 4261 | msgstr "новая ветка без родителей" |
| 4262 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4263 | #: builtin/checkout.c:1146 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4264 | msgid "checkout our version for unmerged files" |
| 4265 | msgstr "перейти на нашу версию для не слитых файлов" |
| 4266 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4267 | #: builtin/checkout.c:1148 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4268 | msgid "checkout their version for unmerged files" |
| 4269 | msgstr "перейти на их версию для не слитых файлов" |
| 4270 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4271 | #: builtin/checkout.c:1150 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4272 | msgid "force checkout (throw away local modifications)" |
| 4273 | msgstr "принудительный переход (отбрасывает все локальные изменения)" |
| 4274 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4275 | #: builtin/checkout.c:1151 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4276 | msgid "perform a 3-way merge with the new branch" |
| 4277 | msgstr "выполнить трехходовое слияние с новой веткой" |
| 4278 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4279 | #: builtin/checkout.c:1152 builtin/merge.c:227 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4280 | msgid "update ignored files (default)" |
| 4281 | msgstr "обновить игнорируемые файлы (по умолчанию)" |
| 4282 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4283 | #: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4284 | msgid "style" |
| 4285 | msgstr "стиль" |
| 4286 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4287 | #: builtin/checkout.c:1154 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4288 | msgid "conflict style (merge or diff3)" |
| 4289 | msgstr "стиль конфликтов слияния (merge или diff3)" |
| 4290 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4291 | #: builtin/checkout.c:1157 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4292 | msgid "do not limit pathspecs to sparse entries only" |
| 4293 | msgstr "не ограничивать спецификаторы пути только частичными записями" |
| 4294 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4295 | #: builtin/checkout.c:1159 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4296 | msgid "second guess 'git checkout <no-such-branch>'" |
| 4297 | msgstr "пересмотр «git checkout <no-such-branch>»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4298 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4299 | #: builtin/checkout.c:1161 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4300 | msgid "do not check if another worktree is holding the given ref" |
| 4301 | msgstr "не проверять, что другое дерево уже содержит указанную ссылку" |
| 4302 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4303 | #: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 |
| 4304 | #: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4305 | #: builtin/send-pack.c:168 |
| 4306 | msgid "force progress reporting" |
| 4307 | msgstr "принудительно выводить прогресс" |
| 4308 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4309 | #: builtin/checkout.c:1193 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4310 | msgid "-b, -B and --orphan are mutually exclusive" |
| 4311 | msgstr "-b, -B и --orphan нельзя использовать одновременно" |
| 4312 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4313 | #: builtin/checkout.c:1210 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4314 | msgid "--track needs a branch name" |
| 4315 | msgstr "--track требует имя ветки" |
| 4316 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4317 | #: builtin/checkout.c:1215 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4318 | msgid "Missing branch name; try -b" |
| 4319 | msgstr "Пропущено имя ветки; попробуйте -b" |
| 4320 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4321 | #: builtin/checkout.c:1251 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4322 | msgid "invalid path specification" |
| 4323 | msgstr "неправильная спецификация пути" |
| 4324 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4325 | #: builtin/checkout.c:1258 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4326 | #, c-format |
| 4327 | msgid "" |
| 4328 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
| 4329 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
| 4330 | msgstr "Нельзя обновить пути и одновременно переключить на ветку «%s».\nВы хотели переключиться на «%s», что не может быть определено как коммит?" |
| 4331 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4332 | #: builtin/checkout.c:1263 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4333 | #, c-format |
| 4334 | msgid "git checkout: --detach does not take a path argument '%s'" |
| 4335 | msgstr "git checkout: --detach не принимает путь «%s» как аргумент" |
| 4336 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4337 | #: builtin/checkout.c:1267 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4338 | msgid "" |
| 4339 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" |
| 4340 | "checking out of the index." |
| 4341 | msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса." |
| 4342 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4343 | #: builtin/clean.c:25 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4344 | msgid "" |
| 4345 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." |
| 4346 | msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…" |
| 4347 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4348 | #: builtin/clean.c:29 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4349 | #, c-format |
| 4350 | msgid "Removing %s\n" |
| 4351 | msgstr "Удаление %s\n" |
| 4352 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4353 | #: builtin/clean.c:30 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4354 | #, c-format |
| 4355 | msgid "Would remove %s\n" |
| 4356 | msgstr "Будет удалено %s\n" |
| 4357 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4358 | #: builtin/clean.c:31 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4359 | #, c-format |
| 4360 | msgid "Skipping repository %s\n" |
| 4361 | msgstr "Пропуск репозитория %s\n" |
| 4362 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4363 | #: builtin/clean.c:32 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4364 | #, c-format |
| 4365 | msgid "Would skip repository %s\n" |
| 4366 | msgstr "Будет пропущен репозиторий %s\n" |
| 4367 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 4368 | #: builtin/clean.c:33 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4369 | #, c-format |
| 4370 | msgid "failed to remove %s" |
| 4371 | msgstr "сбой удаления %s" |
| 4372 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4373 | #: builtin/clean.c:291 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4374 | msgid "" |
| 4375 | "Prompt help:\n" |
| 4376 | "1 - select a numbered item\n" |
| 4377 | "foo - select item based on unique prefix\n" |
| 4378 | " - (empty) select nothing" |
| 4379 | msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего" |
| 4380 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4381 | #: builtin/clean.c:295 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4382 | msgid "" |
| 4383 | "Prompt help:\n" |
| 4384 | "1 - select a single item\n" |
| 4385 | "3-5 - select a range of items\n" |
| 4386 | "2-3,6-9 - select multiple ranges\n" |
| 4387 | "foo - select item based on unique prefix\n" |
| 4388 | "-... - unselect specified items\n" |
| 4389 | "* - choose all items\n" |
| 4390 | " - (empty) finish selecting" |
| 4391 | msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение" |
| 4392 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4393 | #: builtin/clean.c:511 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4394 | #, c-format |
| 4395 | msgid "Huh (%s)?" |
| 4396 | msgstr "Хм (%s)?" |
| 4397 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4398 | #: builtin/clean.c:653 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4399 | #, c-format |
| 4400 | msgid "Input ignore patterns>> " |
| 4401 | msgstr "Шаблоны игнорирования ввода>> " |
| 4402 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4403 | #: builtin/clean.c:690 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4404 | #, c-format |
| 4405 | msgid "WARNING: Cannot find items matched by: %s" |
| 4406 | msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s" |
| 4407 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4408 | #: builtin/clean.c:711 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4409 | msgid "Select items to delete" |
| 4410 | msgstr "Укажите элементы для удаления" |
| 4411 | |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4412 | #. TRANSLATORS: Make sure to keep [y/N] as is |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4413 | #: builtin/clean.c:752 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4414 | #, c-format |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4415 | msgid "Remove %s [y/N]? " |
| 4416 | msgstr "Удалить %s [y - да/N - нет]? " |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4417 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4418 | #: builtin/clean.c:777 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4419 | msgid "Bye." |
| 4420 | msgstr "До свидания." |
| 4421 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4422 | #: builtin/clean.c:785 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4423 | msgid "" |
| 4424 | "clean - start cleaning\n" |
| 4425 | "filter by pattern - exclude items from deletion\n" |
| 4426 | "select by numbers - select items to be deleted by numbers\n" |
| 4427 | "ask each - confirm each deletion (like \"rm -i\")\n" |
| 4428 | "quit - stop cleaning\n" |
| 4429 | "help - this screen\n" |
| 4430 | "? - help for prompt selection" |
| 4431 | msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению" |
| 4432 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4433 | #: builtin/clean.c:812 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4434 | msgid "*** Commands ***" |
| 4435 | msgstr "*** Команды ***" |
| 4436 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4437 | #: builtin/clean.c:813 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4438 | msgid "What now" |
| 4439 | msgstr "Что теперь" |
| 4440 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4441 | #: builtin/clean.c:821 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4442 | msgid "Would remove the following item:" |
| 4443 | msgid_plural "Would remove the following items:" |
| 4444 | msgstr[0] "Удалить следующие элементы:" |
| 4445 | msgstr[1] "Удалить следующие элементы:" |
| 4446 | msgstr[2] "Удалить следующие элементы:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4447 | msgstr[3] "Удалить следующие элементы:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4448 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4449 | #: builtin/clean.c:838 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4450 | msgid "No more files to clean, exiting." |
| 4451 | msgstr "Больше нет файлов для очистки, выходим." |
| 4452 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4453 | #: builtin/clean.c:869 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4454 | msgid "do not print names of files removed" |
| 4455 | msgstr "не выводить имена удаляемых файлов" |
| 4456 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4457 | #: builtin/clean.c:871 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4458 | msgid "force" |
| 4459 | msgstr "принудительно" |
| 4460 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4461 | #: builtin/clean.c:872 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4462 | msgid "interactive cleaning" |
| 4463 | msgstr "интерактивная очистка" |
| 4464 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4465 | #: builtin/clean.c:874 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4466 | msgid "remove whole directories" |
| 4467 | msgstr "удалить каталоги полностью" |
| 4468 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4469 | #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 |
| 4470 | #: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4471 | msgid "pattern" |
| 4472 | msgstr "шаблон" |
| 4473 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4474 | #: builtin/clean.c:876 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4475 | msgid "add <pattern> to ignore rules" |
| 4476 | msgstr "добавить <шаблон> в правила игнорирования" |
| 4477 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4478 | #: builtin/clean.c:877 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4479 | msgid "remove ignored files, too" |
| 4480 | msgstr "также удалить игнорируемые файлы" |
| 4481 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4482 | #: builtin/clean.c:879 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4483 | msgid "remove only ignored files" |
| 4484 | msgstr "удалить только игнорируемые файлы" |
| 4485 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4486 | #: builtin/clean.c:897 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4487 | msgid "-x and -X cannot be used together" |
| 4488 | msgstr "нельзя использовать одновременно -x и -X" |
| 4489 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4490 | #: builtin/clean.c:901 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4491 | msgid "" |
| 4492 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" |
| 4493 | " clean" |
| 4494 | msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки" |
| 4495 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4496 | #: builtin/clean.c:904 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4497 | msgid "" |
| 4498 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
| 4499 | "refusing to clean" |
| 4500 | msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки" |
| 4501 | |
| 4502 | #: builtin/clone.c:37 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4503 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
| 4504 | msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4505 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4506 | #: builtin/clone.c:60 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4507 | msgid "don't create a checkout" |
| 4508 | msgstr "не переключать рабочую копию на HEAD" |
| 4509 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4510 | #: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4511 | msgid "create a bare repository" |
| 4512 | msgstr "создать голый репозиторий" |
| 4513 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4514 | #: builtin/clone.c:65 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4515 | msgid "create a mirror repository (implies bare)" |
| 4516 | msgstr "создать зеркало репозитория (включает в себя и параметр bare)" |
| 4517 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4518 | #: builtin/clone.c:67 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4519 | msgid "to clone from a local repository" |
| 4520 | msgstr "для клонирования из локального репозитория" |
| 4521 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4522 | #: builtin/clone.c:69 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4523 | msgid "don't use local hardlinks, always copy" |
| 4524 | msgstr "не использовать жесткие ссылки, всегда копировать файлы" |
| 4525 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4526 | #: builtin/clone.c:71 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4527 | msgid "setup as shared repository" |
| 4528 | msgstr "настроить как общедоступный репозиторий" |
| 4529 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4530 | #: builtin/clone.c:73 builtin/clone.c:75 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4531 | msgid "initialize submodules in the clone" |
| 4532 | msgstr "инициализировать подмодули в клоне" |
| 4533 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4534 | #: builtin/clone.c:76 builtin/init-db.c:466 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4535 | msgid "template-directory" |
| 4536 | msgstr "каталог-шаблонов" |
| 4537 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4538 | #: builtin/clone.c:77 builtin/init-db.c:467 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4539 | msgid "directory from which templates will be used" |
| 4540 | msgstr "каталог, шаблоны из которого будут использованы" |
| 4541 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4542 | #: builtin/clone.c:79 builtin/submodule--helper.c:173 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4543 | msgid "reference repository" |
| 4544 | msgstr "ссылаемый репозиторий" |
| 4545 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4546 | #: builtin/clone.c:81 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4547 | msgid "use --reference only while cloning" |
| 4548 | msgstr "используйте --reference только при клонировании" |
| 4549 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4550 | #: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4551 | msgid "name" |
| 4552 | msgstr "имя" |
| 4553 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4554 | #: builtin/clone.c:83 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4555 | msgid "use <name> instead of 'origin' to track upstream" |
| 4556 | msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория" |
| 4557 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4558 | #: builtin/clone.c:85 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4559 | msgid "checkout <branch> instead of the remote's HEAD" |
| 4560 | msgstr "перейти на <ветку>, вместо HEAD внешнего репозитория" |
| 4561 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4562 | #: builtin/clone.c:87 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4563 | msgid "path to git-upload-pack on the remote" |
| 4564 | msgstr "путь к git-upload-pack на внешнем репозитории" |
| 4565 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4566 | #: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 |
| 4567 | #: builtin/pull.c:193 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4568 | msgid "depth" |
| 4569 | msgstr "глубина" |
| 4570 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4571 | #: builtin/clone.c:89 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4572 | msgid "create a shallow clone of that depth" |
| 4573 | msgstr "сделать частичный клон указанной глубины" |
| 4574 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4575 | #: builtin/clone.c:91 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 4576 | msgid "clone only one branch, HEAD or --branch" |
| 4577 | msgstr "клонировать только одну ветку, HEAD или --branch" |
| 4578 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4579 | #: builtin/clone.c:92 builtin/init-db.c:475 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4580 | msgid "gitdir" |
| 4581 | msgstr "каталог-git" |
| 4582 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4583 | #: builtin/clone.c:93 builtin/init-db.c:476 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4584 | msgid "separate git dir from working tree" |
| 4585 | msgstr "разместить каталог git отдельно от рабочей копии" |
| 4586 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4587 | #: builtin/clone.c:94 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4588 | msgid "key=value" |
| 4589 | msgstr "ключ=значение" |
| 4590 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4591 | #: builtin/clone.c:95 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4592 | msgid "set config inside the new repository" |
| 4593 | msgstr "установить параметры внутри нового репозитория" |
| 4594 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4595 | #: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 |
| 4596 | msgid "use IPv4 addresses only" |
| 4597 | msgstr "использовать только IPv4 адреса" |
| 4598 | |
| 4599 | #: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 |
| 4600 | msgid "use IPv6 addresses only" |
| 4601 | msgstr "использовать только IPv6 адреса" |
| 4602 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 4603 | #: builtin/clone.c:239 |
| 4604 | msgid "" |
| 4605 | "No directory name could be guessed.\n" |
| 4606 | "Please specify a directory on the command line" |
| 4607 | msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки" |
| 4608 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4609 | #: builtin/clone.c:305 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4610 | #, c-format |
| 4611 | msgid "reference repository '%s' as a linked checkout is not supported yet." |
| 4612 | msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается." |
| 4613 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4614 | #: builtin/clone.c:307 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4615 | #, c-format |
| 4616 | msgid "reference repository '%s' is not a local repository." |
| 4617 | msgstr "ссылаемый репозиторий «%s» не является локальным." |
| 4618 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4619 | #: builtin/clone.c:312 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4620 | #, c-format |
| 4621 | msgid "reference repository '%s' is shallow" |
| 4622 | msgstr "ссылаемый репозиторий «%s» является частичным" |
| 4623 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4624 | #: builtin/clone.c:315 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4625 | #, c-format |
| 4626 | msgid "reference repository '%s' is grafted" |
| 4627 | msgstr "ссылаемый репозиторий «%s» является сращенным" |
| 4628 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4629 | #: builtin/clone.c:380 builtin/diff.c:84 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4630 | #, c-format |
| 4631 | msgid "failed to stat '%s'" |
| 4632 | msgstr "не удалось выполнить stat «%s»" |
| 4633 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4634 | #: builtin/clone.c:382 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4635 | #, c-format |
| 4636 | msgid "%s exists and is not a directory" |
| 4637 | msgstr "%s уже существует и не является каталогом" |
| 4638 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4639 | #: builtin/clone.c:396 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4640 | #, c-format |
| 4641 | msgid "failed to stat %s\n" |
| 4642 | msgstr "не удалось выполнить stat %s\n" |
| 4643 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4644 | #: builtin/clone.c:418 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4645 | #, c-format |
| 4646 | msgid "failed to create link '%s'" |
| 4647 | msgstr "не удалось создать ссылку «%s»" |
| 4648 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4649 | #: builtin/clone.c:422 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4650 | #, c-format |
| 4651 | msgid "failed to copy file to '%s'" |
| 4652 | msgstr "не удалось копировать файл в «%s»" |
| 4653 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4654 | #: builtin/clone.c:447 builtin/clone.c:631 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4655 | #, c-format |
| 4656 | msgid "done.\n" |
| 4657 | msgstr "готово.\n" |
| 4658 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4659 | #: builtin/clone.c:459 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4660 | msgid "" |
| 4661 | "Clone succeeded, but checkout failed.\n" |
| 4662 | "You can inspect what was checked out with 'git status'\n" |
| 4663 | "and retry the checkout with 'git checkout -f HEAD'\n" |
| 4664 | msgstr "Клонирование прошло успешно, но во время перехода на версию произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку перехода на версию с помощью «git checkout -f HEAD»\n" |
| 4665 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4666 | #: builtin/clone.c:536 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4667 | #, c-format |
| 4668 | msgid "Could not find remote branch %s to clone." |
| 4669 | msgstr "Не удалось найти внешнюю ветку %s для клонирования." |
| 4670 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4671 | #: builtin/clone.c:626 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4672 | #, c-format |
| 4673 | msgid "Checking connectivity... " |
| 4674 | msgstr "Проверка соединения… " |
| 4675 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4676 | #: builtin/clone.c:629 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4677 | msgid "remote did not send all necessary objects" |
| 4678 | msgstr "внешний репозиторий прислал не все необходимые объекты" |
| 4679 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 4680 | #: builtin/clone.c:647 |
| 4681 | #, c-format |
| 4682 | msgid "unable to update %s" |
| 4683 | msgstr "не удалось обновить %s" |
| 4684 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4685 | #: builtin/clone.c:696 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4686 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
| 4687 | msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя перейти на такую версию.\n" |
| 4688 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4689 | #: builtin/clone.c:727 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4690 | msgid "unable to checkout working tree" |
| 4691 | msgstr "не удалось перейти на версию в рабочем каталоге" |
| 4692 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 4693 | #: builtin/clone.c:753 |
| 4694 | msgid "unable to write parameters to config file" |
| 4695 | msgstr "не удалось записать параметры в файл конфигурации" |
| 4696 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4697 | #: builtin/clone.c:816 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4698 | msgid "cannot repack to clean up" |
| 4699 | msgstr "не удалось выполнить перепаковку для очистки" |
| 4700 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4701 | #: builtin/clone.c:818 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4702 | msgid "cannot unlink temporary alternates file" |
| 4703 | msgstr "не удалось отсоединить временные альтернативные файлы" |
| 4704 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4705 | #: builtin/clone.c:850 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4706 | msgid "Too many arguments." |
| 4707 | msgstr "Слишком много аргументов." |
| 4708 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4709 | #: builtin/clone.c:854 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4710 | msgid "You must specify a repository to clone." |
| 4711 | msgstr "Вы должны указать репозиторий для клонирования." |
| 4712 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4713 | #: builtin/clone.c:865 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4714 | #, c-format |
| 4715 | msgid "--bare and --origin %s options are incompatible." |
| 4716 | msgstr "--bare и --origin %s нельзя использовать одновременно." |
| 4717 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4718 | #: builtin/clone.c:868 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4719 | msgid "--bare and --separate-git-dir are incompatible." |
| 4720 | msgstr "--bare и --separate-git-dir нельзя использовать одновременно." |
| 4721 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4722 | #: builtin/clone.c:881 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4723 | #, c-format |
| 4724 | msgid "repository '%s' does not exist" |
| 4725 | msgstr "репозиторий «%s» не существует" |
| 4726 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4727 | #: builtin/clone.c:887 builtin/fetch.c:1174 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4728 | #, c-format |
| 4729 | msgid "depth %s is not a positive number" |
| 4730 | msgstr "глубина %s не является положительным числом" |
| 4731 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4732 | #: builtin/clone.c:897 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4733 | #, c-format |
| 4734 | msgid "destination path '%s' already exists and is not an empty directory." |
| 4735 | msgstr "целевой путь «%s» уже существует и не является пустым каталогом." |
| 4736 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4737 | #: builtin/clone.c:907 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4738 | #, c-format |
| 4739 | msgid "working tree '%s' already exists." |
| 4740 | msgstr "рабочий каталог «%s» уже существует." |
| 4741 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4742 | #: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 |
| 4743 | #: builtin/worktree.c:219 builtin/worktree.c:246 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4744 | #, c-format |
| 4745 | msgid "could not create leading directories of '%s'" |
| 4746 | msgstr "не удалось создать родительские каталоги для «%s»" |
| 4747 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4748 | #: builtin/clone.c:925 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4749 | #, c-format |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4750 | msgid "could not create work tree dir '%s'" |
| 4751 | msgstr "не удалось создать рабочий каталог «%s»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4752 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4753 | #: builtin/clone.c:943 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4754 | #, c-format |
| 4755 | msgid "Cloning into bare repository '%s'...\n" |
| 4756 | msgstr "Клонирование в голый репозиторий «%s»…\n" |
| 4757 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4758 | #: builtin/clone.c:945 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4759 | #, c-format |
| 4760 | msgid "Cloning into '%s'...\n" |
| 4761 | msgstr "Клонирование в «%s»…\n" |
| 4762 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4763 | #: builtin/clone.c:984 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4764 | msgid "--depth is ignored in local clones; use file:// instead." |
| 4765 | msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://." |
| 4766 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4767 | #: builtin/clone.c:987 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4768 | msgid "source repository is shallow, ignoring --local" |
| 4769 | msgstr "исходный репозиторий является частичным, --local игнорируется" |
| 4770 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4771 | #: builtin/clone.c:992 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4772 | msgid "--local is ignored" |
| 4773 | msgstr "--local игнорируется" |
| 4774 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4775 | #: builtin/clone.c:996 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4776 | #, c-format |
| 4777 | msgid "Don't know how to clone %s" |
| 4778 | msgstr "Не знаю как клонировать %s" |
| 4779 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4780 | #: builtin/clone.c:1045 builtin/clone.c:1053 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4781 | #, c-format |
| 4782 | msgid "Remote branch %s not found in upstream %s" |
| 4783 | msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" |
| 4784 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4785 | #: builtin/clone.c:1056 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4786 | msgid "You appear to have cloned an empty repository." |
| 4787 | msgstr "Похоже, что вы клонировали пустой репозиторий." |
| 4788 | |
| 4789 | #: builtin/column.c:9 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4790 | msgid "git column [<options>]" |
| 4791 | msgstr "git column [<опции>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4792 | |
| 4793 | #: builtin/column.c:26 |
| 4794 | msgid "lookup config vars" |
| 4795 | msgstr "запросить переменные конфигурации" |
| 4796 | |
| 4797 | #: builtin/column.c:27 builtin/column.c:28 |
| 4798 | msgid "layout to use" |
| 4799 | msgstr "использовать схему расположения" |
| 4800 | |
| 4801 | #: builtin/column.c:29 |
| 4802 | msgid "Maximum width" |
| 4803 | msgstr "Максимальная ширина" |
| 4804 | |
| 4805 | #: builtin/column.c:30 |
| 4806 | msgid "Padding space on left border" |
| 4807 | msgstr "Расстояние отступа слева" |
| 4808 | |
| 4809 | #: builtin/column.c:31 |
| 4810 | msgid "Padding space on right border" |
| 4811 | msgstr "Расстояние отступа справа" |
| 4812 | |
| 4813 | #: builtin/column.c:32 |
| 4814 | msgid "Padding space between columns" |
| 4815 | msgstr "Расстояние отступа между колонками" |
| 4816 | |
| 4817 | #: builtin/column.c:51 |
| 4818 | msgid "--command must be the first argument" |
| 4819 | msgstr "параметр --command должен быть первым" |
| 4820 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4821 | #: builtin/commit.c:38 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4822 | msgid "git commit [<options>] [--] <pathspec>..." |
| 4823 | msgstr "git commit [<опции>] [--] <спецификация-пути>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4824 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4825 | #: builtin/commit.c:43 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 4826 | msgid "git status [<options>] [--] <pathspec>..." |
| 4827 | msgstr "git status [<опции>] [--] <спецификация-пути>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4828 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4829 | #: builtin/commit.c:48 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4830 | msgid "" |
| 4831 | "Your name and email address were configured automatically based\n" |
| 4832 | "on your username and hostname. Please check that they are accurate.\n" |
| 4833 | "You can suppress this message by setting them explicitly. Run the\n" |
| 4834 | "following command and follow the instructions in your editor to edit\n" |
| 4835 | "your configuration file:\n" |
| 4836 | "\n" |
| 4837 | " git config --global --edit\n" |
| 4838 | "\n" |
| 4839 | "After doing this, you may fix the identity used for this commit with:\n" |
| 4840 | "\n" |
| 4841 | " git commit --amend --reset-author\n" |
| 4842 | msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" |
| 4843 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4844 | #: builtin/commit.c:61 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4845 | msgid "" |
| 4846 | "Your name and email address were configured automatically based\n" |
| 4847 | "on your username and hostname. Please check that they are accurate.\n" |
| 4848 | "You can suppress this message by setting them explicitly:\n" |
| 4849 | "\n" |
| 4850 | " git config --global user.name \"Your Name\"\n" |
| 4851 | " git config --global user.email you@example.com\n" |
| 4852 | "\n" |
| 4853 | "After doing this, you may fix the identity used for this commit with:\n" |
| 4854 | "\n" |
| 4855 | " git commit --amend --reset-author\n" |
| 4856 | msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" |
| 4857 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4858 | #: builtin/commit.c:73 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4859 | msgid "" |
| 4860 | "You asked to amend the most recent commit, but doing so would make\n" |
| 4861 | "it empty. You can repeat your command with --allow-empty, or you can\n" |
| 4862 | "remove the commit entirely with \"git reset HEAD^\".\n" |
| 4863 | msgstr "Вы попросили исправить последний коммит, но делая это вы сделаете\nпустой коммит. Вы можете повторить эту команду с опцией --allow-empty\nили вы можете удалить коммит полностью с помощью команды \n«git reset HEAD^».\n" |
| 4864 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4865 | #: builtin/commit.c:78 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4866 | msgid "" |
| 4867 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" |
| 4868 | "If you wish to commit it anyway, use:\n" |
| 4869 | "\n" |
| 4870 | " git commit --allow-empty\n" |
| 4871 | "\n" |
| 4872 | msgstr "Предыдущий отбор лучшего теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n" |
| 4873 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4874 | #: builtin/commit.c:85 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4875 | msgid "Otherwise, please use 'git reset'\n" |
| 4876 | msgstr "В противном случае, используйте «git reset»\n" |
| 4877 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4878 | #: builtin/commit.c:88 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4879 | msgid "" |
| 4880 | "If you wish to skip this commit, use:\n" |
| 4881 | "\n" |
| 4882 | " git reset\n" |
| 4883 | "\n" |
| 4884 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" |
| 4885 | "the remaining commits.\n" |
| 4886 | msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит отбор лучшего\nв оставшихся коммитах.\n" |
| 4887 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4888 | #: builtin/commit.c:305 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4889 | msgid "failed to unpack HEAD tree object" |
| 4890 | msgstr "сбой распаковки объекта дерева HEAD" |
| 4891 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4892 | #: builtin/commit.c:346 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4893 | msgid "unable to create temporary index" |
| 4894 | msgstr "не удалось создать временный индекс" |
| 4895 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4896 | #: builtin/commit.c:352 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4897 | msgid "interactive add failed" |
| 4898 | msgstr "сбой интерактивного добавления" |
| 4899 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4900 | #: builtin/commit.c:365 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4901 | msgid "unable to update temporary index" |
| 4902 | msgstr "не удалось обновить временный индекс" |
| 4903 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4904 | #: builtin/commit.c:367 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4905 | msgid "Failed to update main cache tree" |
| 4906 | msgstr "Сбой при обновлении основного кэша дерева" |
| 4907 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4908 | #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4909 | msgid "unable to write new_index file" |
| 4910 | msgstr "не удалось записать файл new_index" |
| 4911 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4912 | #: builtin/commit.c:445 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4913 | msgid "cannot do a partial commit during a merge." |
| 4914 | msgstr "нельзя создать частичный коммит во время слияния." |
| 4915 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4916 | #: builtin/commit.c:447 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4917 | msgid "cannot do a partial commit during a cherry-pick." |
| 4918 | msgstr "нельзя создать частичный коммит во время отбора лучшего коммита." |
| 4919 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4920 | #: builtin/commit.c:456 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4921 | msgid "cannot read the index" |
| 4922 | msgstr "не удалось прочитать индекс" |
| 4923 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4924 | #: builtin/commit.c:475 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4925 | msgid "unable to write temporary index file" |
| 4926 | msgstr "не удалось записать временный файл индекса" |
| 4927 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4928 | #: builtin/commit.c:580 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4929 | #, c-format |
| 4930 | msgid "commit '%s' lacks author header" |
| 4931 | msgstr "у коммита «%s» отсутствует автор в заголовке" |
| 4932 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4933 | #: builtin/commit.c:582 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4934 | #, c-format |
| 4935 | msgid "commit '%s' has malformed author line" |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 4936 | msgstr "у коммита «%s» строка автора в неправильном формате" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4937 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4938 | #: builtin/commit.c:601 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4939 | msgid "malformed --author parameter" |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 4940 | msgstr "параметр --author в неправильном формате" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4941 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4942 | #: builtin/commit.c:609 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4943 | #, c-format |
| 4944 | msgid "invalid date format: %s" |
| 4945 | msgstr "неправильный формат даты: %s" |
| 4946 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4947 | #: builtin/commit.c:653 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4948 | msgid "" |
| 4949 | "unable to select a comment character that is not used\n" |
| 4950 | "in the current commit message" |
| 4951 | msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита" |
| 4952 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4953 | #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4954 | #, c-format |
| 4955 | msgid "could not lookup commit %s" |
| 4956 | msgstr "не удалось запросить коммит %s" |
| 4957 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 4958 | #: builtin/commit.c:702 builtin/shortlog.c:285 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4959 | #, c-format |
| 4960 | msgid "(reading log message from standard input)\n" |
| 4961 | msgstr "(чтение файла журнала из стандартного ввода)\n" |
| 4962 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4963 | #: builtin/commit.c:704 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4964 | msgid "could not read log from standard input" |
| 4965 | msgstr "не удалось прочитать файл журнала из стандартного ввода" |
| 4966 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4967 | #: builtin/commit.c:708 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4968 | #, c-format |
| 4969 | msgid "could not read log file '%s'" |
| 4970 | msgstr "не удалось прочитать файл журнала «%s»" |
| 4971 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4972 | #: builtin/commit.c:730 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4973 | msgid "could not read MERGE_MSG" |
| 4974 | msgstr "не удалось прочитать MERGE_MSG" |
| 4975 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4976 | #: builtin/commit.c:734 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4977 | msgid "could not read SQUASH_MSG" |
| 4978 | msgstr "не удалось прочитать SQUASH_MSG" |
| 4979 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4980 | #: builtin/commit.c:785 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4981 | msgid "could not write commit template" |
| 4982 | msgstr "не удалось записать шаблон описания коммита" |
| 4983 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4984 | #: builtin/commit.c:803 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4985 | #, c-format |
| 4986 | msgid "" |
| 4987 | "\n" |
| 4988 | "It looks like you may be committing a merge.\n" |
| 4989 | "If this is not correct, please remove the file\n" |
| 4990 | "\t%s\n" |
| 4991 | "and try again.\n" |
| 4992 | msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" |
| 4993 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 4994 | #: builtin/commit.c:808 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 4995 | #, c-format |
| 4996 | msgid "" |
| 4997 | "\n" |
| 4998 | "It looks like you may be committing a cherry-pick.\n" |
| 4999 | "If this is not correct, please remove the file\n" |
| 5000 | "\t%s\n" |
| 5001 | "and try again.\n" |
| 5002 | msgstr "\nПохоже, что вы пытаетесь закоммитить отбор лучшего.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" |
| 5003 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5004 | #: builtin/commit.c:821 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5005 | #, c-format |
| 5006 | msgid "" |
| 5007 | "Please enter the commit message for your changes. Lines starting\n" |
| 5008 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
| 5009 | msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n" |
| 5010 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5011 | #: builtin/commit.c:828 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5012 | #, c-format |
| 5013 | msgid "" |
| 5014 | "Please enter the commit message for your changes. Lines starting\n" |
| 5015 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
| 5016 | "An empty message aborts the commit.\n" |
| 5017 | msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n" |
| 5018 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5019 | #: builtin/commit.c:848 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5020 | #, c-format |
| 5021 | msgid "%sAuthor: %.*s <%.*s>" |
| 5022 | msgstr "%sАвтор: %.*s <%.*s>" |
| 5023 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5024 | #: builtin/commit.c:856 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5025 | #, c-format |
| 5026 | msgid "%sDate: %s" |
| 5027 | msgstr "%sДата: %s" |
| 5028 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5029 | #: builtin/commit.c:863 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5030 | #, c-format |
| 5031 | msgid "%sCommitter: %.*s <%.*s>" |
| 5032 | msgstr "%sКоммитер: %.*s <%.*s>" |
| 5033 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5034 | #: builtin/commit.c:881 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5035 | msgid "Cannot read index" |
| 5036 | msgstr "Не удалось прочитать индекс" |
| 5037 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5038 | #: builtin/commit.c:938 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5039 | msgid "Error building trees" |
| 5040 | msgstr "Ошибка при построении деревьев" |
| 5041 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5042 | #: builtin/commit.c:953 builtin/tag.c:266 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5043 | #, c-format |
| 5044 | msgid "Please supply the message using either -m or -F option.\n" |
| 5045 | msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n" |
| 5046 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5047 | #: builtin/commit.c:1055 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5048 | #, c-format |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 5049 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
| 5050 | msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5051 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5052 | #: builtin/commit.c:1070 builtin/commit.c:1310 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5053 | #, c-format |
| 5054 | msgid "Invalid untracked files mode '%s'" |
| 5055 | msgstr "Неправильный режим неотслеживаемых файлов «%s»" |
| 5056 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5057 | #: builtin/commit.c:1107 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5058 | msgid "--long and -z are incompatible" |
| 5059 | msgstr "--long и -z нельзя использовать одновременно" |
| 5060 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5061 | #: builtin/commit.c:1137 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5062 | msgid "Using both --reset-author and --author does not make sense" |
| 5063 | msgstr "Указание одновременно опций --reset-author и --author не имеет смысла" |
| 5064 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5065 | #: builtin/commit.c:1146 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5066 | msgid "You have nothing to amend." |
| 5067 | msgstr "Нечего исправлять." |
| 5068 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5069 | #: builtin/commit.c:1149 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5070 | msgid "You are in the middle of a merge -- cannot amend." |
| 5071 | msgstr "Вы в процессе слияния — сейчас нельзя исправлять." |
| 5072 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5073 | #: builtin/commit.c:1151 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5074 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
| 5075 | msgstr "Вы в процессе отбора лучшего — сейчас нельзя исправлять." |
| 5076 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5077 | #: builtin/commit.c:1154 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5078 | msgid "Options --squash and --fixup cannot be used together" |
| 5079 | msgstr "Опции --squash и --fixup не могут использоваться одновременно" |
| 5080 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5081 | #: builtin/commit.c:1164 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5082 | msgid "Only one of -c/-C/-F/--fixup can be used." |
| 5083 | msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." |
| 5084 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5085 | #: builtin/commit.c:1166 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5086 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
| 5087 | msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup." |
| 5088 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5089 | #: builtin/commit.c:1174 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5090 | msgid "--reset-author can be used only with -C, -c or --amend." |
| 5091 | msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend." |
| 5092 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5093 | #: builtin/commit.c:1191 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5094 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
| 5095 | msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch." |
| 5096 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5097 | #: builtin/commit.c:1193 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5098 | msgid "No paths with --include/--only does not make sense." |
| 5099 | msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." |
| 5100 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5101 | #: builtin/commit.c:1195 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5102 | msgid "Clever... amending the last one with dirty index." |
| 5103 | msgstr "Умно… отмена последнего с измененным индексом." |
| 5104 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5105 | #: builtin/commit.c:1197 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5106 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
| 5107 | msgstr "Пути явно указаны пути без опций -i или -o; предполагаю опцию --only…" |
| 5108 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5109 | #: builtin/commit.c:1209 builtin/tag.c:475 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5110 | #, c-format |
| 5111 | msgid "Invalid cleanup mode %s" |
| 5112 | msgstr "Неправильное значение режима очистки %s" |
| 5113 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5114 | #: builtin/commit.c:1214 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5115 | msgid "Paths with -a does not make sense." |
| 5116 | msgstr "С опцией -a указание пути не имеет смысла." |
| 5117 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5118 | #: builtin/commit.c:1324 builtin/commit.c:1605 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5119 | msgid "show status concisely" |
| 5120 | msgstr "кратко показать статус" |
| 5121 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5122 | #: builtin/commit.c:1326 builtin/commit.c:1607 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5123 | msgid "show branch information" |
| 5124 | msgstr "показать информацию о версии" |
| 5125 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5126 | #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 |
| 5127 | #: builtin/worktree.c:430 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5128 | msgid "machine-readable output" |
| 5129 | msgstr "машиночитаемый вывод" |
| 5130 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5131 | #: builtin/commit.c:1331 builtin/commit.c:1611 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5132 | msgid "show status in long format (default)" |
| 5133 | msgstr "показать статус в длинном формате (по умолчанию)" |
| 5134 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5135 | #: builtin/commit.c:1334 builtin/commit.c:1614 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5136 | msgid "terminate entries with NUL" |
| 5137 | msgstr "завершать записи НУЛЕВЫМ байтом" |
| 5138 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5139 | #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 |
| 5140 | #: builtin/fast-export.c:984 builtin/tag.c:353 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5141 | msgid "mode" |
| 5142 | msgstr "режим" |
| 5143 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5144 | #: builtin/commit.c:1337 builtin/commit.c:1617 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5145 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
| 5146 | msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)" |
| 5147 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5148 | #: builtin/commit.c:1340 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5149 | msgid "show ignored files" |
| 5150 | msgstr "показать игнорируемые файлы" |
| 5151 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5152 | #: builtin/commit.c:1341 parse-options.h:155 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5153 | msgid "when" |
| 5154 | msgstr "когда" |
| 5155 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5156 | #: builtin/commit.c:1342 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5157 | msgid "" |
| 5158 | "ignore changes to submodules, optional when: all, dirty, untracked. " |
| 5159 | "(Default: all)" |
| 5160 | msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)" |
| 5161 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5162 | #: builtin/commit.c:1344 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5163 | msgid "list untracked files in columns" |
| 5164 | msgstr "показать неотслеживаемые файлы по столбцам" |
| 5165 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5166 | #: builtin/commit.c:1430 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5167 | msgid "couldn't look up newly created commit" |
| 5168 | msgstr "нельзя запросить новосозданный коммит" |
| 5169 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5170 | #: builtin/commit.c:1432 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5171 | msgid "could not parse newly created commit" |
| 5172 | msgstr "нельзя разобрать новосозданный коммит" |
| 5173 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5174 | #: builtin/commit.c:1477 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5175 | msgid "detached HEAD" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5176 | msgstr "отделённый HEAD" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5177 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5178 | #: builtin/commit.c:1480 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5179 | msgid " (root-commit)" |
| 5180 | msgstr " (корневой коммит)" |
| 5181 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5182 | #: builtin/commit.c:1575 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5183 | msgid "suppress summary after successful commit" |
| 5184 | msgstr "не выводить сводку после успешного коммита" |
| 5185 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5186 | #: builtin/commit.c:1576 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5187 | msgid "show diff in commit message template" |
| 5188 | msgstr "добавить список изменений в шаблон сообщения коммита" |
| 5189 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5190 | #: builtin/commit.c:1578 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5191 | msgid "Commit message options" |
| 5192 | msgstr "Опции сообщения коммита" |
| 5193 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5194 | #: builtin/commit.c:1579 builtin/tag.c:351 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5195 | msgid "read message from file" |
| 5196 | msgstr "прочитать сообщение из файла" |
| 5197 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5198 | #: builtin/commit.c:1580 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5199 | msgid "author" |
| 5200 | msgstr "автор" |
| 5201 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5202 | #: builtin/commit.c:1580 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5203 | msgid "override author for commit" |
| 5204 | msgstr "подменить автора коммита" |
| 5205 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5206 | #: builtin/commit.c:1581 builtin/gc.c:326 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5207 | msgid "date" |
| 5208 | msgstr "дата" |
| 5209 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5210 | #: builtin/commit.c:1581 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5211 | msgid "override date for commit" |
| 5212 | msgstr "подменить дату коммита" |
| 5213 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5214 | #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 |
| 5215 | #: builtin/notes.c:558 builtin/tag.c:349 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5216 | msgid "message" |
| 5217 | msgstr "сообщение" |
| 5218 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5219 | #: builtin/commit.c:1582 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5220 | msgid "commit message" |
| 5221 | msgstr "сообщение коммита" |
| 5222 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5223 | #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 |
| 5224 | #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 |
| 5225 | msgid "commit" |
| 5226 | msgstr "коммит" |
| 5227 | |
| 5228 | #: builtin/commit.c:1583 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5229 | msgid "reuse and edit message from specified commit" |
| 5230 | msgstr "использовать и отредактировать сообщение от указанного коммита" |
| 5231 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5232 | #: builtin/commit.c:1584 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5233 | msgid "reuse message from specified commit" |
| 5234 | msgstr "использовать сообщение указанного коммита" |
| 5235 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5236 | #: builtin/commit.c:1585 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5237 | msgid "use autosquash formatted message to fixup specified commit" |
| 5238 | msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита" |
| 5239 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5240 | #: builtin/commit.c:1586 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5241 | msgid "use autosquash formatted message to squash specified commit" |
| 5242 | msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита" |
| 5243 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5244 | #: builtin/commit.c:1587 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5245 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
| 5246 | msgstr "коммит теперь за моим авторством (с использованием -C/-c/--amend)" |
| 5247 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5248 | #: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5249 | msgid "add Signed-off-by:" |
| 5250 | msgstr "добавить Signed-off-by:" |
| 5251 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5252 | #: builtin/commit.c:1589 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5253 | msgid "use specified template file" |
| 5254 | msgstr "использовать указанный файл шаблона" |
| 5255 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5256 | #: builtin/commit.c:1590 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5257 | msgid "force edit of commit" |
| 5258 | msgstr "принудительно редактировать коммит" |
| 5259 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5260 | #: builtin/commit.c:1591 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5261 | msgid "default" |
| 5262 | msgstr "по-умолчанию" |
| 5263 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5264 | #: builtin/commit.c:1591 builtin/tag.c:354 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5265 | msgid "how to strip spaces and #comments from message" |
| 5266 | msgstr "как удалять пробелы и #комментарии из сообщения коммита" |
| 5267 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5268 | #: builtin/commit.c:1592 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5269 | msgid "include status in commit message template" |
| 5270 | msgstr "включить статус файлов в шаблон сообщения коммита" |
| 5271 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5272 | #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5273 | #: builtin/revert.c:93 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5274 | msgid "GPG sign commit" |
| 5275 | msgstr "подписать коммит с помощью GPG" |
| 5276 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5277 | #: builtin/commit.c:1597 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5278 | msgid "Commit contents options" |
| 5279 | msgstr "Опции содержимого коммита" |
| 5280 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5281 | #: builtin/commit.c:1598 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5282 | msgid "commit all changed files" |
| 5283 | msgstr "закоммитить все измененные файлы" |
| 5284 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5285 | #: builtin/commit.c:1599 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5286 | msgid "add specified files to index for commit" |
| 5287 | msgstr "добавить указанные файлы в индекс для коммита" |
| 5288 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5289 | #: builtin/commit.c:1600 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5290 | msgid "interactively add files" |
| 5291 | msgstr "интерактивное добавление файлов" |
| 5292 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5293 | #: builtin/commit.c:1601 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5294 | msgid "interactively add changes" |
| 5295 | msgstr "интерактивное добавление изменений" |
| 5296 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5297 | #: builtin/commit.c:1602 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5298 | msgid "commit only specified files" |
| 5299 | msgstr "закоммитить только указанные файлы" |
| 5300 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5301 | #: builtin/commit.c:1603 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5302 | msgid "bypass pre-commit hook" |
| 5303 | msgstr "пропустить перехватчик перед-коммитом" |
| 5304 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5305 | #: builtin/commit.c:1604 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5306 | msgid "show what would be committed" |
| 5307 | msgstr "показать, что будет закоммичено" |
| 5308 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5309 | #: builtin/commit.c:1615 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5310 | msgid "amend previous commit" |
| 5311 | msgstr "исправить предыдущий коммит" |
| 5312 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5313 | #: builtin/commit.c:1616 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5314 | msgid "bypass post-rewrite hook" |
| 5315 | msgstr "пропустить перехватчик после-перезаписи" |
| 5316 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5317 | #: builtin/commit.c:1621 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5318 | msgid "ok to record an empty change" |
| 5319 | msgstr "разрешить запись пустого коммита" |
| 5320 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5321 | #: builtin/commit.c:1623 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5322 | msgid "ok to record a change with an empty message" |
| 5323 | msgstr "разрешить запись изменений с пустым сообщением" |
| 5324 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5325 | #: builtin/commit.c:1652 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5326 | msgid "could not parse HEAD commit" |
| 5327 | msgstr "не удалось разобрать HEAD коммит" |
| 5328 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5329 | #: builtin/commit.c:1698 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5330 | #, c-format |
| 5331 | msgid "Corrupt MERGE_HEAD file (%s)" |
| 5332 | msgstr "Файл MERGE_HEAD поврежден (%s)" |
| 5333 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5334 | #: builtin/commit.c:1705 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5335 | msgid "could not read MERGE_MODE" |
| 5336 | msgstr "не удалось прочитать MERGE_MODE" |
| 5337 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5338 | #: builtin/commit.c:1724 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5339 | #, c-format |
| 5340 | msgid "could not read commit message: %s" |
| 5341 | msgstr "не удалось открыть сообщение коммита: %s" |
| 5342 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5343 | #: builtin/commit.c:1735 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5344 | #, c-format |
| 5345 | msgid "Aborting commit; you did not edit the message.\n" |
| 5346 | msgstr "Отмена коммита; вы не изменили сообщение.\n" |
| 5347 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5348 | #: builtin/commit.c:1740 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5349 | #, c-format |
| 5350 | msgid "Aborting commit due to empty commit message.\n" |
| 5351 | msgstr "Отмена коммита из-за пустого сообщения коммита.\n" |
| 5352 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5353 | #: builtin/commit.c:1788 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5354 | msgid "" |
| 5355 | "Repository has been updated, but unable to write\n" |
| 5356 | "new_index file. Check that disk is not full and quota is\n" |
| 5357 | "not exceeded, and then \"git reset HEAD\" to recover." |
| 5358 | msgstr "Репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git reset HEAD» для восстановления." |
| 5359 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5360 | #: builtin/config.c:9 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 5361 | msgid "git config [<options>]" |
| 5362 | msgstr "git config [<опции>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5363 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5364 | #: builtin/config.c:56 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5365 | msgid "Config file location" |
| 5366 | msgstr "Размещение файла конфигурации" |
| 5367 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5368 | #: builtin/config.c:57 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5369 | msgid "use global config file" |
| 5370 | msgstr "использовать глобальный файл конфигурации" |
| 5371 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5372 | #: builtin/config.c:58 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5373 | msgid "use system config file" |
| 5374 | msgstr "использовать системный файл конфигурации" |
| 5375 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5376 | #: builtin/config.c:59 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5377 | msgid "use repository config file" |
| 5378 | msgstr "использовать файл конфигурации репозитория" |
| 5379 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5380 | #: builtin/config.c:60 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5381 | msgid "use given config file" |
| 5382 | msgstr "использовать указанный файл конфигурации" |
| 5383 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5384 | #: builtin/config.c:61 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5385 | msgid "blob-id" |
| 5386 | msgstr "идент-двоичн-объекта" |
| 5387 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5388 | #: builtin/config.c:61 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5389 | msgid "read config from given blob object" |
| 5390 | msgstr "прочитать настройки из указанного двоичного объекта" |
| 5391 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5392 | #: builtin/config.c:62 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5393 | msgid "Action" |
| 5394 | msgstr "Действие" |
| 5395 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5396 | #: builtin/config.c:63 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5397 | msgid "get value: name [value-regex]" |
| 5398 | msgstr "получить значение: имя [шаблон-значений]" |
| 5399 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5400 | #: builtin/config.c:64 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5401 | msgid "get all values: key [value-regex]" |
| 5402 | msgstr "получить все значения: ключ [шаблон-значений]" |
| 5403 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5404 | #: builtin/config.c:65 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5405 | msgid "get values for regexp: name-regex [value-regex]" |
| 5406 | msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]" |
| 5407 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5408 | #: builtin/config.c:66 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5409 | msgid "get value specific for the URL: section[.var] URL" |
| 5410 | msgstr "получить значение, специфичное для URL: раздел[.переменная] URL" |
| 5411 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5412 | #: builtin/config.c:67 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5413 | msgid "replace all matching variables: name value [value_regex]" |
| 5414 | msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]" |
| 5415 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5416 | #: builtin/config.c:68 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5417 | msgid "add a new variable: name value" |
| 5418 | msgstr "добавить новую переменную: имя значение" |
| 5419 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5420 | #: builtin/config.c:69 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5421 | msgid "remove a variable: name [value-regex]" |
| 5422 | msgstr "удалить переменную: имя [шаблон-значений]" |
| 5423 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5424 | #: builtin/config.c:70 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5425 | msgid "remove all matches: name [value-regex]" |
| 5426 | msgstr "удалить все совпадающие: имя [шаблон-значений]" |
| 5427 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5428 | #: builtin/config.c:71 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5429 | msgid "rename section: old-name new-name" |
| 5430 | msgstr "переименовать раздел: старое-имя новое-имя" |
| 5431 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5432 | #: builtin/config.c:72 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5433 | msgid "remove a section: name" |
| 5434 | msgstr "удалить раздел: имя" |
| 5435 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5436 | #: builtin/config.c:73 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5437 | msgid "list all" |
| 5438 | msgstr "показать весь список" |
| 5439 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5440 | #: builtin/config.c:74 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5441 | msgid "open an editor" |
| 5442 | msgstr "открыть в редакторе" |
| 5443 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5444 | #: builtin/config.c:75 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5445 | msgid "find the color configured: slot [default]" |
| 5446 | msgstr "найти настроенный цвет: раздел [по-умолчанию]" |
| 5447 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5448 | #: builtin/config.c:76 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5449 | msgid "find the color setting: slot [stdout-is-tty]" |
| 5450 | msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]" |
| 5451 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5452 | #: builtin/config.c:77 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5453 | msgid "Type" |
| 5454 | msgstr "Тип" |
| 5455 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5456 | #: builtin/config.c:78 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5457 | msgid "value is \"true\" or \"false\"" |
| 5458 | msgstr "значение — это «true» (правда) или «false» (ложь)" |
| 5459 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5460 | #: builtin/config.c:79 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5461 | msgid "value is decimal number" |
| 5462 | msgstr "значение — это десятичное число" |
| 5463 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5464 | #: builtin/config.c:80 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5465 | msgid "value is --bool or --int" |
| 5466 | msgstr "значение — это --bool или --int" |
| 5467 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5468 | #: builtin/config.c:81 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5469 | msgid "value is a path (file or directory name)" |
| 5470 | msgstr "значение — это путь (к файлу или каталогу)" |
| 5471 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5472 | #: builtin/config.c:82 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5473 | msgid "Other" |
| 5474 | msgstr "Другое" |
| 5475 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5476 | #: builtin/config.c:83 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5477 | msgid "terminate values with NUL byte" |
| 5478 | msgstr "завершать значения НУЛЕВЫМ байтом" |
| 5479 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5480 | #: builtin/config.c:84 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5481 | msgid "show variable names only" |
| 5482 | msgstr "показывать только имена переменных" |
| 5483 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5484 | #: builtin/config.c:85 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5485 | msgid "respect include directives on lookup" |
| 5486 | msgstr "учитывать директивы include (включения файлов) при запросе" |
| 5487 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5488 | #: builtin/config.c:86 |
| 5489 | msgid "show origin of config (file, standard input, blob, command line)" |
| 5490 | msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)" |
| 5491 | |
| 5492 | #: builtin/config.c:328 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5493 | msgid "unable to parse default color value" |
| 5494 | msgstr "не удалось разобрать значение цвета по умолчанию" |
| 5495 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5496 | #: builtin/config.c:469 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5497 | #, c-format |
| 5498 | msgid "" |
| 5499 | "# This is Git's per-user configuration file.\n" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 5500 | "[user]\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5501 | "# Please adapt and uncomment the following lines:\n" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 5502 | "#\tname = %s\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5503 | "#\temail = %s\n" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 5504 | msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5505 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5506 | #: builtin/config.c:611 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5507 | #, c-format |
| 5508 | msgid "cannot create configuration file %s" |
| 5509 | msgstr "не удалось создать файл конфигурации %s" |
| 5510 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5511 | #: builtin/count-objects.c:77 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5512 | msgid "git count-objects [-v] [-H | --human-readable]" |
| 5513 | msgstr "git count-objects [-v] [-H | --human-readable]" |
| 5514 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5515 | #: builtin/count-objects.c:87 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5516 | msgid "print sizes in human readable format" |
| 5517 | msgstr "вывод размеров в удобочитаемом для человека виде" |
| 5518 | |
| 5519 | #: builtin/describe.c:17 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 5520 | msgid "git describe [<options>] [<commit-ish>...]" |
| 5521 | msgstr "git describe [<опции>] [<указатель-коммита>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5522 | |
| 5523 | #: builtin/describe.c:18 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 5524 | msgid "git describe [<options>] --dirty" |
| 5525 | msgstr "git describe [<опции>] --dirty" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5526 | |
| 5527 | #: builtin/describe.c:217 |
| 5528 | #, c-format |
| 5529 | msgid "annotated tag %s not available" |
| 5530 | msgstr "аннотированная метка %s не доступна" |
| 5531 | |
| 5532 | #: builtin/describe.c:221 |
| 5533 | #, c-format |
| 5534 | msgid "annotated tag %s has no embedded name" |
| 5535 | msgstr "аннотированная метка %s не содержит встроенного названия" |
| 5536 | |
| 5537 | #: builtin/describe.c:223 |
| 5538 | #, c-format |
| 5539 | msgid "tag '%s' is really '%s' here" |
| 5540 | msgstr "метка «%s» уже здесь «%s»" |
| 5541 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5542 | #: builtin/describe.c:250 builtin/log.c:459 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5543 | #, c-format |
| 5544 | msgid "Not a valid object name %s" |
| 5545 | msgstr "Недействительное имя объекта %s" |
| 5546 | |
| 5547 | #: builtin/describe.c:253 |
| 5548 | #, c-format |
| 5549 | msgid "%s is not a valid '%s' object" |
| 5550 | msgstr "%s не является действительным объектом «%s»" |
| 5551 | |
| 5552 | #: builtin/describe.c:270 |
| 5553 | #, c-format |
| 5554 | msgid "no tag exactly matches '%s'" |
| 5555 | msgstr "нет меток, точно соответствующих «%s»" |
| 5556 | |
| 5557 | #: builtin/describe.c:272 |
| 5558 | #, c-format |
| 5559 | msgid "searching to describe %s\n" |
| 5560 | msgstr "поиск описания для %s\n" |
| 5561 | |
| 5562 | #: builtin/describe.c:319 |
| 5563 | #, c-format |
| 5564 | msgid "finished search at %s\n" |
| 5565 | msgstr "поиск окончен на %s\n" |
| 5566 | |
| 5567 | #: builtin/describe.c:346 |
| 5568 | #, c-format |
| 5569 | msgid "" |
| 5570 | "No annotated tags can describe '%s'.\n" |
| 5571 | "However, there were unannotated tags: try --tags." |
| 5572 | msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags." |
| 5573 | |
| 5574 | #: builtin/describe.c:350 |
| 5575 | #, c-format |
| 5576 | msgid "" |
| 5577 | "No tags can describe '%s'.\n" |
| 5578 | "Try --always, or create some tags." |
| 5579 | msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки." |
| 5580 | |
| 5581 | #: builtin/describe.c:371 |
| 5582 | #, c-format |
| 5583 | msgid "traversed %lu commits\n" |
| 5584 | msgstr "посещено %lu коммитов\n" |
| 5585 | |
| 5586 | #: builtin/describe.c:374 |
| 5587 | #, c-format |
| 5588 | msgid "" |
| 5589 | "more than %i tags found; listed %i most recent\n" |
| 5590 | "gave up search at %s\n" |
| 5591 | msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n" |
| 5592 | |
| 5593 | #: builtin/describe.c:396 |
| 5594 | msgid "find the tag that comes after the commit" |
| 5595 | msgstr "поиск метки, которая идет после коммита" |
| 5596 | |
| 5597 | #: builtin/describe.c:397 |
| 5598 | msgid "debug search strategy on stderr" |
| 5599 | msgstr "вывод отладочной информации стратегии поиска на стандартный вывод" |
| 5600 | |
| 5601 | #: builtin/describe.c:398 |
| 5602 | msgid "use any ref" |
| 5603 | msgstr "использовать любую ссылку" |
| 5604 | |
| 5605 | #: builtin/describe.c:399 |
| 5606 | msgid "use any tag, even unannotated" |
| 5607 | msgstr "использовать любую метку, даже неаннотированную" |
| 5608 | |
| 5609 | #: builtin/describe.c:400 |
| 5610 | msgid "always use long format" |
| 5611 | msgstr "всегда использовать длинный формат вывода" |
| 5612 | |
| 5613 | #: builtin/describe.c:401 |
| 5614 | msgid "only follow first parent" |
| 5615 | msgstr "следовать только за первым родителем" |
| 5616 | |
| 5617 | #: builtin/describe.c:404 |
| 5618 | msgid "only output exact matches" |
| 5619 | msgstr "выводить только точные совпадения" |
| 5620 | |
| 5621 | #: builtin/describe.c:406 |
| 5622 | msgid "consider <n> most recent tags (default: 10)" |
| 5623 | msgstr "рассматривать последние <n> меток (по умолчанию: 10)" |
| 5624 | |
| 5625 | #: builtin/describe.c:408 |
| 5626 | msgid "only consider tags matching <pattern>" |
| 5627 | msgstr "рассматривать только метки по <шаблону>" |
| 5628 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 5629 | #: builtin/describe.c:410 builtin/name-rev.c:314 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5630 | msgid "show abbreviated commit object as fallback" |
| 5631 | msgstr "если не найдено, показать сокращенный номер ревизии коммита" |
| 5632 | |
| 5633 | #: builtin/describe.c:411 |
| 5634 | msgid "mark" |
| 5635 | msgstr "пометка" |
| 5636 | |
| 5637 | #: builtin/describe.c:412 |
| 5638 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
| 5639 | msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)" |
| 5640 | |
| 5641 | #: builtin/describe.c:430 |
| 5642 | msgid "--long is incompatible with --abbrev=0" |
| 5643 | msgstr "--long несовместимо с --abbrev=0" |
| 5644 | |
| 5645 | #: builtin/describe.c:456 |
| 5646 | msgid "No names found, cannot describe anything." |
| 5647 | msgstr "Имена не найдены, не могу ничего описать." |
| 5648 | |
| 5649 | #: builtin/describe.c:476 |
| 5650 | msgid "--dirty is incompatible with commit-ishes" |
| 5651 | msgstr "--dirty несовместимо с указанием указателей коммитов" |
| 5652 | |
| 5653 | #: builtin/diff.c:86 |
| 5654 | #, c-format |
| 5655 | msgid "'%s': not a regular file or symlink" |
| 5656 | msgstr "«%s»: не является обычным файлом или символьной ссылкой" |
| 5657 | |
| 5658 | #: builtin/diff.c:237 |
| 5659 | #, c-format |
| 5660 | msgid "invalid option: %s" |
| 5661 | msgstr "неправильный параметр: %s" |
| 5662 | |
| 5663 | #: builtin/diff.c:358 |
| 5664 | msgid "Not a git repository" |
| 5665 | msgstr "Не является репозиторием git" |
| 5666 | |
| 5667 | #: builtin/diff.c:401 |
| 5668 | #, c-format |
| 5669 | msgid "invalid object '%s' given." |
| 5670 | msgstr "передан неправильный объект «%s»." |
| 5671 | |
| 5672 | #: builtin/diff.c:410 |
| 5673 | #, c-format |
| 5674 | msgid "more than two blobs given: '%s'" |
| 5675 | msgstr "передано больше двух двоичных объектов: «%s»" |
| 5676 | |
| 5677 | #: builtin/diff.c:417 |
| 5678 | #, c-format |
| 5679 | msgid "unhandled object '%s' given." |
| 5680 | msgstr "передан необработанный объект «%s»." |
| 5681 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5682 | #: builtin/fast-export.c:25 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5683 | msgid "git fast-export [rev-list-opts]" |
| 5684 | msgstr "git fast-export [опции-rev-list]" |
| 5685 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5686 | #: builtin/fast-export.c:980 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5687 | msgid "show progress after <n> objects" |
| 5688 | msgstr "показать прогресс после <n> объектов" |
| 5689 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5690 | #: builtin/fast-export.c:982 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5691 | msgid "select handling of signed tags" |
| 5692 | msgstr "выбор обработки подписанных меток" |
| 5693 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5694 | #: builtin/fast-export.c:985 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5695 | msgid "select handling of tags that tag filtered objects" |
| 5696 | msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты" |
| 5697 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5698 | #: builtin/fast-export.c:988 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5699 | msgid "Dump marks to this file" |
| 5700 | msgstr "Записать пометки в этот файл" |
| 5701 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5702 | #: builtin/fast-export.c:990 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5703 | msgid "Import marks from this file" |
| 5704 | msgstr "Импортировать пометки из этого файла" |
| 5705 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5706 | #: builtin/fast-export.c:992 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5707 | msgid "Fake a tagger when tags lack one" |
| 5708 | msgstr "Подделать автора метки, если у метки он отсутствует" |
| 5709 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5710 | #: builtin/fast-export.c:994 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5711 | msgid "Output full tree for each commit" |
| 5712 | msgstr "Вывести полное дерево для каждого коммита" |
| 5713 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5714 | #: builtin/fast-export.c:996 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5715 | msgid "Use the done feature to terminate the stream" |
| 5716 | msgstr "Использовать пометку завершения в конце потока" |
| 5717 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5718 | #: builtin/fast-export.c:997 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5719 | msgid "Skip output of blob data" |
| 5720 | msgstr "Пропустить вывод данных двоичных объектов" |
| 5721 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5722 | #: builtin/fast-export.c:998 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5723 | msgid "refspec" |
| 5724 | msgstr "спецификация ссылки" |
| 5725 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5726 | #: builtin/fast-export.c:999 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5727 | msgid "Apply refspec to exported refs" |
| 5728 | msgstr "Применить спецификацию ссылки к экспортируемым ссылкам" |
| 5729 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5730 | #: builtin/fast-export.c:1000 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5731 | msgid "anonymize output" |
| 5732 | msgstr "сделать вывод анонимным" |
| 5733 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5734 | #: builtin/fetch.c:20 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5735 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
| 5736 | msgstr "git fetch [<опции>] [<репозиторий> [<спецификация-ссылки>…]]" |
| 5737 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5738 | #: builtin/fetch.c:21 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5739 | msgid "git fetch [<options>] <group>" |
| 5740 | msgstr "git fetch [<опции>] <группа>" |
| 5741 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5742 | #: builtin/fetch.c:22 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5743 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
| 5744 | msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" |
| 5745 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5746 | #: builtin/fetch.c:23 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5747 | msgid "git fetch --all [<options>]" |
| 5748 | msgstr "git fetch --all [<опции>]" |
| 5749 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5750 | #: builtin/fetch.c:92 builtin/pull.c:166 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5751 | msgid "fetch from all remotes" |
| 5752 | msgstr "извлечь со всех внешних репозиториев" |
| 5753 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5754 | #: builtin/fetch.c:94 builtin/pull.c:169 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5755 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
| 5756 | msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" |
| 5757 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5758 | #: builtin/fetch.c:96 builtin/pull.c:172 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5759 | msgid "path to upload pack on remote end" |
| 5760 | msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" |
| 5761 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5762 | #: builtin/fetch.c:97 builtin/pull.c:174 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5763 | msgid "force overwrite of local branch" |
| 5764 | msgstr "принудительная перезапись локальной ветки" |
| 5765 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5766 | #: builtin/fetch.c:99 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5767 | msgid "fetch from multiple remotes" |
| 5768 | msgstr "извлечь с нескольких внешних репозиториев" |
| 5769 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5770 | #: builtin/fetch.c:101 builtin/pull.c:176 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5771 | msgid "fetch all tags and associated objects" |
| 5772 | msgstr "извлечь все метки и связанные объекты" |
| 5773 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5774 | #: builtin/fetch.c:103 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5775 | msgid "do not fetch all tags (--no-tags)" |
| 5776 | msgstr "не извлекать все метки (--no-tags)" |
| 5777 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5778 | #: builtin/fetch.c:105 |
| 5779 | msgid "number of submodules fetched in parallel" |
| 5780 | msgstr "количество подмодулей, которые будут скачаны парралельно" |
| 5781 | |
| 5782 | #: builtin/fetch.c:107 builtin/pull.c:179 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5783 | msgid "prune remote-tracking branches no longer on remote" |
| 5784 | msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" |
| 5785 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5786 | #: builtin/fetch.c:108 builtin/pull.c:182 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5787 | msgid "on-demand" |
| 5788 | msgstr "по требованию" |
| 5789 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5790 | #: builtin/fetch.c:109 builtin/pull.c:183 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5791 | msgid "control recursive fetching of submodules" |
| 5792 | msgstr "управление рекурсивным извлечением подмодулей" |
| 5793 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5794 | #: builtin/fetch.c:113 builtin/pull.c:191 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5795 | msgid "keep downloaded pack" |
| 5796 | msgstr "оставить загруженный пакет данных" |
| 5797 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5798 | #: builtin/fetch.c:115 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5799 | msgid "allow updating of HEAD ref" |
| 5800 | msgstr "разрешить обновление ссылки HEAD" |
| 5801 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5802 | #: builtin/fetch.c:118 builtin/pull.c:194 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5803 | msgid "deepen history of shallow clone" |
| 5804 | msgstr "глубокая история частичного клона" |
| 5805 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5806 | #: builtin/fetch.c:120 builtin/pull.c:197 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5807 | msgid "convert to a complete repository" |
| 5808 | msgstr "преобразовать в полный репозиторий" |
| 5809 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5810 | #: builtin/fetch.c:122 builtin/log.c:1236 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5811 | msgid "dir" |
| 5812 | msgstr "каталог" |
| 5813 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5814 | #: builtin/fetch.c:123 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5815 | msgid "prepend this to submodule path output" |
| 5816 | msgstr "присоединять это спереди к выводу путей подмодуля" |
| 5817 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5818 | #: builtin/fetch.c:126 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5819 | msgid "default mode for recursion" |
| 5820 | msgstr "режим по умолчанию для рекурсии" |
| 5821 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5822 | #: builtin/fetch.c:128 builtin/pull.c:200 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5823 | msgid "accept refs that update .git/shallow" |
| 5824 | msgstr "принимать ссылки, которые обновляют .git/shallow" |
| 5825 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5826 | #: builtin/fetch.c:129 builtin/pull.c:202 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5827 | msgid "refmap" |
| 5828 | msgstr "соответствие-ссылок" |
| 5829 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5830 | #: builtin/fetch.c:130 builtin/pull.c:203 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5831 | msgid "specify fetch refmap" |
| 5832 | msgstr "указать соответствие ссылок при извлечении" |
| 5833 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5834 | #: builtin/fetch.c:386 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5835 | msgid "Couldn't find remote ref HEAD" |
| 5836 | msgstr "Не удалось найти ссылку HEAD на внешнем репозитории" |
| 5837 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5838 | #: builtin/fetch.c:466 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5839 | #, c-format |
| 5840 | msgid "object %s not found" |
| 5841 | msgstr "объект %s не найден" |
| 5842 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5843 | #: builtin/fetch.c:471 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5844 | msgid "[up to date]" |
| 5845 | msgstr "[актуально]" |
| 5846 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5847 | #: builtin/fetch.c:485 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5848 | #, c-format |
| 5849 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" |
| 5850 | msgstr "! %-*s %-*s → %s (не удалось извлечь в текущую ветку)" |
| 5851 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5852 | #: builtin/fetch.c:486 builtin/fetch.c:574 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5853 | msgid "[rejected]" |
| 5854 | msgstr "[отклонено]" |
| 5855 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5856 | #: builtin/fetch.c:497 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5857 | msgid "[tag update]" |
| 5858 | msgstr "[обновление метки]" |
| 5859 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5860 | #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5861 | msgid " (unable to update local ref)" |
| 5862 | msgstr " (не удалось обновить локальную ссылку)" |
| 5863 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5864 | #: builtin/fetch.c:517 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5865 | msgid "[new tag]" |
| 5866 | msgstr "[новая метка]" |
| 5867 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5868 | #: builtin/fetch.c:520 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5869 | msgid "[new branch]" |
| 5870 | msgstr "[новая ветка]" |
| 5871 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5872 | #: builtin/fetch.c:523 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5873 | msgid "[new ref]" |
| 5874 | msgstr "[новая ссылка]" |
| 5875 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5876 | #: builtin/fetch.c:569 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5877 | msgid "unable to update local ref" |
| 5878 | msgstr "не удалось обновить локальную ссылку" |
| 5879 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5880 | #: builtin/fetch.c:569 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5881 | msgid "forced update" |
| 5882 | msgstr "принудительное обновление" |
| 5883 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5884 | #: builtin/fetch.c:576 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5885 | msgid "(non-fast-forward)" |
| 5886 | msgstr "(без перемотки вперед)" |
| 5887 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5888 | #: builtin/fetch.c:610 builtin/fetch.c:851 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5889 | #, c-format |
| 5890 | msgid "cannot open %s: %s\n" |
| 5891 | msgstr "не удалось открыть %s: %s\n" |
| 5892 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5893 | #: builtin/fetch.c:619 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5894 | #, c-format |
| 5895 | msgid "%s did not send all necessary objects\n" |
| 5896 | msgstr "%s не отправил все необходимые объекты\n" |
| 5897 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5898 | #: builtin/fetch.c:637 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5899 | #, c-format |
| 5900 | msgid "reject %s because shallow roots are not allowed to be updated" |
| 5901 | msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять" |
| 5902 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5903 | #: builtin/fetch.c:724 builtin/fetch.c:816 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5904 | #, c-format |
| 5905 | msgid "From %.*s\n" |
| 5906 | msgstr "Из %.*s\n" |
| 5907 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5908 | #: builtin/fetch.c:735 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5909 | #, c-format |
| 5910 | msgid "" |
| 5911 | "some local refs could not be updated; try running\n" |
| 5912 | " 'git remote prune %s' to remove any old, conflicting branches" |
| 5913 | msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки" |
| 5914 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5915 | #: builtin/fetch.c:787 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5916 | #, c-format |
| 5917 | msgid " (%s will become dangling)" |
| 5918 | msgstr " (%s будет висящей веткой)" |
| 5919 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5920 | #: builtin/fetch.c:788 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5921 | #, c-format |
| 5922 | msgid " (%s has become dangling)" |
| 5923 | msgstr " (%s стала висящей веткой)" |
| 5924 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5925 | #: builtin/fetch.c:820 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5926 | msgid "[deleted]" |
| 5927 | msgstr "[удалено]" |
| 5928 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5929 | #: builtin/fetch.c:821 builtin/remote.c:1025 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5930 | msgid "(none)" |
| 5931 | msgstr "(нет)" |
| 5932 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5933 | #: builtin/fetch.c:841 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5934 | #, c-format |
| 5935 | msgid "Refusing to fetch into current branch %s of non-bare repository" |
| 5936 | msgstr "Отказ получения в текущую ветку %s не голого репозитория" |
| 5937 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5938 | #: builtin/fetch.c:860 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5939 | #, c-format |
| 5940 | msgid "Option \"%s\" value \"%s\" is not valid for %s" |
| 5941 | msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s" |
| 5942 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5943 | #: builtin/fetch.c:863 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5944 | #, c-format |
| 5945 | msgid "Option \"%s\" is ignored for %s\n" |
| 5946 | msgstr "Параметр «%s» игнорируется для %s\n" |
| 5947 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5948 | #: builtin/fetch.c:920 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5949 | #, c-format |
| 5950 | msgid "Don't know how to fetch from %s" |
| 5951 | msgstr "Не знаю как извлечь с %s" |
| 5952 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5953 | #: builtin/fetch.c:1080 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5954 | #, c-format |
| 5955 | msgid "Fetching %s\n" |
| 5956 | msgstr "Извлечение из %s\n" |
| 5957 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5958 | #: builtin/fetch.c:1082 builtin/remote.c:96 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5959 | #, c-format |
| 5960 | msgid "Could not fetch %s" |
| 5961 | msgstr "Не удалось извлечь %s" |
| 5962 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5963 | #: builtin/fetch.c:1100 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5964 | msgid "" |
| 5965 | "No remote repository specified. Please, specify either a URL or a\n" |
| 5966 | "remote name from which new revisions should be fetched." |
| 5967 | msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции." |
| 5968 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5969 | #: builtin/fetch.c:1123 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5970 | msgid "You need to specify a tag name." |
| 5971 | msgstr "Вам нужно указать имя метки." |
| 5972 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5973 | #: builtin/fetch.c:1165 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5974 | msgid "--depth and --unshallow cannot be used together" |
| 5975 | msgstr "нельзя использовать одновременно --depth и --unshallow" |
| 5976 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5977 | #: builtin/fetch.c:1167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5978 | msgid "--unshallow on a complete repository does not make sense" |
| 5979 | msgstr "--unshallow не имеет смысла на полном репозитории" |
| 5980 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5981 | #: builtin/fetch.c:1187 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5982 | msgid "fetch --all does not take a repository argument" |
| 5983 | msgstr "fetch --all не принимает имя репозитория как аргумент" |
| 5984 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5985 | #: builtin/fetch.c:1189 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5986 | msgid "fetch --all does not make sense with refspecs" |
| 5987 | msgstr "fetch --all не имеет смысла при указании спецификаций ссылок" |
| 5988 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5989 | #: builtin/fetch.c:1200 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5990 | #, c-format |
| 5991 | msgid "No such remote or remote group: %s" |
| 5992 | msgstr "Нет такого внешнего репозитория или группы: %s" |
| 5993 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 5994 | #: builtin/fetch.c:1208 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5995 | msgid "Fetching a group and specifying refspecs does not make sense" |
| 5996 | msgstr "Получение группы и указание спецификаций ссылок не имеет смысла" |
| 5997 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 5998 | #: builtin/fmt-merge-msg.c:14 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 5999 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6000 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" |
| 6001 | msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6002 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6003 | #: builtin/fmt-merge-msg.c:667 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6004 | msgid "populate log with at most <n> entries from shortlog" |
| 6005 | msgstr "отправить в журнал <n> записей из короткого журнала" |
| 6006 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6007 | #: builtin/fmt-merge-msg.c:670 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6008 | msgid "alias for --log (deprecated)" |
| 6009 | msgstr "сокращение для --log (устаревшее)" |
| 6010 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6011 | #: builtin/fmt-merge-msg.c:673 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6012 | msgid "text" |
| 6013 | msgstr "текст" |
| 6014 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6015 | #: builtin/fmt-merge-msg.c:674 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6016 | msgid "use <text> as start of message" |
| 6017 | msgstr "использовать <текст> как начальное сообщение" |
| 6018 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6019 | #: builtin/fmt-merge-msg.c:675 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6020 | msgid "file to read from" |
| 6021 | msgstr "файл для чтения" |
| 6022 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6023 | #: builtin/for-each-ref.c:9 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6024 | msgid "git for-each-ref [<options>] [<pattern>]" |
| 6025 | msgstr "git for-each-ref [<опции>] [<шаблон>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6026 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6027 | #: builtin/for-each-ref.c:10 |
| 6028 | msgid "git for-each-ref [--points-at <object>]" |
| 6029 | msgstr "git for-each-ref [--points-at <объект>]" |
| 6030 | |
| 6031 | #: builtin/for-each-ref.c:11 |
| 6032 | msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" |
| 6033 | msgstr "git for-each-ref [(--merged | --no-merged) [<объект>]]" |
| 6034 | |
| 6035 | #: builtin/for-each-ref.c:12 |
| 6036 | msgid "git for-each-ref [--contains [<object>]]" |
| 6037 | msgstr "git for-each-ref [--contains [<объект>]]" |
| 6038 | |
| 6039 | #: builtin/for-each-ref.c:27 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6040 | msgid "quote placeholders suitably for shells" |
| 6041 | msgstr "выводить указатели места заполнения в подходящем формате для командного процессора" |
| 6042 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6043 | #: builtin/for-each-ref.c:29 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6044 | msgid "quote placeholders suitably for perl" |
| 6045 | msgstr "выводить указатели места заполнения в подходящем формате для perl" |
| 6046 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6047 | #: builtin/for-each-ref.c:31 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6048 | msgid "quote placeholders suitably for python" |
| 6049 | msgstr "выводить указатели места заполнения в подходящем формате для python" |
| 6050 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6051 | #: builtin/for-each-ref.c:33 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6052 | msgid "quote placeholders suitably for Tcl" |
| 6053 | msgstr "выводить указатели места заполнения в подходящем формате для Tcl" |
| 6054 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6055 | #: builtin/for-each-ref.c:36 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6056 | msgid "show only <n> matched refs" |
| 6057 | msgstr "показать только <n> совпадающих ссылок" |
| 6058 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6059 | #: builtin/for-each-ref.c:37 builtin/tag.c:372 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6060 | msgid "format to use for the output" |
| 6061 | msgstr "использовать формат для вывода" |
| 6062 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6063 | #: builtin/for-each-ref.c:41 |
| 6064 | msgid "print only refs which points at the given object" |
| 6065 | msgstr "вывод только ссылок, которые указывают на переданный объект" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6066 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6067 | #: builtin/for-each-ref.c:43 |
| 6068 | msgid "print only refs that are merged" |
| 6069 | msgstr "вывод только слитых ссылок" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6070 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6071 | #: builtin/for-each-ref.c:44 |
| 6072 | msgid "print only refs that are not merged" |
| 6073 | msgstr "вывод только не слитых ссылок" |
| 6074 | |
| 6075 | #: builtin/for-each-ref.c:45 |
| 6076 | msgid "print only refs which contain the commit" |
| 6077 | msgstr "вывод только ссылок, которые содержат коммит" |
| 6078 | |
| 6079 | #: builtin/fsck.c:156 builtin/prune.c:140 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6080 | msgid "Checking connectivity" |
| 6081 | msgstr "Проверка соединения" |
| 6082 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6083 | #: builtin/fsck.c:486 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6084 | msgid "Checking object directories" |
| 6085 | msgstr "Проверка каталогов объектов" |
| 6086 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6087 | #: builtin/fsck.c:553 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6088 | msgid "git fsck [<options>] [<object>...]" |
| 6089 | msgstr "git fsck [<опции>] [<объект>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6090 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6091 | #: builtin/fsck.c:559 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6092 | msgid "show unreachable objects" |
| 6093 | msgstr "показать недоступные объекты" |
| 6094 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6095 | #: builtin/fsck.c:560 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6096 | msgid "show dangling objects" |
| 6097 | msgstr "показать объекты, на которые нет ссылок" |
| 6098 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6099 | #: builtin/fsck.c:561 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6100 | msgid "report tags" |
| 6101 | msgstr "вывести отчет по меткам" |
| 6102 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6103 | #: builtin/fsck.c:562 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6104 | msgid "report root nodes" |
| 6105 | msgstr "вывести отчет по корневым узлам" |
| 6106 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6107 | #: builtin/fsck.c:563 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6108 | msgid "make index objects head nodes" |
| 6109 | msgstr "воспринимать объекты в индексе как корневые узлы" |
| 6110 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6111 | #: builtin/fsck.c:564 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6112 | msgid "make reflogs head nodes (default)" |
| 6113 | msgstr "создать корневые узлы журналов ссылок (по умолчанию)" |
| 6114 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6115 | #: builtin/fsck.c:565 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6116 | msgid "also consider packs and alternate objects" |
| 6117 | msgstr "также проверять пакеты и альтернативные объекты" |
| 6118 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6119 | #: builtin/fsck.c:566 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6120 | msgid "check only connectivity" |
| 6121 | msgstr "только проверить соединение" |
| 6122 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6123 | #: builtin/fsck.c:567 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6124 | msgid "enable more strict checking" |
| 6125 | msgstr "использовать более строгую проверку" |
| 6126 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6127 | #: builtin/fsck.c:569 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6128 | msgid "write dangling objects in .git/lost-found" |
| 6129 | msgstr "записать объекты на которые нет ссылок в .git/lost-found" |
| 6130 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6131 | #: builtin/fsck.c:570 builtin/prune.c:107 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6132 | msgid "show progress" |
| 6133 | msgstr "показать прогресс выполнения" |
| 6134 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6135 | #: builtin/fsck.c:631 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6136 | msgid "Checking objects" |
| 6137 | msgstr "Проверка объектов" |
| 6138 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6139 | #: builtin/gc.c:25 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6140 | msgid "git gc [<options>]" |
| 6141 | msgstr "git gc [<опции>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6142 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6143 | #: builtin/gc.c:72 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6144 | #, c-format |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6145 | msgid "Invalid %s: '%s'" |
| 6146 | msgstr "Недействительный %s: «%s»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6147 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6148 | #: builtin/gc.c:139 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6149 | #, c-format |
| 6150 | msgid "insanely long object directory %.*s" |
| 6151 | msgstr "слишком длинный путь к каталогу объекта %.*s" |
| 6152 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6153 | #: builtin/gc.c:290 |
| 6154 | #, c-format |
| 6155 | msgid "" |
| 6156 | "The last gc run reported the following. Please correct the root cause\n" |
| 6157 | "and remove %s.\n" |
| 6158 | "Automatic cleanup will not be performed until the file is removed.\n" |
| 6159 | "\n" |
| 6160 | "%s" |
| 6161 | msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s" |
| 6162 | |
| 6163 | #: builtin/gc.c:327 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6164 | msgid "prune unreferenced objects" |
| 6165 | msgstr "почистить объекты, на которые нет ссылок" |
| 6166 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6167 | #: builtin/gc.c:329 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6168 | msgid "be more thorough (increased runtime)" |
| 6169 | msgstr "проверять более внимательно (занимает больше времени)" |
| 6170 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6171 | #: builtin/gc.c:330 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6172 | msgid "enable auto-gc mode" |
| 6173 | msgstr "включить режим auto-gc" |
| 6174 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6175 | #: builtin/gc.c:331 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6176 | msgid "force running gc even if there may be another gc running" |
| 6177 | msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена" |
| 6178 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6179 | #: builtin/gc.c:373 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6180 | #, c-format |
| 6181 | msgid "Auto packing the repository in background for optimum performance.\n" |
| 6182 | msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n" |
| 6183 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6184 | #: builtin/gc.c:375 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6185 | #, c-format |
| 6186 | msgid "Auto packing the repository for optimum performance.\n" |
| 6187 | msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n" |
| 6188 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6189 | #: builtin/gc.c:376 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6190 | #, c-format |
| 6191 | msgid "See \"git help gc\" for manual housekeeping.\n" |
| 6192 | msgstr "Смотрите «git help gc» руководства по ручной очистке.\n" |
| 6193 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6194 | #: builtin/gc.c:397 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6195 | #, c-format |
| 6196 | msgid "" |
| 6197 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" |
| 6198 | msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)" |
| 6199 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6200 | #: builtin/gc.c:441 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6201 | msgid "" |
| 6202 | "There are too many unreachable loose objects; run 'git prune' to remove " |
| 6203 | "them." |
| 6204 | msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления." |
| 6205 | |
| 6206 | #: builtin/grep.c:23 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6207 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
| 6208 | msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6209 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6210 | #: builtin/grep.c:219 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6211 | #, c-format |
| 6212 | msgid "grep: failed to create thread: %s" |
| 6213 | msgstr "grep: сбой создания потока: %s" |
| 6214 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6215 | #: builtin/grep.c:277 |
| 6216 | #, c-format |
| 6217 | msgid "invalid number of threads specified (%d) for %s" |
| 6218 | msgstr "указано недопустимое количество потоков (%d) для %s" |
| 6219 | |
| 6220 | #: builtin/grep.c:452 builtin/grep.c:487 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6221 | #, c-format |
| 6222 | msgid "unable to read tree (%s)" |
| 6223 | msgstr "не удалось прочитать дерево (%s)" |
| 6224 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6225 | #: builtin/grep.c:502 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6226 | #, c-format |
| 6227 | msgid "unable to grep from object of type %s" |
| 6228 | msgstr "не удалось выполнить grep из объекта типа %s" |
| 6229 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6230 | #: builtin/grep.c:558 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6231 | #, c-format |
| 6232 | msgid "switch `%c' expects a numerical value" |
| 6233 | msgstr "параметр «%c» ожидает числовое значение" |
| 6234 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6235 | #: builtin/grep.c:575 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6236 | #, c-format |
| 6237 | msgid "cannot open '%s'" |
| 6238 | msgstr "не удалось открыть «%s»" |
| 6239 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6240 | #: builtin/grep.c:644 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6241 | msgid "search in index instead of in the work tree" |
| 6242 | msgstr "искать в индексе, а не в рабочем каталоге" |
| 6243 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6244 | #: builtin/grep.c:646 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6245 | msgid "find in contents not managed by git" |
| 6246 | msgstr "искать в содержимом не управляемым git" |
| 6247 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6248 | #: builtin/grep.c:648 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6249 | msgid "search in both tracked and untracked files" |
| 6250 | msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах" |
| 6251 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6252 | #: builtin/grep.c:650 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6253 | msgid "ignore files specified via '.gitignore'" |
| 6254 | msgstr "игнорировать файлы указанные в «.gitignore»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6255 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6256 | #: builtin/grep.c:653 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6257 | msgid "show non-matching lines" |
| 6258 | msgstr "искать в несовпадающих строках" |
| 6259 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6260 | #: builtin/grep.c:655 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6261 | msgid "case insensitive matching" |
| 6262 | msgstr "без учета регистра" |
| 6263 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6264 | #: builtin/grep.c:657 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6265 | msgid "match patterns only at word boundaries" |
| 6266 | msgstr "искать совпадения шаблона только на границах слов" |
| 6267 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6268 | #: builtin/grep.c:659 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6269 | msgid "process binary files as text" |
| 6270 | msgstr "обработка двоичных файлов как текста" |
| 6271 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6272 | #: builtin/grep.c:661 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6273 | msgid "don't match patterns in binary files" |
| 6274 | msgstr "не искать совпадения шаблона в двоичных файлах" |
| 6275 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6276 | #: builtin/grep.c:664 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6277 | msgid "process binary files with textconv filters" |
| 6278 | msgstr "обрабатываться двоичные файлы с помощью фильтров textconv" |
| 6279 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6280 | #: builtin/grep.c:666 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6281 | msgid "descend at most <depth> levels" |
| 6282 | msgstr "на глубине максиму <глубина> уровней" |
| 6283 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6284 | #: builtin/grep.c:670 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6285 | msgid "use extended POSIX regular expressions" |
| 6286 | msgstr "использовать расширенные регулярные выражения POSIX" |
| 6287 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6288 | #: builtin/grep.c:673 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6289 | msgid "use basic POSIX regular expressions (default)" |
| 6290 | msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)" |
| 6291 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6292 | #: builtin/grep.c:676 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6293 | msgid "interpret patterns as fixed strings" |
| 6294 | msgstr "интерпретировать шаблоны как фиксированные строки" |
| 6295 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6296 | #: builtin/grep.c:679 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6297 | msgid "use Perl-compatible regular expressions" |
| 6298 | msgstr "использовать Perl-совместимые регулярные выражения" |
| 6299 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6300 | #: builtin/grep.c:682 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6301 | msgid "show line numbers" |
| 6302 | msgstr "вывести номера строк" |
| 6303 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6304 | #: builtin/grep.c:683 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6305 | msgid "don't show filenames" |
| 6306 | msgstr "не выводить имена файлов" |
| 6307 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6308 | #: builtin/grep.c:684 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6309 | msgid "show filenames" |
| 6310 | msgstr "выводить имена файлов" |
| 6311 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6312 | #: builtin/grep.c:686 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6313 | msgid "show filenames relative to top directory" |
| 6314 | msgstr "выводить имена файлов относительно каталога репозитория" |
| 6315 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6316 | #: builtin/grep.c:688 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6317 | msgid "show only filenames instead of matching lines" |
| 6318 | msgstr "выводить только имена файлов, а не совпадающие строки" |
| 6319 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6320 | #: builtin/grep.c:690 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6321 | msgid "synonym for --files-with-matches" |
| 6322 | msgstr "синоним для --files-with-matches" |
| 6323 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6324 | #: builtin/grep.c:693 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6325 | msgid "show only the names of files without match" |
| 6326 | msgstr "выводить только несовпадающие имена файлов" |
| 6327 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6328 | #: builtin/grep.c:695 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6329 | msgid "print NUL after filenames" |
| 6330 | msgstr "выводить двоичный НОЛЬ после списка имен файлов" |
| 6331 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6332 | #: builtin/grep.c:697 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6333 | msgid "show the number of matches instead of matching lines" |
| 6334 | msgstr "выводить количество совпадений, а не совпадающие строки" |
| 6335 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6336 | #: builtin/grep.c:698 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6337 | msgid "highlight matches" |
| 6338 | msgstr "подсвечивать совпадения" |
| 6339 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6340 | #: builtin/grep.c:700 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6341 | msgid "print empty line between matches from different files" |
| 6342 | msgstr "выводить пустую строку после совпадений из разных файлов" |
| 6343 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6344 | #: builtin/grep.c:702 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6345 | msgid "show filename only once above matches from same file" |
| 6346 | msgstr "выводить имя файла только раз на несколько совпадений в одном файле" |
| 6347 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6348 | #: builtin/grep.c:705 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6349 | msgid "show <n> context lines before and after matches" |
| 6350 | msgstr "показать <n> строк контекста перед и после совпадения" |
| 6351 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6352 | #: builtin/grep.c:708 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6353 | msgid "show <n> context lines before matches" |
| 6354 | msgstr "показать <n> строк контекста перед совпадением" |
| 6355 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6356 | #: builtin/grep.c:710 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6357 | msgid "show <n> context lines after matches" |
| 6358 | msgstr "показать <n> строк контекста после совпадения" |
| 6359 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6360 | #: builtin/grep.c:712 |
| 6361 | msgid "use <n> worker threads" |
| 6362 | msgstr "использовать <кол> рабочих потоков" |
| 6363 | |
| 6364 | #: builtin/grep.c:713 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6365 | msgid "shortcut for -C NUM" |
| 6366 | msgstr "тоже, что и -C КОЛИЧЕСТВО" |
| 6367 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6368 | #: builtin/grep.c:716 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6369 | msgid "show a line with the function name before matches" |
| 6370 | msgstr "показать строку с именем функции перед совпадением" |
| 6371 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6372 | #: builtin/grep.c:718 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6373 | msgid "show the surrounding function" |
| 6374 | msgstr "показать окружающую функцию" |
| 6375 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6376 | #: builtin/grep.c:721 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6377 | msgid "read patterns from file" |
| 6378 | msgstr "прочитать шаблоны из файла" |
| 6379 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6380 | #: builtin/grep.c:723 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6381 | msgid "match <pattern>" |
| 6382 | msgstr "поиск соответствий с <шаблоном>" |
| 6383 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6384 | #: builtin/grep.c:725 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6385 | msgid "combine patterns specified with -e" |
| 6386 | msgstr "объединить шаблоны указанные с помощью -e" |
| 6387 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6388 | #: builtin/grep.c:737 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6389 | msgid "indicate hit with exit status without output" |
| 6390 | msgstr "ничего не выводить, указать на совпадение с помощью кода выхода" |
| 6391 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6392 | #: builtin/grep.c:739 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6393 | msgid "show only matches from files that match all patterns" |
| 6394 | msgstr "показать только совпадения из файлов в которых совпадают все шаблоны" |
| 6395 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6396 | #: builtin/grep.c:741 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6397 | msgid "show parse tree for grep expression" |
| 6398 | msgstr "показать дерево разбора для выражения поиска" |
| 6399 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6400 | #: builtin/grep.c:745 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6401 | msgid "pager" |
| 6402 | msgstr "пейджер" |
| 6403 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6404 | #: builtin/grep.c:745 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6405 | msgid "show matching files in the pager" |
| 6406 | msgstr "показать совпадающие файлы с помощью программы-пейджера" |
| 6407 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6408 | #: builtin/grep.c:748 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6409 | msgid "allow calling of grep(1) (ignored by this build)" |
| 6410 | msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" |
| 6411 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6412 | #: builtin/grep.c:811 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6413 | msgid "no pattern given." |
| 6414 | msgstr "не задан шаблон." |
| 6415 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6416 | #: builtin/grep.c:843 builtin/index-pack.c:1475 |
| 6417 | #, c-format |
| 6418 | msgid "invalid number of threads specified (%d)" |
| 6419 | msgstr "указано неправильное количество потоков (%d)" |
| 6420 | |
| 6421 | #: builtin/grep.c:873 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6422 | msgid "--open-files-in-pager only works on the worktree" |
| 6423 | msgstr "--open-files-in-pager работает только в рабочем каталоге" |
| 6424 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6425 | #: builtin/grep.c:899 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6426 | msgid "--cached or --untracked cannot be used with --no-index." |
| 6427 | msgstr "--cached или --untracked нельзя использовать одновременно с --no-index." |
| 6428 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6429 | #: builtin/grep.c:904 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6430 | msgid "--no-index or --untracked cannot be used with revs." |
| 6431 | msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии." |
| 6432 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6433 | #: builtin/grep.c:907 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6434 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
| 6435 | msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого." |
| 6436 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6437 | #: builtin/grep.c:915 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6438 | msgid "both --cached and trees are given." |
| 6439 | msgstr "указано одновременно --cached и дерево." |
| 6440 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6441 | #: builtin/hash-object.c:81 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6442 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6443 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
| 6444 | "[--] <file>..." |
| 6445 | msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6446 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6447 | #: builtin/hash-object.c:82 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6448 | msgid "git hash-object --stdin-paths" |
| 6449 | msgstr "git hash-object --stdin-paths" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6450 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6451 | #: builtin/hash-object.c:93 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6452 | msgid "type" |
| 6453 | msgstr "тип" |
| 6454 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6455 | #: builtin/hash-object.c:93 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6456 | msgid "object type" |
| 6457 | msgstr "тип объекта" |
| 6458 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6459 | #: builtin/hash-object.c:94 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6460 | msgid "write the object into the object database" |
| 6461 | msgstr "запись объекта в базу данных объектов" |
| 6462 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6463 | #: builtin/hash-object.c:96 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6464 | msgid "read the object from stdin" |
| 6465 | msgstr "прочитать объект из стандартного ввода" |
| 6466 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6467 | #: builtin/hash-object.c:98 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6468 | msgid "store file as is without filters" |
| 6469 | msgstr "сохранить файл без использования фильтров" |
| 6470 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6471 | #: builtin/hash-object.c:99 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6472 | msgid "" |
| 6473 | "just hash any random garbage to create corrupt objects for debugging Git" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6474 | msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6475 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6476 | #: builtin/hash-object.c:100 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6477 | msgid "process file as it were from this path" |
| 6478 | msgstr "обработать файл так, будто он находится по указанному пути" |
| 6479 | |
| 6480 | #: builtin/help.c:41 |
| 6481 | msgid "print all available commands" |
| 6482 | msgstr "вывести список всех доступных команд" |
| 6483 | |
| 6484 | #: builtin/help.c:42 |
| 6485 | msgid "print list of useful guides" |
| 6486 | msgstr "вывести список полезных руководств" |
| 6487 | |
| 6488 | #: builtin/help.c:43 |
| 6489 | msgid "show man page" |
| 6490 | msgstr "открыть руководство в формате man" |
| 6491 | |
| 6492 | #: builtin/help.c:44 |
| 6493 | msgid "show manual in web browser" |
| 6494 | msgstr "открыть руководство в веб-браузере" |
| 6495 | |
| 6496 | #: builtin/help.c:46 |
| 6497 | msgid "show info page" |
| 6498 | msgstr "открыть руководство в формате info" |
| 6499 | |
| 6500 | #: builtin/help.c:52 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6501 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
| 6502 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6503 | |
| 6504 | #: builtin/help.c:64 |
| 6505 | #, c-format |
| 6506 | msgid "unrecognized help format '%s'" |
| 6507 | msgstr "неопознанный формат руководства «%s»" |
| 6508 | |
| 6509 | #: builtin/help.c:91 |
| 6510 | msgid "Failed to start emacsclient." |
| 6511 | msgstr "Сбой при запуске emacsclient." |
| 6512 | |
| 6513 | #: builtin/help.c:104 |
| 6514 | msgid "Failed to parse emacsclient version." |
| 6515 | msgstr "Сбой при определении версии emacsclient." |
| 6516 | |
| 6517 | #: builtin/help.c:112 |
| 6518 | #, c-format |
| 6519 | msgid "emacsclient version '%d' too old (< 22)." |
| 6520 | msgstr "версия emacsclient «%d» слишком старая (< 22)." |
| 6521 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6522 | #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6523 | #, c-format |
| 6524 | msgid "failed to exec '%s': %s" |
| 6525 | msgstr "сбой при запуске «%s»: %s" |
| 6526 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6527 | #: builtin/help.c:205 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6528 | #, c-format |
| 6529 | msgid "" |
| 6530 | "'%s': path for unsupported man viewer.\n" |
| 6531 | "Please consider using 'man.<tool>.cmd' instead." |
| 6532 | msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»." |
| 6533 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6534 | #: builtin/help.c:217 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6535 | #, c-format |
| 6536 | msgid "" |
| 6537 | "'%s': cmd for supported man viewer.\n" |
| 6538 | "Please consider using 'man.<tool>.path' instead." |
| 6539 | msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»." |
| 6540 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6541 | #: builtin/help.c:334 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6542 | #, c-format |
| 6543 | msgid "'%s': unknown man viewer." |
| 6544 | msgstr "«%s»: неизвестная программа просмотра man." |
| 6545 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6546 | #: builtin/help.c:351 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6547 | msgid "no man viewer handled the request" |
| 6548 | msgstr "программа просмотра man не обработала запрос" |
| 6549 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6550 | #: builtin/help.c:359 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6551 | msgid "no info viewer handled the request" |
| 6552 | msgstr "программа просмотра info не обработала запрос" |
| 6553 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6554 | #: builtin/help.c:408 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6555 | msgid "Defining attributes per path" |
| 6556 | msgstr "Определение атрибутов для путей файлов или каталогов" |
| 6557 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6558 | #: builtin/help.c:409 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6559 | msgid "Everyday Git With 20 Commands Or So" |
| 6560 | msgstr "Повседневный Git с 20 командами или около того" |
| 6561 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6562 | #: builtin/help.c:410 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6563 | msgid "A Git glossary" |
| 6564 | msgstr "Глоссарий Git" |
| 6565 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6566 | #: builtin/help.c:411 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6567 | msgid "Specifies intentionally untracked files to ignore" |
| 6568 | msgstr "Указание специально игнорируемых файлов" |
| 6569 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6570 | #: builtin/help.c:412 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6571 | msgid "Defining submodule properties" |
| 6572 | msgstr "Определение свойств подмодулей" |
| 6573 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6574 | #: builtin/help.c:413 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6575 | msgid "Specifying revisions and ranges for Git" |
| 6576 | msgstr "Указание редакций и диапазонов для Git" |
| 6577 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6578 | #: builtin/help.c:414 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6579 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
| 6580 | msgstr "Учебное введение в Git (для версии 1.5.1 или новее)" |
| 6581 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6582 | #: builtin/help.c:415 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6583 | msgid "An overview of recommended workflows with Git" |
| 6584 | msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" |
| 6585 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6586 | #: builtin/help.c:427 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6587 | msgid "The common Git guides are:\n" |
| 6588 | msgstr "Основные руководства Git:\n" |
| 6589 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6590 | #: builtin/help.c:448 builtin/help.c:465 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6591 | #, c-format |
| 6592 | msgid "usage: %s%s" |
| 6593 | msgstr "использование: %s%s" |
| 6594 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6595 | #: builtin/help.c:481 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6596 | #, c-format |
| 6597 | msgid "`git %s' is aliased to `%s'" |
| 6598 | msgstr "«git %s» — это сокращение для «%s»" |
| 6599 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6600 | #: builtin/index-pack.c:152 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6601 | #, c-format |
| 6602 | msgid "unable to open %s" |
| 6603 | msgstr "не удалось открыть %s" |
| 6604 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6605 | #: builtin/index-pack.c:202 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6606 | #, c-format |
| 6607 | msgid "object type mismatch at %s" |
| 6608 | msgstr "несоответствие типа объекта на %s" |
| 6609 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6610 | #: builtin/index-pack.c:222 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6611 | #, c-format |
| 6612 | msgid "did not receive expected object %s" |
| 6613 | msgstr "ожидаемый объект не получен на %s" |
| 6614 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6615 | #: builtin/index-pack.c:225 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6616 | #, c-format |
| 6617 | msgid "object %s: expected type %s, found %s" |
| 6618 | msgstr "объект %s: ожидаемый тип %s, получен %s" |
| 6619 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6620 | #: builtin/index-pack.c:267 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6621 | #, c-format |
| 6622 | msgid "cannot fill %d byte" |
| 6623 | msgid_plural "cannot fill %d bytes" |
| 6624 | msgstr[0] "не удалось заполнить %d байт" |
| 6625 | msgstr[1] "не удалось заполнить %d байта" |
| 6626 | msgstr[2] "не удалось заполнить %d байтов" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6627 | msgstr[3] "не удалось заполнить %d байтов" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6628 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6629 | #: builtin/index-pack.c:277 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6630 | msgid "early EOF" |
| 6631 | msgstr "неожиданный конец файла" |
| 6632 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6633 | #: builtin/index-pack.c:278 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6634 | msgid "read error on input" |
| 6635 | msgstr "ошибка чтения ввода" |
| 6636 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6637 | #: builtin/index-pack.c:290 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6638 | msgid "used more bytes than were available" |
| 6639 | msgstr "использовано больше байт, чем было доступно" |
| 6640 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6641 | #: builtin/index-pack.c:297 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6642 | msgid "pack too large for current definition of off_t" |
| 6643 | msgstr "пакет слишком большой для текущего определения off_t" |
| 6644 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6645 | #: builtin/index-pack.c:313 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6646 | #, c-format |
| 6647 | msgid "unable to create '%s'" |
| 6648 | msgstr "не удалось создать «%s»" |
| 6649 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6650 | #: builtin/index-pack.c:318 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6651 | #, c-format |
| 6652 | msgid "cannot open packfile '%s'" |
| 6653 | msgstr "не удалось открыть файл пакета «%s»" |
| 6654 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6655 | #: builtin/index-pack.c:332 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6656 | msgid "pack signature mismatch" |
| 6657 | msgstr "несоответствие подписи пакета" |
| 6658 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6659 | #: builtin/index-pack.c:334 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6660 | #, c-format |
| 6661 | msgid "pack version %<PRIu32> unsupported" |
| 6662 | msgstr "версия пакета %<PRIu32> не поддерживается" |
| 6663 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6664 | #: builtin/index-pack.c:352 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6665 | #, c-format |
| 6666 | msgid "pack has bad object at offset %lu: %s" |
| 6667 | msgstr "в пакете содержится поврежденный объект по смещению %lu: %s" |
| 6668 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6669 | #: builtin/index-pack.c:473 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6670 | #, c-format |
| 6671 | msgid "inflate returned %d" |
| 6672 | msgstr "программа сжатия вернула %d" |
| 6673 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6674 | #: builtin/index-pack.c:522 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6675 | msgid "offset value overflow for delta base object" |
| 6676 | msgstr "переполнение значения смещения у базового объекта дельты" |
| 6677 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6678 | #: builtin/index-pack.c:530 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6679 | msgid "delta base offset is out of bound" |
| 6680 | msgstr "смещение базовой дельты вышло за допустимые пределы" |
| 6681 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6682 | #: builtin/index-pack.c:538 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6683 | #, c-format |
| 6684 | msgid "unknown object type %d" |
| 6685 | msgstr "неизвестный тип объекта %d" |
| 6686 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6687 | #: builtin/index-pack.c:569 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6688 | msgid "cannot pread pack file" |
| 6689 | msgstr "не удалось выполнить pread для файла пакета" |
| 6690 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6691 | #: builtin/index-pack.c:571 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6692 | #, c-format |
| 6693 | msgid "premature end of pack file, %lu byte missing" |
| 6694 | msgid_plural "premature end of pack file, %lu bytes missing" |
| 6695 | msgstr[0] "преждевременное окончание файла пакета, %lu байт отсутствует" |
| 6696 | msgstr[1] "преждевременное окончание файла пакета, %lu байта отсутствует" |
| 6697 | msgstr[2] "преждевременное окончание файла пакета, %lu байтов отсутствует" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6698 | msgstr[3] "преждевременное окончание файла пакета, %lu байтов отсутствует" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6699 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6700 | #: builtin/index-pack.c:597 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6701 | msgid "serious inflate inconsistency" |
| 6702 | msgstr "серьезное несоответствие при распаковке" |
| 6703 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6704 | #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 |
| 6705 | #: builtin/index-pack.c:806 builtin/index-pack.c:815 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6706 | #, c-format |
| 6707 | msgid "SHA1 COLLISION FOUND WITH %s !" |
| 6708 | msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !" |
| 6709 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6710 | #: builtin/index-pack.c:746 builtin/pack-objects.c:162 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6711 | #: builtin/pack-objects.c:254 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6712 | #, c-format |
| 6713 | msgid "unable to read %s" |
| 6714 | msgstr "не удалось прочитать %s" |
| 6715 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6716 | #: builtin/index-pack.c:812 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6717 | #, c-format |
| 6718 | msgid "cannot read existing object %s" |
| 6719 | msgstr "не удалось прочитать существующий объект %s" |
| 6720 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6721 | #: builtin/index-pack.c:826 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6722 | #, c-format |
| 6723 | msgid "invalid blob object %s" |
| 6724 | msgstr "неправильный файл двоичного объекта %s" |
| 6725 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 6726 | #: builtin/index-pack.c:840 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6727 | #, c-format |
| 6728 | msgid "invalid %s" |
| 6729 | msgstr "неправильный %s" |
| 6730 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6731 | #: builtin/index-pack.c:843 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6732 | msgid "Error in object" |
| 6733 | msgstr "Ошибка в объекте" |
| 6734 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6735 | #: builtin/index-pack.c:845 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6736 | #, c-format |
| 6737 | msgid "Not all child objects of %s are reachable" |
| 6738 | msgstr "Не все дочерние объекты %s достижимы" |
| 6739 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6740 | #: builtin/index-pack.c:917 builtin/index-pack.c:948 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6741 | msgid "failed to apply delta" |
| 6742 | msgstr "сбой при применении дельты" |
| 6743 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6744 | #: builtin/index-pack.c:1118 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6745 | msgid "Receiving objects" |
| 6746 | msgstr "Получение объектов" |
| 6747 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6748 | #: builtin/index-pack.c:1118 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6749 | msgid "Indexing objects" |
| 6750 | msgstr "Индексирование объектов" |
| 6751 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6752 | #: builtin/index-pack.c:1150 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6753 | msgid "pack is corrupted (SHA1 mismatch)" |
| 6754 | msgstr "пакет поврежден (несоответствие SHA1)" |
| 6755 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6756 | #: builtin/index-pack.c:1155 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6757 | msgid "cannot fstat packfile" |
| 6758 | msgstr "не удалось выполнить fstat для файла пакета" |
| 6759 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6760 | #: builtin/index-pack.c:1158 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6761 | msgid "pack has junk at the end" |
| 6762 | msgstr "файл пакета содержит мусор в конце" |
| 6763 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6764 | #: builtin/index-pack.c:1169 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6765 | msgid "confusion beyond insanity in parse_pack_objects()" |
| 6766 | msgstr "безумная путаница в parse_pack_objects()" |
| 6767 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6768 | #: builtin/index-pack.c:1194 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6769 | msgid "Resolving deltas" |
| 6770 | msgstr "Определение изменений" |
| 6771 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6772 | #: builtin/index-pack.c:1205 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6773 | #, c-format |
| 6774 | msgid "unable to create thread: %s" |
| 6775 | msgstr "не удалось создать поток: %s" |
| 6776 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6777 | #: builtin/index-pack.c:1247 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6778 | msgid "confusion beyond insanity" |
| 6779 | msgstr "безумная путаница" |
| 6780 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6781 | #: builtin/index-pack.c:1253 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6782 | #, c-format |
| 6783 | msgid "completed with %d local objects" |
| 6784 | msgstr "завершено с %d локальными объектами" |
| 6785 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6786 | #: builtin/index-pack.c:1263 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6787 | #, c-format |
| 6788 | msgid "Unexpected tail checksum for %s (disk corruption?)" |
| 6789 | msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" |
| 6790 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6791 | #: builtin/index-pack.c:1267 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6792 | #, c-format |
| 6793 | msgid "pack has %d unresolved delta" |
| 6794 | msgid_plural "pack has %d unresolved deltas" |
| 6795 | msgstr[0] "пакет содержит %d неразрешенную дельту" |
| 6796 | msgstr[1] "пакет содержит %d неразрешенные дельты" |
| 6797 | msgstr[2] "пакет содержит %d неразрешенных дельт" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6798 | msgstr[3] "пакет содержит %d неразрешенных дельт" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6799 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6800 | #: builtin/index-pack.c:1291 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6801 | #, c-format |
| 6802 | msgid "unable to deflate appended object (%d)" |
| 6803 | msgstr "нельзя сжать присоединенный объект (%d)" |
| 6804 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6805 | #: builtin/index-pack.c:1367 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6806 | #, c-format |
| 6807 | msgid "local object %s is corrupt" |
| 6808 | msgstr "локальный объект %s поврежден" |
| 6809 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6810 | #: builtin/index-pack.c:1391 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6811 | msgid "error while closing pack file" |
| 6812 | msgstr "ошибка при закрытии файла пакета" |
| 6813 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6814 | #: builtin/index-pack.c:1404 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6815 | #, c-format |
| 6816 | msgid "cannot write keep file '%s'" |
| 6817 | msgstr "не удалось записать файл удержания «%s»" |
| 6818 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6819 | #: builtin/index-pack.c:1412 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6820 | #, c-format |
| 6821 | msgid "cannot close written keep file '%s'" |
| 6822 | msgstr "не удалось закрыть записанный файл удержания «%s»" |
| 6823 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6824 | #: builtin/index-pack.c:1425 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6825 | msgid "cannot store pack file" |
| 6826 | msgstr "не удалось сохранить файл пакета" |
| 6827 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6828 | #: builtin/index-pack.c:1436 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6829 | msgid "cannot store index file" |
| 6830 | msgstr "не удалось сохранить файл индекса" |
| 6831 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6832 | #: builtin/index-pack.c:1469 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6833 | #, c-format |
| 6834 | msgid "bad pack.indexversion=%<PRIu32>" |
| 6835 | msgstr "плохой pack.indexversion=%<PRIu32>" |
| 6836 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6837 | #: builtin/index-pack.c:1479 builtin/index-pack.c:1664 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6838 | #, c-format |
| 6839 | msgid "no threads support, ignoring %s" |
| 6840 | msgstr "нет поддержки потоков, игнорирование %s" |
| 6841 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6842 | #: builtin/index-pack.c:1538 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6843 | #, c-format |
| 6844 | msgid "Cannot open existing pack file '%s'" |
| 6845 | msgstr "Не удалось открыть существующий файл пакета «%s»" |
| 6846 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6847 | #: builtin/index-pack.c:1540 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6848 | #, c-format |
| 6849 | msgid "Cannot open existing pack idx file for '%s'" |
| 6850 | msgstr "Не удалось открыть существующий файл индекса для «%s»" |
| 6851 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6852 | #: builtin/index-pack.c:1587 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6853 | #, c-format |
| 6854 | msgid "non delta: %d object" |
| 6855 | msgid_plural "non delta: %d objects" |
| 6856 | msgstr[0] "не дельты: %d объект" |
| 6857 | msgstr[1] "не дельты: %d объекта" |
| 6858 | msgstr[2] "не дельты: %d объектов" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6859 | msgstr[3] "не дельты: %d объектов" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6860 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6861 | #: builtin/index-pack.c:1594 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6862 | #, c-format |
| 6863 | msgid "chain length = %d: %lu object" |
| 6864 | msgid_plural "chain length = %d: %lu objects" |
| 6865 | msgstr[0] "длина цепочки = %d: %lu объект" |
| 6866 | msgstr[1] "длина цепочки = %d: %lu объекта" |
| 6867 | msgstr[2] "длина цепочки = %d: %lu объектов" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 6868 | msgstr[3] "длина цепочки = %d: %lu объектов" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6869 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6870 | #: builtin/index-pack.c:1624 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6871 | msgid "Cannot come back to cwd" |
| 6872 | msgstr "Не удалось вернуться в текущий рабочий каталог" |
| 6873 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6874 | #: builtin/index-pack.c:1676 builtin/index-pack.c:1679 |
| 6875 | #: builtin/index-pack.c:1691 builtin/index-pack.c:1695 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6876 | #, c-format |
| 6877 | msgid "bad %s" |
| 6878 | msgstr "плохой %s" |
| 6879 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6880 | #: builtin/index-pack.c:1709 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6881 | msgid "--fix-thin cannot be used without --stdin" |
| 6882 | msgstr "--fix-thin нельзя использовать без --stdin" |
| 6883 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6884 | #: builtin/index-pack.c:1713 builtin/index-pack.c:1722 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6885 | #, c-format |
| 6886 | msgid "packfile name '%s' does not end with '.pack'" |
| 6887 | msgstr "имя пакета «%s» не оканчивается на «.pack»" |
| 6888 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 6889 | #: builtin/index-pack.c:1730 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6890 | msgid "--verify with no packfile name given" |
| 6891 | msgstr "--verify без указания имени файла пакета" |
| 6892 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6893 | #: builtin/init-db.c:55 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6894 | #, c-format |
| 6895 | msgid "cannot stat '%s'" |
| 6896 | msgstr "не удалось выполнить stat для «%s»" |
| 6897 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6898 | #: builtin/init-db.c:61 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6899 | #, c-format |
| 6900 | msgid "cannot stat template '%s'" |
| 6901 | msgstr "не удалось выполнить stat для шаблона «%s»" |
| 6902 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6903 | #: builtin/init-db.c:66 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6904 | #, c-format |
| 6905 | msgid "cannot opendir '%s'" |
| 6906 | msgstr "не удалось выполнить opendir для «%s»" |
| 6907 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6908 | #: builtin/init-db.c:77 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6909 | #, c-format |
| 6910 | msgid "cannot readlink '%s'" |
| 6911 | msgstr "не удалось выполнить readlink для «%s»" |
| 6912 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6913 | #: builtin/init-db.c:79 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6914 | #, c-format |
| 6915 | msgid "cannot symlink '%s' '%s'" |
| 6916 | msgstr "не удалось создать символьную ссылку «%s» на «%s»" |
| 6917 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6918 | #: builtin/init-db.c:85 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6919 | #, c-format |
| 6920 | msgid "cannot copy '%s' to '%s'" |
| 6921 | msgstr "не удалось скопировать файл «%s» в «%s»" |
| 6922 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6923 | #: builtin/init-db.c:89 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6924 | #, c-format |
| 6925 | msgid "ignoring template %s" |
| 6926 | msgstr "игнорирование шаблона %s" |
| 6927 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6928 | #: builtin/init-db.c:118 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6929 | #, c-format |
| 6930 | msgid "templates not found %s" |
| 6931 | msgstr "шаблоны не найдены %s" |
| 6932 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6933 | #: builtin/init-db.c:131 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6934 | #, c-format |
| 6935 | msgid "not copying templates of a wrong format version %d from '%s'" |
| 6936 | msgstr "не копирую шаблоны в неправильной версии формата %d из «%s»" |
| 6937 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6938 | #: builtin/init-db.c:309 builtin/init-db.c:312 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6939 | #, c-format |
| 6940 | msgid "%s already exists" |
| 6941 | msgstr "%s уже существует" |
| 6942 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6943 | #: builtin/init-db.c:340 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6944 | #, c-format |
| 6945 | msgid "unable to handle file type %d" |
| 6946 | msgstr "не удается обработать файл типа %d" |
| 6947 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6948 | #: builtin/init-db.c:343 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6949 | #, c-format |
| 6950 | msgid "unable to move %s to %s" |
| 6951 | msgstr "не удается переместить файл %s в %s" |
| 6952 | |
| 6953 | #. TRANSLATORS: The first '%s' is either "Reinitialized |
| 6954 | #. existing" or "Initialized empty", the second " shared" or |
| 6955 | #. "", and the last '%s%s' is the verbatim directory name. |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6956 | #: builtin/init-db.c:399 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6957 | #, c-format |
| 6958 | msgid "%s%s Git repository in %s%s\n" |
| 6959 | msgstr "%s%s репозиторий Git в %s%s\n" |
| 6960 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6961 | #: builtin/init-db.c:400 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6962 | msgid "Reinitialized existing" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 6963 | msgstr "Переинициализация существующего" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6964 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6965 | #: builtin/init-db.c:400 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6966 | msgid "Initialized empty" |
| 6967 | msgstr "Инициализирован пустой" |
| 6968 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6969 | #: builtin/init-db.c:401 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6970 | msgid " shared" |
| 6971 | msgstr " общий" |
| 6972 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6973 | #: builtin/init-db.c:448 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6974 | msgid "" |
| 6975 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] " |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 6976 | "[--shared[=<permissions>]] [<directory>]" |
| 6977 | msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6978 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6979 | #: builtin/init-db.c:471 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6980 | msgid "permissions" |
| 6981 | msgstr "права-доступа" |
| 6982 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6983 | #: builtin/init-db.c:472 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6984 | msgid "specify that the git repository is to be shared amongst several users" |
| 6985 | msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями" |
| 6986 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6987 | #: builtin/init-db.c:506 builtin/init-db.c:511 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6988 | #, c-format |
| 6989 | msgid "cannot mkdir %s" |
| 6990 | msgstr "не удалось выполнить mkdir %s" |
| 6991 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6992 | #: builtin/init-db.c:515 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6993 | #, c-format |
| 6994 | msgid "cannot chdir to %s" |
| 6995 | msgstr "не удалось выполнить chdir в %s" |
| 6996 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 6997 | #: builtin/init-db.c:536 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 6998 | #, c-format |
| 6999 | msgid "" |
| 7000 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" |
| 7001 | "dir=<directory>)" |
| 7002 | msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)" |
| 7003 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7004 | #: builtin/init-db.c:564 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7005 | #, c-format |
| 7006 | msgid "Cannot access work tree '%s'" |
| 7007 | msgstr "Не удалось получить доступ к рабочему каталогу «%s»" |
| 7008 | |
| 7009 | #: builtin/interpret-trailers.c:15 |
| 7010 | msgid "" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7011 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
| 7012 | "<token>[(=|:)<value>])...] [<file>...]" |
| 7013 | msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7014 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7015 | #: builtin/interpret-trailers.c:26 |
| 7016 | msgid "edit files in place" |
| 7017 | msgstr "редактировать файлы на месте" |
| 7018 | |
| 7019 | #: builtin/interpret-trailers.c:27 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7020 | msgid "trim empty trailers" |
| 7021 | msgstr "удалять пустые завершители" |
| 7022 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7023 | #: builtin/interpret-trailers.c:28 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7024 | msgid "trailer" |
| 7025 | msgstr "завершитель" |
| 7026 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7027 | #: builtin/interpret-trailers.c:29 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7028 | msgid "trailer(s) to add" |
| 7029 | msgstr "завершители для добавления" |
| 7030 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7031 | #: builtin/interpret-trailers.c:42 |
| 7032 | msgid "no input file given for in-place editing" |
| 7033 | msgstr "ничего не передано, для редактирования файлов на месте" |
| 7034 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7035 | #: builtin/log.c:43 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 7036 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7037 | msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" |
| 7038 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7039 | #: builtin/log.c:44 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7040 | msgid "git show [<options>] <object>..." |
| 7041 | msgstr "git show [<опции>] <объект>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7042 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7043 | #: builtin/log.c:83 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7044 | #, c-format |
| 7045 | msgid "invalid --decorate option: %s" |
| 7046 | msgstr "неправильный параметр для --decorate: %s" |
| 7047 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7048 | #: builtin/log.c:131 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7049 | msgid "suppress diff output" |
| 7050 | msgstr "не выводить различия" |
| 7051 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7052 | #: builtin/log.c:132 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7053 | msgid "show source" |
| 7054 | msgstr "показать источник" |
| 7055 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7056 | #: builtin/log.c:133 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7057 | msgid "Use mail map file" |
| 7058 | msgstr "Использовать файл соответствия почтовых адресов" |
| 7059 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7060 | #: builtin/log.c:134 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7061 | msgid "decorate options" |
| 7062 | msgstr "опции формата вывода ссылок" |
| 7063 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7064 | #: builtin/log.c:137 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7065 | msgid "Process line range n,m in file, counting from 1" |
| 7066 | msgstr "Обработать диапазон строк n,m из файла, начиная с 1" |
| 7067 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7068 | #: builtin/log.c:233 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7069 | #, c-format |
| 7070 | msgid "Final output: %d %s\n" |
| 7071 | msgstr "Финальный вывод: %d %s\n" |
| 7072 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7073 | #: builtin/log.c:465 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7074 | #, c-format |
| 7075 | msgid "git show %s: bad file" |
| 7076 | msgstr "git show %s: плохой файл" |
| 7077 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7078 | #: builtin/log.c:479 builtin/log.c:572 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7079 | #, c-format |
| 7080 | msgid "Could not read object %s" |
| 7081 | msgstr "Не удалось прочитать объект %s" |
| 7082 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7083 | #: builtin/log.c:596 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7084 | #, c-format |
| 7085 | msgid "Unknown type: %d" |
| 7086 | msgstr "Неизвестный тип объекта: %d" |
| 7087 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7088 | #: builtin/log.c:715 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7089 | msgid "format.headers without value" |
| 7090 | msgstr "в format.headers не указано значение" |
| 7091 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7092 | #: builtin/log.c:801 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7093 | msgid "name of output directory is too long" |
| 7094 | msgstr "слишком длинное имя выходного каталога" |
| 7095 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7096 | #: builtin/log.c:816 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7097 | #, c-format |
| 7098 | msgid "Cannot open patch file %s" |
| 7099 | msgstr "Ну удалось открыть файл изменений %s" |
| 7100 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7101 | #: builtin/log.c:830 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7102 | msgid "Need exactly one range." |
| 7103 | msgstr "Нужен только один диапазон." |
| 7104 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7105 | #: builtin/log.c:840 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7106 | msgid "Not a range." |
| 7107 | msgstr "Не является диапазоном." |
| 7108 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7109 | #: builtin/log.c:946 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7110 | msgid "Cover letter needs email format" |
| 7111 | msgstr "Сопроводительное письмо должно быть в формате электронной почты" |
| 7112 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7113 | #: builtin/log.c:1025 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7114 | #, c-format |
| 7115 | msgid "insane in-reply-to: %s" |
| 7116 | msgstr "ошибка в поле in-reply-to: %s" |
| 7117 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7118 | #: builtin/log.c:1053 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7119 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
| 7120 | msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7121 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7122 | #: builtin/log.c:1098 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7123 | msgid "Two output directories?" |
| 7124 | msgstr "Два выходных каталога?" |
| 7125 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7126 | #: builtin/log.c:1214 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7127 | msgid "use [PATCH n/m] even with a single patch" |
| 7128 | msgstr "выводить [PATCH n/m] даже когда один патч" |
| 7129 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7130 | #: builtin/log.c:1217 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7131 | msgid "use [PATCH] even with multiple patches" |
| 7132 | msgstr "выводить [PATCH] даже когда несколько патчей" |
| 7133 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7134 | #: builtin/log.c:1221 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7135 | msgid "print patches to standard out" |
| 7136 | msgstr "выводить патчи на стандартный вывод" |
| 7137 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7138 | #: builtin/log.c:1223 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7139 | msgid "generate a cover letter" |
| 7140 | msgstr "генерировать сопроводительное письмо" |
| 7141 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7142 | #: builtin/log.c:1225 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7143 | msgid "use simple number sequence for output file names" |
| 7144 | msgstr "использовать простую последовательность чисел для имен выходных файлов" |
| 7145 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7146 | #: builtin/log.c:1226 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7147 | msgid "sfx" |
| 7148 | msgstr "суффикс" |
| 7149 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7150 | #: builtin/log.c:1227 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7151 | msgid "use <sfx> instead of '.patch'" |
| 7152 | msgstr "использовать суффикс <суффикс> вместо «.patch»" |
| 7153 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7154 | #: builtin/log.c:1229 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7155 | msgid "start numbering patches at <n> instead of 1" |
| 7156 | msgstr "начать нумерацию патчей с <n>, а не с 1" |
| 7157 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7158 | #: builtin/log.c:1231 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7159 | msgid "mark the series as Nth re-roll" |
| 7160 | msgstr "пометить серию как энную попытку" |
| 7161 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7162 | #: builtin/log.c:1233 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7163 | msgid "Use [<prefix>] instead of [PATCH]" |
| 7164 | msgstr "Использовать [<префикс>] вместо [PATCH]" |
| 7165 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7166 | #: builtin/log.c:1236 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7167 | msgid "store resulting files in <dir>" |
| 7168 | msgstr "сохранить результирующие файлы в <каталог>" |
| 7169 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7170 | #: builtin/log.c:1239 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7171 | msgid "don't strip/add [PATCH]" |
| 7172 | msgstr "не обрезать/добавлять [PATCH]" |
| 7173 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7174 | #: builtin/log.c:1242 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7175 | msgid "don't output binary diffs" |
| 7176 | msgstr "не выводить двоичные различия" |
| 7177 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7178 | #: builtin/log.c:1244 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7179 | msgid "output all-zero hash in From header" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7180 | msgstr "выводить нулевую хэш-сумму в заголовке From" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7181 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7182 | #: builtin/log.c:1246 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7183 | msgid "don't include a patch matching a commit upstream" |
| 7184 | msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" |
| 7185 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7186 | #: builtin/log.c:1248 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7187 | msgid "show patch format instead of default (patch + stat)" |
| 7188 | msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" |
| 7189 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7190 | #: builtin/log.c:1250 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7191 | msgid "Messaging" |
| 7192 | msgstr "Передача сообщений" |
| 7193 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7194 | #: builtin/log.c:1251 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7195 | msgid "header" |
| 7196 | msgstr "заголовок" |
| 7197 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7198 | #: builtin/log.c:1252 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7199 | msgid "add email header" |
| 7200 | msgstr "добавить заголовок сообщения" |
| 7201 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7202 | #: builtin/log.c:1253 builtin/log.c:1255 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7203 | msgid "email" |
| 7204 | msgstr "почта" |
| 7205 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7206 | #: builtin/log.c:1253 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7207 | msgid "add To: header" |
| 7208 | msgstr "добавить заголовок To:" |
| 7209 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7210 | #: builtin/log.c:1255 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7211 | msgid "add Cc: header" |
| 7212 | msgstr "добавить заголовок Cc:" |
| 7213 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7214 | #: builtin/log.c:1257 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7215 | msgid "ident" |
| 7216 | msgstr "идентификатор" |
| 7217 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7218 | #: builtin/log.c:1258 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7219 | msgid "set From address to <ident> (or committer ident if absent)" |
| 7220 | msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)" |
| 7221 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7222 | #: builtin/log.c:1260 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7223 | msgid "message-id" |
| 7224 | msgstr "идентификатор-сообщения" |
| 7225 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7226 | #: builtin/log.c:1261 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7227 | msgid "make first mail a reply to <message-id>" |
| 7228 | msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" |
| 7229 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7230 | #: builtin/log.c:1262 builtin/log.c:1265 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7231 | msgid "boundary" |
| 7232 | msgstr "вложение" |
| 7233 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7234 | #: builtin/log.c:1263 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7235 | msgid "attach the patch" |
| 7236 | msgstr "приложить патч" |
| 7237 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7238 | #: builtin/log.c:1266 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7239 | msgid "inline the patch" |
| 7240 | msgstr "включить патч в текст письма" |
| 7241 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7242 | #: builtin/log.c:1270 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7243 | msgid "enable message threading, styles: shallow, deep" |
| 7244 | msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" |
| 7245 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7246 | #: builtin/log.c:1272 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7247 | msgid "signature" |
| 7248 | msgstr "подпись" |
| 7249 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7250 | #: builtin/log.c:1273 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7251 | msgid "add a signature" |
| 7252 | msgstr "добавить подпись" |
| 7253 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7254 | #: builtin/log.c:1275 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7255 | msgid "add a signature from a file" |
| 7256 | msgstr "добавить подпись из файла" |
| 7257 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7258 | #: builtin/log.c:1276 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7259 | msgid "don't print the patch filenames" |
| 7260 | msgstr "не выводить имена файлов патчей" |
| 7261 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7262 | #: builtin/log.c:1365 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7263 | msgid "-n and -k are mutually exclusive." |
| 7264 | msgstr "-n и -k нельзя использовать одновременно" |
| 7265 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7266 | #: builtin/log.c:1367 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7267 | msgid "--subject-prefix and -k are mutually exclusive." |
| 7268 | msgstr "--subject-prefix и -k нельзя использовать одновременно." |
| 7269 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7270 | #: builtin/log.c:1375 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7271 | msgid "--name-only does not make sense" |
| 7272 | msgstr "--name-only не имеет смысла" |
| 7273 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7274 | #: builtin/log.c:1377 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7275 | msgid "--name-status does not make sense" |
| 7276 | msgstr "--name-status не имеет смысла" |
| 7277 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7278 | #: builtin/log.c:1379 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7279 | msgid "--check does not make sense" |
| 7280 | msgstr "--check не имеет смысла" |
| 7281 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7282 | #: builtin/log.c:1407 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7283 | msgid "standard output, or directory, which one?" |
| 7284 | msgstr "стандартный вывод или каталог?" |
| 7285 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7286 | #: builtin/log.c:1409 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7287 | #, c-format |
| 7288 | msgid "Could not create directory '%s'" |
| 7289 | msgstr "Не удалось создать каталог «%s»" |
| 7290 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7291 | #: builtin/log.c:1506 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7292 | #, c-format |
| 7293 | msgid "unable to read signature file '%s'" |
| 7294 | msgstr "не удалось прочитать файл подписи «%s»" |
| 7295 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7296 | #: builtin/log.c:1569 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7297 | msgid "Failed to create output files" |
| 7298 | msgstr "Сбой при создании выходных файлов" |
| 7299 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7300 | #: builtin/log.c:1617 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7301 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
| 7302 | msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]" |
| 7303 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7304 | #: builtin/log.c:1671 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7305 | #, c-format |
| 7306 | msgid "" |
| 7307 | "Could not find a tracked remote branch, please specify <upstream> " |
| 7308 | "manually.\n" |
| 7309 | msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n" |
| 7310 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7311 | #: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7312 | #, c-format |
| 7313 | msgid "Unknown commit %s" |
| 7314 | msgstr "Неизвестный коммит %s" |
| 7315 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7316 | #: builtin/ls-files.c:378 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7317 | msgid "git ls-files [<options>] [<file>...]" |
| 7318 | msgstr "git ls-files [<опции>] [<файл>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7319 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7320 | #: builtin/ls-files.c:427 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7321 | msgid "identify the file status with tags" |
| 7322 | msgstr "выводить имена файлов с метками" |
| 7323 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7324 | #: builtin/ls-files.c:429 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7325 | msgid "use lowercase letters for 'assume unchanged' files" |
| 7326 | msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов" |
| 7327 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7328 | #: builtin/ls-files.c:431 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7329 | msgid "show cached files in the output (default)" |
| 7330 | msgstr "показывать кэшированные файлы при выводе (по умолчанию)" |
| 7331 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7332 | #: builtin/ls-files.c:433 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7333 | msgid "show deleted files in the output" |
| 7334 | msgstr "показывать удаленные файлы при выводе" |
| 7335 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7336 | #: builtin/ls-files.c:435 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7337 | msgid "show modified files in the output" |
| 7338 | msgstr "показывать измененные файлы при выводе" |
| 7339 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7340 | #: builtin/ls-files.c:437 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7341 | msgid "show other files in the output" |
| 7342 | msgstr "показывать другие файлы при выводе" |
| 7343 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7344 | #: builtin/ls-files.c:439 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7345 | msgid "show ignored files in the output" |
| 7346 | msgstr "показывать игнорируемые файлы при выводе" |
| 7347 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7348 | #: builtin/ls-files.c:442 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7349 | msgid "show staged contents' object name in the output" |
| 7350 | msgstr "показывать имя индексированного объекта на выводе" |
| 7351 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7352 | #: builtin/ls-files.c:444 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7353 | msgid "show files on the filesystem that need to be removed" |
| 7354 | msgstr "показывать файлы в файловой системе, которые должны быть удалены" |
| 7355 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7356 | #: builtin/ls-files.c:446 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7357 | msgid "show 'other' directories' names only" |
| 7358 | msgstr "показывать только имена у «других» каталогов" |
| 7359 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7360 | #: builtin/ls-files.c:448 |
| 7361 | msgid "show line endings of files" |
| 7362 | msgstr "показать концы строк файлов" |
| 7363 | |
| 7364 | #: builtin/ls-files.c:450 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7365 | msgid "don't show empty directories" |
| 7366 | msgstr "не показывать пустые каталоги" |
| 7367 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7368 | #: builtin/ls-files.c:453 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7369 | msgid "show unmerged files in the output" |
| 7370 | msgstr "показывать не слитые файлы на выводе" |
| 7371 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7372 | #: builtin/ls-files.c:455 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7373 | msgid "show resolve-undo information" |
| 7374 | msgstr "показывать информации о разрешении конфликтов и отмене" |
| 7375 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7376 | #: builtin/ls-files.c:457 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7377 | msgid "skip files matching pattern" |
| 7378 | msgstr "пропустить файлы, соответствующие шаблону" |
| 7379 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7380 | #: builtin/ls-files.c:460 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7381 | msgid "exclude patterns are read from <file>" |
| 7382 | msgstr "прочитать шаблоны исключения из <файл>" |
| 7383 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7384 | #: builtin/ls-files.c:463 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7385 | msgid "read additional per-directory exclude patterns in <file>" |
| 7386 | msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>" |
| 7387 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7388 | #: builtin/ls-files.c:465 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7389 | msgid "add the standard git exclusions" |
| 7390 | msgstr "добавить стандартные исключения git" |
| 7391 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7392 | #: builtin/ls-files.c:468 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7393 | msgid "make the output relative to the project top directory" |
| 7394 | msgstr "выводить пути относительно корневого каталога проекта" |
| 7395 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7396 | #: builtin/ls-files.c:471 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7397 | msgid "if any <file> is not in the index, treat this as an error" |
| 7398 | msgstr "если какой-либо <файл> не в индексе, считать это ошибкой" |
| 7399 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7400 | #: builtin/ls-files.c:472 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7401 | msgid "tree-ish" |
| 7402 | msgstr "указатель-дерева" |
| 7403 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7404 | #: builtin/ls-files.c:473 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7405 | msgid "pretend that paths removed since <tree-ish> are still present" |
| 7406 | msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует" |
| 7407 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7408 | #: builtin/ls-files.c:475 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7409 | msgid "show debugging data" |
| 7410 | msgstr "показать отладочную информацию" |
| 7411 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7412 | #: builtin/ls-remote.c:7 |
| 7413 | msgid "" |
| 7414 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" |
| 7415 | " [-q | --quiet] [--exit-code] [--get-url]\n" |
| 7416 | " [--symref] [<repository> [<refs>...]]" |
| 7417 | msgstr "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<запуск>]\n [-q | --quiet] [--exit-code] [--get-url]\n [--symref] [<репозиторий> [<ссылки>…]]" |
| 7418 | |
| 7419 | #: builtin/ls-remote.c:50 |
| 7420 | msgid "do not print remote URL" |
| 7421 | msgstr "не выводить URL внешних репозиториев" |
| 7422 | |
| 7423 | #: builtin/ls-remote.c:51 builtin/ls-remote.c:53 |
| 7424 | msgid "exec" |
| 7425 | msgstr "запуск" |
| 7426 | |
| 7427 | #: builtin/ls-remote.c:52 builtin/ls-remote.c:54 |
| 7428 | msgid "path of git-upload-pack on the remote host" |
| 7429 | msgstr "путь к git-upload-pack на внешнем сервере" |
| 7430 | |
| 7431 | #: builtin/ls-remote.c:56 |
| 7432 | msgid "limit to tags" |
| 7433 | msgstr "ограничить вывод метками" |
| 7434 | |
| 7435 | #: builtin/ls-remote.c:57 |
| 7436 | msgid "limit to heads" |
| 7437 | msgstr "ограничить вывод указателями на ветки" |
| 7438 | |
| 7439 | #: builtin/ls-remote.c:58 |
| 7440 | msgid "do not show peeled tags" |
| 7441 | msgstr "не показывать удалённые метки" |
| 7442 | |
| 7443 | #: builtin/ls-remote.c:60 |
| 7444 | msgid "take url.<base>.insteadOf into account" |
| 7445 | msgstr "учитывать url.<база>.insteadOf" |
| 7446 | |
| 7447 | #: builtin/ls-remote.c:62 |
| 7448 | msgid "exit with exit code 2 if no matching refs are found" |
| 7449 | msgstr "выходить с кодом 2, если соответствующие ссылки не найдены" |
| 7450 | |
| 7451 | #: builtin/ls-remote.c:64 |
| 7452 | msgid "show underlying ref in addition to the object pointed by it" |
| 7453 | msgstr "показать также внутреннюю ссылку в дополнение к объекту, на который она указывает" |
| 7454 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7455 | #: builtin/ls-tree.c:28 |
| 7456 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
| 7457 | msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]" |
| 7458 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7459 | #: builtin/ls-tree.c:128 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7460 | msgid "only show trees" |
| 7461 | msgstr "выводить только деревья" |
| 7462 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7463 | #: builtin/ls-tree.c:130 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7464 | msgid "recurse into subtrees" |
| 7465 | msgstr "проходить рекурсивно в поддеревья" |
| 7466 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7467 | #: builtin/ls-tree.c:132 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7468 | msgid "show trees when recursing" |
| 7469 | msgstr "выводить деревья при рекурсивном проходе" |
| 7470 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7471 | #: builtin/ls-tree.c:135 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7472 | msgid "terminate entries with NUL byte" |
| 7473 | msgstr "разделять записи с помощью НУЛЕВОГО байта" |
| 7474 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7475 | #: builtin/ls-tree.c:136 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7476 | msgid "include object size" |
| 7477 | msgstr "включить размер объекта" |
| 7478 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7479 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7480 | msgid "list only filenames" |
| 7481 | msgstr "выводить только имена файлов" |
| 7482 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7483 | #: builtin/ls-tree.c:143 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7484 | msgid "use full path names" |
| 7485 | msgstr "использовать полные пути" |
| 7486 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 7487 | #: builtin/ls-tree.c:145 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7488 | msgid "list entire tree; not just current directory (implies --full-name)" |
| 7489 | msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)" |
| 7490 | |
| 7491 | #: builtin/merge.c:45 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7492 | msgid "git merge [<options>] [<commit>...]" |
| 7493 | msgstr "git merge [<опции>] [<коммит>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7494 | |
| 7495 | #: builtin/merge.c:46 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7496 | msgid "git merge [<options>] <msg> HEAD <commit>" |
| 7497 | msgstr "git merge [<опции>] <сообщение> HEAD <коммит>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7498 | |
| 7499 | #: builtin/merge.c:47 |
| 7500 | msgid "git merge --abort" |
| 7501 | msgstr "git merge --abort" |
| 7502 | |
| 7503 | #: builtin/merge.c:100 |
| 7504 | msgid "switch `m' requires a value" |
| 7505 | msgstr "при указании параметра «m» требуется указать значение" |
| 7506 | |
| 7507 | #: builtin/merge.c:137 |
| 7508 | #, c-format |
| 7509 | msgid "Could not find merge strategy '%s'.\n" |
| 7510 | msgstr "Не удалось найти стратегию слияния «%s».\n" |
| 7511 | |
| 7512 | #: builtin/merge.c:138 |
| 7513 | #, c-format |
| 7514 | msgid "Available strategies are:" |
| 7515 | msgstr "Доступные стратегии:" |
| 7516 | |
| 7517 | #: builtin/merge.c:143 |
| 7518 | #, c-format |
| 7519 | msgid "Available custom strategies are:" |
| 7520 | msgstr "Доступные пользовательские стратегии:" |
| 7521 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7522 | #: builtin/merge.c:193 builtin/pull.c:123 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7523 | msgid "do not show a diffstat at the end of the merge" |
| 7524 | msgstr "не выводить статистику изменений после окончания слияния" |
| 7525 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7526 | #: builtin/merge.c:196 builtin/pull.c:126 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7527 | msgid "show a diffstat at the end of the merge" |
| 7528 | msgstr "вывести статистику изменений после окончания слияния" |
| 7529 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7530 | #: builtin/merge.c:197 builtin/pull.c:129 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7531 | msgid "(synonym to --stat)" |
| 7532 | msgstr "(синоним для --stat)" |
| 7533 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7534 | #: builtin/merge.c:199 builtin/pull.c:132 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7535 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
| 7536 | msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния" |
| 7537 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7538 | #: builtin/merge.c:202 builtin/pull.c:135 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7539 | msgid "create a single commit instead of doing a merge" |
| 7540 | msgstr "создать один коммит, вместо выполнения слияния" |
| 7541 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7542 | #: builtin/merge.c:204 builtin/pull.c:138 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7543 | msgid "perform a commit if the merge succeeds (default)" |
| 7544 | msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" |
| 7545 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7546 | #: builtin/merge.c:206 builtin/pull.c:141 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7547 | msgid "edit message before committing" |
| 7548 | msgstr "отредактировать сообщение перед выполнением коммита" |
| 7549 | |
| 7550 | #: builtin/merge.c:207 |
| 7551 | msgid "allow fast-forward (default)" |
| 7552 | msgstr "разрешить перемотку вперед (по умолчанию)" |
| 7553 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7554 | #: builtin/merge.c:209 builtin/pull.c:147 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7555 | msgid "abort if fast-forward is not possible" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7556 | msgstr "отменить выполнение слияния, если перемотка вперед невозможна" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7557 | |
| 7558 | #: builtin/merge.c:213 |
| 7559 | msgid "Verify that the named commit has a valid GPG signature" |
| 7560 | msgstr "Проверить, что указанный коммит имеет верную электронную подпись GPG" |
| 7561 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7562 | #: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7563 | #: builtin/revert.c:89 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7564 | msgid "strategy" |
| 7565 | msgstr "стратегия" |
| 7566 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7567 | #: builtin/merge.c:215 builtin/pull.c:153 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7568 | msgid "merge strategy to use" |
| 7569 | msgstr "используемая стратегия слияния" |
| 7570 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7571 | #: builtin/merge.c:216 builtin/pull.c:156 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7572 | msgid "option=value" |
| 7573 | msgstr "опция=значение" |
| 7574 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7575 | #: builtin/merge.c:217 builtin/pull.c:157 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7576 | msgid "option for selected merge strategy" |
| 7577 | msgstr "опции для выбранной стратегии слияния" |
| 7578 | |
| 7579 | #: builtin/merge.c:219 |
| 7580 | msgid "merge commit message (for a non-fast-forward merge)" |
| 7581 | msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" |
| 7582 | |
| 7583 | #: builtin/merge.c:223 |
| 7584 | msgid "abort the current in-progress merge" |
| 7585 | msgstr "отменить выполнение происходящего слияния" |
| 7586 | |
| 7587 | #: builtin/merge.c:251 |
| 7588 | msgid "could not run stash." |
| 7589 | msgstr "не удалось выполнить stash." |
| 7590 | |
| 7591 | #: builtin/merge.c:256 |
| 7592 | msgid "stash failed" |
| 7593 | msgstr "сбой при выполнении stash" |
| 7594 | |
| 7595 | #: builtin/merge.c:261 |
| 7596 | #, c-format |
| 7597 | msgid "not a valid object: %s" |
| 7598 | msgstr "неправильный объект: %s" |
| 7599 | |
| 7600 | #: builtin/merge.c:280 builtin/merge.c:297 |
| 7601 | msgid "read-tree failed" |
| 7602 | msgstr "сбой при выполнении read-tree" |
| 7603 | |
| 7604 | #: builtin/merge.c:327 |
| 7605 | msgid " (nothing to squash)" |
| 7606 | msgstr " (нечего уплотнять)" |
| 7607 | |
| 7608 | #: builtin/merge.c:340 |
| 7609 | #, c-format |
| 7610 | msgid "Squash commit -- not updating HEAD\n" |
| 7611 | msgstr "Уплотнение коммита — не обновляя HEAD\n" |
| 7612 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7613 | #: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 |
| 7614 | #: builtin/merge.c:989 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 7615 | #, c-format |
| 7616 | msgid "Could not write to '%s'" |
| 7617 | msgstr "Не удалось записать в «%s»" |
| 7618 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7619 | #: builtin/merge.c:372 |
| 7620 | msgid "Writing SQUASH_MSG" |
| 7621 | msgstr "Запись SQUASH_MSG" |
| 7622 | |
| 7623 | #: builtin/merge.c:374 |
| 7624 | msgid "Finishing SQUASH_MSG" |
| 7625 | msgstr "Завершение SQUASH_MSG" |
| 7626 | |
| 7627 | #: builtin/merge.c:397 |
| 7628 | #, c-format |
| 7629 | msgid "No merge message -- not updating HEAD\n" |
| 7630 | msgstr "Нет сообщения слияния — не обновляем HEAD\n" |
| 7631 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7632 | #: builtin/merge.c:448 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7633 | #, c-format |
| 7634 | msgid "'%s' does not point to a commit" |
| 7635 | msgstr "«%s» не указывает на коммит" |
| 7636 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7637 | #: builtin/merge.c:538 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7638 | #, c-format |
| 7639 | msgid "Bad branch.%s.mergeoptions string: %s" |
| 7640 | msgstr "Неправильная строка branch.%s.mergeoptions: %s" |
| 7641 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7642 | #: builtin/merge.c:657 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7643 | msgid "Not handling anything other than two heads merge." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7644 | msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7645 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7646 | #: builtin/merge.c:671 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7647 | #, c-format |
| 7648 | msgid "Unknown option for merge-recursive: -X%s" |
| 7649 | msgstr "Неизвестный параметр merge-recursive: -X%s" |
| 7650 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7651 | #: builtin/merge.c:684 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7652 | #, c-format |
| 7653 | msgid "unable to write %s" |
| 7654 | msgstr "не удалось записать %s" |
| 7655 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7656 | #: builtin/merge.c:773 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7657 | #, c-format |
| 7658 | msgid "Could not read from '%s'" |
| 7659 | msgstr "Не удалось прочесть из «%s»" |
| 7660 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7661 | #: builtin/merge.c:782 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7662 | #, c-format |
| 7663 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" |
| 7664 | msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n" |
| 7665 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7666 | #: builtin/merge.c:788 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7667 | #, c-format |
| 7668 | msgid "" |
| 7669 | "Please enter a commit message to explain why this merge is necessary,\n" |
| 7670 | "especially if it merges an updated upstream into a topic branch.\n" |
| 7671 | "\n" |
| 7672 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
| 7673 | "the commit.\n" |
| 7674 | msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n" |
| 7675 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7676 | #: builtin/merge.c:812 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7677 | msgid "Empty commit message." |
| 7678 | msgstr "Пустое сообщение коммита." |
| 7679 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7680 | #: builtin/merge.c:824 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7681 | #, c-format |
| 7682 | msgid "Wonderful.\n" |
| 7683 | msgstr "Прекрасно.\n" |
| 7684 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7685 | #: builtin/merge.c:879 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7686 | #, c-format |
| 7687 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" |
| 7688 | msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n" |
| 7689 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7690 | #: builtin/merge.c:895 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7691 | #, c-format |
| 7692 | msgid "'%s' is not a commit" |
| 7693 | msgstr "«%s» не является коммитом" |
| 7694 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7695 | #: builtin/merge.c:936 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7696 | msgid "No current branch." |
| 7697 | msgstr "Нет текущей ветки." |
| 7698 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7699 | #: builtin/merge.c:938 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7700 | msgid "No remote for the current branch." |
| 7701 | msgstr "У текущей ветки нет внешнего репозитория." |
| 7702 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7703 | #: builtin/merge.c:940 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7704 | msgid "No default upstream defined for the current branch." |
| 7705 | msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." |
| 7706 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7707 | #: builtin/merge.c:945 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7708 | #, c-format |
| 7709 | msgid "No remote-tracking branch for %s from %s" |
| 7710 | msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" |
| 7711 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7712 | #: builtin/merge.c:1080 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 7713 | #, c-format |
| 7714 | msgid "could not close '%s'" |
| 7715 | msgstr "не удалось закрыть «%s»" |
| 7716 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7717 | #: builtin/merge.c:1207 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7718 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
| 7719 | msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." |
| 7720 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7721 | #: builtin/merge.c:1223 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7722 | msgid "" |
| 7723 | "You have not concluded your merge (MERGE_HEAD exists).\n" |
| 7724 | "Please, commit your changes before you merge." |
| 7725 | msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." |
| 7726 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7727 | #: builtin/merge.c:1230 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7728 | msgid "" |
| 7729 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" |
| 7730 | "Please, commit your changes before you merge." |
| 7731 | msgstr "Вы не завершили отбор лучшего (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, выполните коммит ваших изменений, перед слиянием." |
| 7732 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7733 | #: builtin/merge.c:1233 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7734 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
| 7735 | msgstr "Вы не завершили отбор лучшего (присутствует файл CHERRY_PICK_HEAD)." |
| 7736 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7737 | #: builtin/merge.c:1242 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7738 | msgid "You cannot combine --squash with --no-ff." |
| 7739 | msgstr "Нельзя использовать одновременно --squash и --no-ff." |
| 7740 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7741 | #: builtin/merge.c:1250 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7742 | msgid "No commit specified and merge.defaultToUpstream not set." |
| 7743 | msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." |
| 7744 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7745 | #: builtin/merge.c:1267 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7746 | msgid "Squash commit into empty head not supported yet" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7747 | msgstr "Уплотнение коммита в пустую ветку еще не поддерживается" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7748 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7749 | #: builtin/merge.c:1269 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7750 | msgid "Non-fast-forward commit does not make sense into an empty head" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7751 | msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7752 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7753 | #: builtin/merge.c:1275 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7754 | #, c-format |
| 7755 | msgid "%s - not something we can merge" |
| 7756 | msgstr "%s не является тем, что можно слить" |
| 7757 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7758 | #: builtin/merge.c:1277 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 7759 | msgid "Can merge only exactly one commit into empty head" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7760 | msgstr "Можно только один коммит в пустую ветку." |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 7761 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7762 | #: builtin/merge.c:1332 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7763 | #, c-format |
| 7764 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." |
| 7765 | msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." |
| 7766 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7767 | #: builtin/merge.c:1335 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7768 | #, c-format |
| 7769 | msgid "Commit %s has a bad GPG signature allegedly by %s." |
| 7770 | msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." |
| 7771 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7772 | #: builtin/merge.c:1338 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7773 | #, c-format |
| 7774 | msgid "Commit %s does not have a GPG signature." |
| 7775 | msgstr "Коммит %s не содержит GPG подпись." |
| 7776 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7777 | #: builtin/merge.c:1341 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7778 | #, c-format |
| 7779 | msgid "Commit %s has a good GPG signature by %s\n" |
| 7780 | msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" |
| 7781 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7782 | #: builtin/merge.c:1424 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7783 | #, c-format |
| 7784 | msgid "Updating %s..%s\n" |
| 7785 | msgstr "Обновление %s..%s\n" |
| 7786 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7787 | #: builtin/merge.c:1461 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7788 | #, c-format |
| 7789 | msgid "Trying really trivial in-index merge...\n" |
| 7790 | msgstr "Попытка тривиального слияния в индексе…\n" |
| 7791 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7792 | #: builtin/merge.c:1468 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7793 | #, c-format |
| 7794 | msgid "Nope.\n" |
| 7795 | msgstr "Не вышло.\n" |
| 7796 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7797 | #: builtin/merge.c:1500 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7798 | msgid "Not possible to fast-forward, aborting." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7799 | msgstr "Перемотка вперед невозможна, отмена." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7800 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7801 | #: builtin/merge.c:1523 builtin/merge.c:1602 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7802 | #, c-format |
| 7803 | msgid "Rewinding the tree to pristine...\n" |
| 7804 | msgstr "Перемотка дерева к исходному состоянию…\n" |
| 7805 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7806 | #: builtin/merge.c:1527 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7807 | #, c-format |
| 7808 | msgid "Trying merge strategy %s...\n" |
| 7809 | msgstr "Попытка слияния с помощью стратегии %s…\n" |
| 7810 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7811 | #: builtin/merge.c:1593 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7812 | #, c-format |
| 7813 | msgid "No merge strategy handled the merge.\n" |
| 7814 | msgstr "Ни одна стратегия слияния не обработала слияние.\n" |
| 7815 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7816 | #: builtin/merge.c:1595 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7817 | #, c-format |
| 7818 | msgid "Merge with strategy %s failed.\n" |
| 7819 | msgstr "Сбой при слиянии с помощью стратегии %s.\n" |
| 7820 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7821 | #: builtin/merge.c:1604 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7822 | #, c-format |
| 7823 | msgid "Using the %s to prepare resolving by hand.\n" |
| 7824 | msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" |
| 7825 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7826 | #: builtin/merge.c:1616 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7827 | #, c-format |
| 7828 | msgid "Automatic merge went well; stopped before committing as requested\n" |
| 7829 | msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n" |
| 7830 | |
| 7831 | #: builtin/merge-base.c:29 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7832 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
| 7833 | msgstr "git merge-base [-a | --all] <коммит> <коммит>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7834 | |
| 7835 | #: builtin/merge-base.c:30 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7836 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
| 7837 | msgstr "git merge-base [-a | --all] --octopus <коммит>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7838 | |
| 7839 | #: builtin/merge-base.c:31 |
| 7840 | msgid "git merge-base --independent <commit>..." |
| 7841 | msgstr "git merge-base --independent <коммит>…" |
| 7842 | |
| 7843 | #: builtin/merge-base.c:32 |
| 7844 | msgid "git merge-base --is-ancestor <commit> <commit>" |
| 7845 | msgstr "git merge-base --is-ancestor <коммит> <коммит>" |
| 7846 | |
| 7847 | #: builtin/merge-base.c:33 |
| 7848 | msgid "git merge-base --fork-point <ref> [<commit>]" |
| 7849 | msgstr "git merge-base --fork-point <ссылка> [<коммит>]" |
| 7850 | |
| 7851 | #: builtin/merge-base.c:214 |
| 7852 | msgid "output all common ancestors" |
| 7853 | msgstr "вывести всех общих предков" |
| 7854 | |
| 7855 | #: builtin/merge-base.c:216 |
| 7856 | msgid "find ancestors for a single n-way merge" |
| 7857 | msgstr "вывести предков для одного многоходового слияния" |
| 7858 | |
| 7859 | #: builtin/merge-base.c:218 |
| 7860 | msgid "list revs not reachable from others" |
| 7861 | msgstr "вывести список ревизий, которые не достижимы из друг друга" |
| 7862 | |
| 7863 | #: builtin/merge-base.c:220 |
| 7864 | msgid "is the first one ancestor of the other?" |
| 7865 | msgstr "является первым предком второго указанного коммита?" |
| 7866 | |
| 7867 | #: builtin/merge-base.c:222 |
| 7868 | msgid "find where <commit> forked from reflog of <ref>" |
| 7869 | msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился" |
| 7870 | |
| 7871 | #: builtin/merge-file.c:8 |
| 7872 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7873 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
| 7874 | "<orig-file> <file2>" |
| 7875 | msgstr "git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> <файл2>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7876 | |
| 7877 | #: builtin/merge-file.c:33 |
| 7878 | msgid "send results to standard output" |
| 7879 | msgstr "вывести результат на стандартный вывод" |
| 7880 | |
| 7881 | #: builtin/merge-file.c:34 |
| 7882 | msgid "use a diff3 based merge" |
| 7883 | msgstr "использовать diff3 слияние" |
| 7884 | |
| 7885 | #: builtin/merge-file.c:35 |
| 7886 | msgid "for conflicts, use our version" |
| 7887 | msgstr "при возникновении конфликтов, использовать нашу версию" |
| 7888 | |
| 7889 | #: builtin/merge-file.c:37 |
| 7890 | msgid "for conflicts, use their version" |
| 7891 | msgstr "при возникновении конфликтов, использовать их версию" |
| 7892 | |
| 7893 | #: builtin/merge-file.c:39 |
| 7894 | msgid "for conflicts, use a union version" |
| 7895 | msgstr "при возникновении конфликтов, использовать обе версии" |
| 7896 | |
| 7897 | #: builtin/merge-file.c:42 |
| 7898 | msgid "for conflicts, use this marker size" |
| 7899 | msgstr "при возникновении конфликтов, использовать этот размер маркера" |
| 7900 | |
| 7901 | #: builtin/merge-file.c:43 |
| 7902 | msgid "do not warn about conflicts" |
| 7903 | msgstr "не предупреждать о конфликтах" |
| 7904 | |
| 7905 | #: builtin/merge-file.c:45 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7906 | msgid "set labels for file1/orig-file/file2" |
| 7907 | msgstr "установить метки для файл1/ориг-файл/файл2" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7908 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7909 | #: builtin/mktree.c:65 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7910 | msgid "git mktree [-z] [--missing] [--batch]" |
| 7911 | msgstr "git mktree [-z] [--missing] [--batch]" |
| 7912 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7913 | #: builtin/mktree.c:152 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7914 | msgid "input is NUL terminated" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7915 | msgstr "ввод отделённый НУЛЕВЫМИ символами" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7916 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7917 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7918 | msgid "allow missing objects" |
| 7919 | msgstr "допустить отсутствие объектов" |
| 7920 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7921 | #: builtin/mktree.c:154 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7922 | msgid "allow creation of more than one tree" |
| 7923 | msgstr "допустить создание более одного дерева" |
| 7924 | |
| 7925 | #: builtin/mv.c:15 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 7926 | msgid "git mv [<options>] <source>... <destination>" |
| 7927 | msgstr "git mv [<опции>] <источник>… <назначение>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7928 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7929 | #: builtin/mv.c:70 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7930 | #, c-format |
| 7931 | msgid "Directory %s is in index and no submodule?" |
| 7932 | msgstr "Каталог %s в индексе и не является подмодулем?" |
| 7933 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7934 | #: builtin/mv.c:72 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7935 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
| 7936 | msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules" |
| 7937 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7938 | #: builtin/mv.c:90 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7939 | #, c-format |
| 7940 | msgid "%.*s is in index" |
| 7941 | msgstr "%.*s в индесе" |
| 7942 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7943 | #: builtin/mv.c:112 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7944 | msgid "force move/rename even if target exists" |
| 7945 | msgstr "принудительно перемещать/переименовать, даже если цель существует" |
| 7946 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7947 | #: builtin/mv.c:113 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7948 | msgid "skip move/rename errors" |
| 7949 | msgstr "пропускать ошибки при перемещении/переименовании" |
| 7950 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7951 | #: builtin/mv.c:152 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7952 | #, c-format |
| 7953 | msgid "destination '%s' is not a directory" |
| 7954 | msgstr "целевой путь «%s» не является каталогом" |
| 7955 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7956 | #: builtin/mv.c:163 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7957 | #, c-format |
| 7958 | msgid "Checking rename of '%s' to '%s'\n" |
| 7959 | msgstr "Проверка переименования из «%s» в «%s»\n" |
| 7960 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7961 | #: builtin/mv.c:167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7962 | msgid "bad source" |
| 7963 | msgstr "плохой источник" |
| 7964 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7965 | #: builtin/mv.c:170 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7966 | msgid "can not move directory into itself" |
| 7967 | msgstr "нельзя переместить каталог в самого себя" |
| 7968 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7969 | #: builtin/mv.c:173 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7970 | msgid "cannot move directory over file" |
| 7971 | msgstr "нельзя переместить каталог в файл" |
| 7972 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7973 | #: builtin/mv.c:182 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7974 | msgid "source directory is empty" |
| 7975 | msgstr "исходный каталог пуст" |
| 7976 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7977 | #: builtin/mv.c:207 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7978 | msgid "not under version control" |
| 7979 | msgstr "не под версионным контролем" |
| 7980 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7981 | #: builtin/mv.c:210 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7982 | msgid "destination exists" |
| 7983 | msgstr "целевой путь уже существует" |
| 7984 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7985 | #: builtin/mv.c:218 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7986 | #, c-format |
| 7987 | msgid "overwriting '%s'" |
| 7988 | msgstr "перезапись «%s»" |
| 7989 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7990 | #: builtin/mv.c:221 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7991 | msgid "Cannot overwrite" |
| 7992 | msgstr "Не удалось перезаписать" |
| 7993 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7994 | #: builtin/mv.c:224 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7995 | msgid "multiple sources for the same target" |
| 7996 | msgstr "несколько источников для одного целевого пути" |
| 7997 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 7998 | #: builtin/mv.c:226 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 7999 | msgid "destination directory does not exist" |
| 8000 | msgstr "целевой каталог не существует" |
| 8001 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8002 | #: builtin/mv.c:233 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8003 | #, c-format |
| 8004 | msgid "%s, source=%s, destination=%s" |
| 8005 | msgstr "%s, откуда=%s, куда=%s" |
| 8006 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8007 | #: builtin/mv.c:254 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8008 | #, c-format |
| 8009 | msgid "Renaming %s to %s\n" |
| 8010 | msgstr "Переименование %s в %s\n" |
| 8011 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8012 | #: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8013 | #, c-format |
| 8014 | msgid "renaming '%s' failed" |
| 8015 | msgstr "сбой при переименовании «%s»" |
| 8016 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8017 | #: builtin/name-rev.c:251 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8018 | msgid "git name-rev [<options>] <commit>..." |
| 8019 | msgstr "git name-rev [<опции>] <коммит>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8020 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8021 | #: builtin/name-rev.c:252 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8022 | msgid "git name-rev [<options>] --all" |
| 8023 | msgstr "git name-rev [<опции>] --all" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8024 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8025 | #: builtin/name-rev.c:253 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8026 | msgid "git name-rev [<options>] --stdin" |
| 8027 | msgstr "git name-rev [<опции>] --stdin" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8028 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8029 | #: builtin/name-rev.c:305 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8030 | msgid "print only names (no SHA-1)" |
| 8031 | msgstr "выводить только имена (без SHA-1)" |
| 8032 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8033 | #: builtin/name-rev.c:306 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8034 | msgid "only use tags to name the commits" |
| 8035 | msgstr "использовать только метки для именования коммитов" |
| 8036 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8037 | #: builtin/name-rev.c:308 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8038 | msgid "only use refs matching <pattern>" |
| 8039 | msgstr "использовать только ссылки, соответствующие <шаблону> " |
| 8040 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8041 | #: builtin/name-rev.c:310 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8042 | msgid "list all commits reachable from all refs" |
| 8043 | msgstr "вывести список всех коммитов, достижимых со всех ссылок" |
| 8044 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8045 | #: builtin/name-rev.c:311 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8046 | msgid "read from stdin" |
| 8047 | msgstr "прочитать из стандартного ввода" |
| 8048 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8049 | #: builtin/name-rev.c:312 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8050 | msgid "allow to print `undefined` names (default)" |
| 8051 | msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)" |
| 8052 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8053 | #: builtin/name-rev.c:318 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8054 | msgid "dereference tags in the input (internal use)" |
| 8055 | msgstr "разыменовывать введенные метки (для внутреннего использования)" |
| 8056 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8057 | #: builtin/notes.c:25 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8058 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8059 | msgstr "git notes [--ref <ссылка-на-заметку>] [list [<объект>]]" |
| 8060 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8061 | #: builtin/notes.c:26 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8062 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8063 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8064 | " | (-c | -C) <object>] [<object>]" |
| 8065 | msgstr "git notes [--ref <ссылка-на-заметку>] add [-f] [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" |
| 8066 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8067 | #: builtin/notes.c:27 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8068 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8069 | msgstr "git notes [--ref <ссылка-на-заметку>] copy [-f] <из-объекта> <в-объект>" |
| 8070 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8071 | #: builtin/notes.c:28 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8072 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8073 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8074 | " (-c | -C) <object>] [<object>]" |
| 8075 | msgstr "git notes [--ref <ссылка-на-заметку>] append [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" |
| 8076 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8077 | #: builtin/notes.c:29 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8078 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8079 | msgstr "git notes [--ref <ссылка-на-заметку>] edit [--allow-empty] [<объект>]" |
| 8080 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8081 | #: builtin/notes.c:30 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8082 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8083 | msgstr "git notes [--ref <ссылка-на-заметку>] show [<объект>]" |
| 8084 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8085 | #: builtin/notes.c:31 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8086 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8087 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
| 8088 | msgstr "git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] <ссылка-на-заметку>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8089 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8090 | #: builtin/notes.c:32 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8091 | msgid "git notes merge --commit [-v | -q]" |
| 8092 | msgstr "git notes merge --commit [-v | -q]" |
| 8093 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8094 | #: builtin/notes.c:33 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8095 | msgid "git notes merge --abort [-v | -q]" |
| 8096 | msgstr "git notes merge --abort [-v | -q]" |
| 8097 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8098 | #: builtin/notes.c:34 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8099 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8100 | msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]" |
| 8101 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8102 | #: builtin/notes.c:35 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8103 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8104 | msgstr "git notes [--ref <ссылка-на-заметку>] prune [-n | -v]" |
| 8105 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8106 | #: builtin/notes.c:36 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8107 | msgid "git notes [--ref <notes-ref>] get-ref" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8108 | msgstr "git notes [--ref <ссылка-на-заметку>] get-ref" |
| 8109 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8110 | #: builtin/notes.c:41 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8111 | msgid "git notes [list [<object>]]" |
| 8112 | msgstr "git notes [list [<объект>]]" |
| 8113 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8114 | #: builtin/notes.c:46 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8115 | msgid "git notes add [<options>] [<object>]" |
| 8116 | msgstr "git notes add [<опции>] [<объект>]" |
| 8117 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8118 | #: builtin/notes.c:51 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8119 | msgid "git notes copy [<options>] <from-object> <to-object>" |
| 8120 | msgstr "git notes copy [<опции>] <из-объекта> <в-объект>" |
| 8121 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8122 | #: builtin/notes.c:52 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8123 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
| 8124 | msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…" |
| 8125 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8126 | #: builtin/notes.c:57 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8127 | msgid "git notes append [<options>] [<object>]" |
| 8128 | msgstr "git notes append [<опции>] [<объект>]" |
| 8129 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8130 | #: builtin/notes.c:62 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8131 | msgid "git notes edit [<object>]" |
| 8132 | msgstr "git notes edit [<объект>]" |
| 8133 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8134 | #: builtin/notes.c:67 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8135 | msgid "git notes show [<object>]" |
| 8136 | msgstr "git notes show [<объект>]" |
| 8137 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8138 | #: builtin/notes.c:72 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8139 | msgid "git notes merge [<options>] <notes-ref>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8140 | msgstr "git notes merge [<опции>] <ссылка-на-заметку>" |
| 8141 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8142 | #: builtin/notes.c:73 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8143 | msgid "git notes merge --commit [<options>]" |
| 8144 | msgstr "git notes merge --commit [<опции>]" |
| 8145 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8146 | #: builtin/notes.c:74 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8147 | msgid "git notes merge --abort [<options>]" |
| 8148 | msgstr "git notes merge --abort [<опции>]" |
| 8149 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8150 | #: builtin/notes.c:79 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8151 | msgid "git notes remove [<object>]" |
| 8152 | msgstr "git notes remove [<опции>]" |
| 8153 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8154 | #: builtin/notes.c:84 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8155 | msgid "git notes prune [<options>]" |
| 8156 | msgstr "git notes prune [<опции>]" |
| 8157 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8158 | #: builtin/notes.c:89 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8159 | msgid "git notes get-ref" |
| 8160 | msgstr "git notes get-ref" |
| 8161 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8162 | #: builtin/notes.c:147 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8163 | #, c-format |
| 8164 | msgid "unable to start 'show' for object '%s'" |
| 8165 | msgstr "не удалось запустить «show» для объекта «%s»" |
| 8166 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8167 | #: builtin/notes.c:151 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8168 | msgid "could not read 'show' output" |
| 8169 | msgstr "не удалось прочитать вывод «show»" |
| 8170 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8171 | #: builtin/notes.c:159 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8172 | #, c-format |
| 8173 | msgid "failed to finish 'show' for object '%s'" |
| 8174 | msgstr "не удалось завершить «show» для объекта «%s»" |
| 8175 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8176 | #: builtin/notes.c:174 builtin/tag.c:248 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8177 | #, c-format |
| 8178 | msgid "could not create file '%s'" |
| 8179 | msgstr "не удалось создать файл «%s»" |
| 8180 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8181 | #: builtin/notes.c:193 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8182 | msgid "Please supply the note contents using either -m or -F option" |
| 8183 | msgstr "Пожалуйста, укажите содержимое заметки, используя опцию -m или -F" |
| 8184 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8185 | #: builtin/notes.c:202 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8186 | msgid "unable to write note object" |
| 8187 | msgstr "не удалось записать объект заметки" |
| 8188 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8189 | #: builtin/notes.c:204 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8190 | #, c-format |
| 8191 | msgid "The note contents have been left in %s" |
| 8192 | msgstr "Содержимое заметки осталось в %s" |
| 8193 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8194 | #: builtin/notes.c:232 builtin/tag.c:440 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8195 | #, c-format |
| 8196 | msgid "cannot read '%s'" |
| 8197 | msgstr "не удалось прочитать «%s»" |
| 8198 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8199 | #: builtin/notes.c:234 builtin/tag.c:443 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8200 | #, c-format |
| 8201 | msgid "could not open or read '%s'" |
| 8202 | msgstr "не удалось открыть или прочитать «%s»" |
| 8203 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8204 | #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8205 | #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 |
| 8206 | #: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 |
| 8207 | #: builtin/notes.c:880 builtin/tag.c:456 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8208 | #, c-format |
| 8209 | msgid "Failed to resolve '%s' as a valid ref." |
| 8210 | msgstr "Не удалось разрешить «%s» как ссылку." |
| 8211 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8212 | #: builtin/notes.c:256 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8213 | #, c-format |
| 8214 | msgid "Failed to read object '%s'." |
| 8215 | msgstr "Не удалось прочитать объект «%s»." |
| 8216 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8217 | #: builtin/notes.c:260 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8218 | #, c-format |
| 8219 | msgid "Cannot read note data from non-blob object '%s'." |
| 8220 | msgstr "Не удалось прочитать данные заметки из недвоичного объекта «%s»." |
| 8221 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8222 | #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 |
| 8223 | #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 |
| 8224 | #: builtin/notes.c:945 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8225 | msgid "too many parameters" |
| 8226 | msgstr "передано слишком много параметров" |
| 8227 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8228 | #: builtin/notes.c:375 builtin/notes.c:662 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8229 | #, c-format |
| 8230 | msgid "No note found for object %s." |
| 8231 | msgstr "Не найдена заметка для объекта %s." |
| 8232 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8233 | #: builtin/notes.c:396 builtin/notes.c:559 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8234 | msgid "note contents as a string" |
| 8235 | msgstr "текстовое содержимое заметки" |
| 8236 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8237 | #: builtin/notes.c:399 builtin/notes.c:562 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8238 | msgid "note contents in a file" |
| 8239 | msgstr "содержимое заметки в файле" |
| 8240 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8241 | #: builtin/notes.c:402 builtin/notes.c:565 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8242 | msgid "reuse and edit specified note object" |
| 8243 | msgstr "использовать и отредактировать указанный объект заметки" |
| 8244 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8245 | #: builtin/notes.c:405 builtin/notes.c:568 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8246 | msgid "reuse specified note object" |
| 8247 | msgstr "использовать указанный объект заметки" |
| 8248 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8249 | #: builtin/notes.c:408 builtin/notes.c:571 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8250 | msgid "allow storing empty note" |
| 8251 | msgstr "разрешить сохранение пустой заметки" |
| 8252 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8253 | #: builtin/notes.c:409 builtin/notes.c:480 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8254 | msgid "replace existing notes" |
| 8255 | msgstr "заменить существующие заметки" |
| 8256 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8257 | #: builtin/notes.c:434 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8258 | #, c-format |
| 8259 | msgid "" |
| 8260 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " |
| 8261 | "existing notes" |
| 8262 | msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." |
| 8263 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8264 | #: builtin/notes.c:449 builtin/notes.c:528 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8265 | #, c-format |
| 8266 | msgid "Overwriting existing notes for object %s\n" |
| 8267 | msgstr "Перезапись существующих заметок у объекта %s\n" |
| 8268 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8269 | #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8270 | #, c-format |
| 8271 | msgid "Removing note for object %s\n" |
| 8272 | msgstr "Удаление заметки у объекта %s\n" |
| 8273 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8274 | #: builtin/notes.c:481 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8275 | msgid "read objects from stdin" |
| 8276 | msgstr "прочитать объекты из стандартного ввода" |
| 8277 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8278 | #: builtin/notes.c:483 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8279 | msgid "load rewriting config for <command> (implies --stdin)" |
| 8280 | msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)" |
| 8281 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8282 | #: builtin/notes.c:501 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8283 | msgid "too few parameters" |
| 8284 | msgstr "передано слишком мало параметров" |
| 8285 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8286 | #: builtin/notes.c:522 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8287 | #, c-format |
| 8288 | msgid "" |
| 8289 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" |
| 8290 | " existing notes" |
| 8291 | msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." |
| 8292 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8293 | #: builtin/notes.c:534 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8294 | #, c-format |
| 8295 | msgid "Missing notes on source object %s. Cannot copy." |
| 8296 | msgstr "Нет заметок у исходного объекта %s. Нельзя скопировать." |
| 8297 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8298 | #: builtin/notes.c:586 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8299 | #, c-format |
| 8300 | msgid "" |
| 8301 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" |
| 8302 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" |
| 8303 | msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n" |
| 8304 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8305 | #: builtin/notes.c:767 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8306 | msgid "General options" |
| 8307 | msgstr "Общие опции" |
| 8308 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8309 | #: builtin/notes.c:769 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8310 | msgid "Merge options" |
| 8311 | msgstr "Опции слияния" |
| 8312 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8313 | #: builtin/notes.c:771 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8314 | msgid "" |
| 8315 | "resolve notes conflicts using the given strategy " |
| 8316 | "(manual/ours/theirs/union/cat_sort_uniq)" |
| 8317 | msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)" |
| 8318 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8319 | #: builtin/notes.c:773 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8320 | msgid "Committing unmerged notes" |
| 8321 | msgstr "Коммит не слитых заметок" |
| 8322 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8323 | #: builtin/notes.c:775 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8324 | msgid "finalize notes merge by committing unmerged notes" |
| 8325 | msgstr "завершить слияние заметок коммитом не слитых заметок" |
| 8326 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8327 | #: builtin/notes.c:777 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8328 | msgid "Aborting notes merge resolution" |
| 8329 | msgstr "Отмена разрешения слияния заметок" |
| 8330 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8331 | #: builtin/notes.c:779 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8332 | msgid "abort notes merge" |
| 8333 | msgstr "отменить слияние заметок" |
| 8334 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8335 | #: builtin/notes.c:856 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8336 | #, c-format |
| 8337 | msgid "A notes merge into %s is already in-progress at %s" |
| 8338 | msgstr "Слияние заметок в %s уже выполняется на %s" |
| 8339 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8340 | #: builtin/notes.c:883 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8341 | #, c-format |
| 8342 | msgid "Object %s has no note\n" |
| 8343 | msgstr "У объекта %s нет заметки\n" |
| 8344 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8345 | #: builtin/notes.c:895 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8346 | msgid "attempt to remove non-existent note is not an error" |
| 8347 | msgstr "попытка удаления несуществующей заметки не является ошибкой" |
| 8348 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8349 | #: builtin/notes.c:898 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8350 | msgid "read object names from the standard input" |
| 8351 | msgstr "прочитать имена объектов из стандартного ввода" |
| 8352 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8353 | #: builtin/notes.c:979 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8354 | msgid "notes-ref" |
| 8355 | msgstr "ссылка-на-заметку" |
| 8356 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8357 | #: builtin/notes.c:980 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8358 | msgid "use notes from <notes-ref>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8359 | msgstr "использовать заметку из <ссылка-на-заметку>" |
| 8360 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8361 | #: builtin/notes.c:1015 builtin/remote.c:1626 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8362 | #, c-format |
| 8363 | msgid "Unknown subcommand: %s" |
| 8364 | msgstr "Неизвестная подкоманда: %s" |
| 8365 | |
| 8366 | #: builtin/pack-objects.c:28 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8367 | msgid "" |
| 8368 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" |
| 8369 | msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8370 | |
| 8371 | #: builtin/pack-objects.c:29 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8372 | msgid "" |
| 8373 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" |
| 8374 | msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8375 | |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8376 | #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8377 | #, c-format |
| 8378 | msgid "deflate error (%d)" |
| 8379 | msgstr "ошибка сжатия (%d)" |
| 8380 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8381 | #: builtin/pack-objects.c:772 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8382 | msgid "Writing objects" |
| 8383 | msgstr "Запись объектов" |
| 8384 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8385 | #: builtin/pack-objects.c:1012 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8386 | msgid "disabling bitmap writing, as some objects are not being packed" |
| 8387 | msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы" |
| 8388 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8389 | #: builtin/pack-objects.c:2172 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8390 | msgid "Compressing objects" |
| 8391 | msgstr "Сжатие объектов" |
| 8392 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8393 | #: builtin/pack-objects.c:2558 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8394 | #, c-format |
| 8395 | msgid "unsupported index version %s" |
| 8396 | msgstr "неподдерживаемая версия индекса %s" |
| 8397 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8398 | #: builtin/pack-objects.c:2562 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8399 | #, c-format |
| 8400 | msgid "bad index version '%s'" |
| 8401 | msgstr "плохая версия индекса «%s»" |
| 8402 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8403 | #: builtin/pack-objects.c:2592 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8404 | msgid "do not show progress meter" |
| 8405 | msgstr "не выводить прогресс выполнения" |
| 8406 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8407 | #: builtin/pack-objects.c:2594 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8408 | msgid "show progress meter" |
| 8409 | msgstr "показать прогресс выполнения" |
| 8410 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8411 | #: builtin/pack-objects.c:2596 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8412 | msgid "show progress meter during object writing phase" |
| 8413 | msgstr "показать прогресс выполнения во время записи объектов" |
| 8414 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8415 | #: builtin/pack-objects.c:2599 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8416 | msgid "similar to --all-progress when progress meter is shown" |
| 8417 | msgstr "похоже на --all-progress при включенном прогрессе выполнения" |
| 8418 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8419 | #: builtin/pack-objects.c:2600 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8420 | msgid "version[,offset]" |
| 8421 | msgstr "версия[,смещение]" |
| 8422 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8423 | #: builtin/pack-objects.c:2601 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8424 | msgid "write the pack index file in the specified idx format version" |
| 8425 | msgstr "записать файл индекса пакета в указанной версии формата" |
| 8426 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8427 | #: builtin/pack-objects.c:2604 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8428 | msgid "maximum size of each output pack file" |
| 8429 | msgstr "максимальный размер каждого выходного файла пакета" |
| 8430 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8431 | #: builtin/pack-objects.c:2606 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8432 | msgid "ignore borrowed objects from alternate object store" |
| 8433 | msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" |
| 8434 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8435 | #: builtin/pack-objects.c:2608 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8436 | msgid "ignore packed objects" |
| 8437 | msgstr "игнорировать упакованные объекты" |
| 8438 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8439 | #: builtin/pack-objects.c:2610 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8440 | msgid "limit pack window by objects" |
| 8441 | msgstr "ограничить окно пакета по количеству объектов" |
| 8442 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8443 | #: builtin/pack-objects.c:2612 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8444 | msgid "limit pack window by memory in addition to object limit" |
| 8445 | msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" |
| 8446 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8447 | #: builtin/pack-objects.c:2614 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8448 | msgid "maximum length of delta chain allowed in the resulting pack" |
| 8449 | msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" |
| 8450 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8451 | #: builtin/pack-objects.c:2616 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8452 | msgid "reuse existing deltas" |
| 8453 | msgstr "использовать повторно существующие дельты" |
| 8454 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8455 | #: builtin/pack-objects.c:2618 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8456 | msgid "reuse existing objects" |
| 8457 | msgstr "использовать повторно существующие объекты" |
| 8458 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8459 | #: builtin/pack-objects.c:2620 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8460 | msgid "use OFS_DELTA objects" |
| 8461 | msgstr "использовать объекты OFS_DELTA" |
| 8462 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8463 | #: builtin/pack-objects.c:2622 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8464 | msgid "use threads when searching for best delta matches" |
| 8465 | msgstr "использовать многопоточность при поиске лучших совпадений дельт" |
| 8466 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8467 | #: builtin/pack-objects.c:2624 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8468 | msgid "do not create an empty pack output" |
| 8469 | msgstr "не создавать пустые выходные пакеты" |
| 8470 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8471 | #: builtin/pack-objects.c:2626 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8472 | msgid "read revision arguments from standard input" |
| 8473 | msgstr "прочитать аргументы редакций из стандартного ввода" |
| 8474 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8475 | #: builtin/pack-objects.c:2628 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8476 | msgid "limit the objects to those that are not yet packed" |
| 8477 | msgstr "ограничиться объектами, которые еще не упакованы" |
| 8478 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8479 | #: builtin/pack-objects.c:2631 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8480 | msgid "include objects reachable from any reference" |
| 8481 | msgstr "включить объекты, которые достижимы по любой из ссылок" |
| 8482 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8483 | #: builtin/pack-objects.c:2634 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8484 | msgid "include objects referred by reflog entries" |
| 8485 | msgstr "включить объекты, на которые ссылаются записи журнала ссылок" |
| 8486 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8487 | #: builtin/pack-objects.c:2637 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8488 | msgid "include objects referred to by the index" |
| 8489 | msgstr "включить объекты, на которые ссылается индекс" |
| 8490 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8491 | #: builtin/pack-objects.c:2640 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8492 | msgid "output pack to stdout" |
| 8493 | msgstr "вывести пакет на стандартный вывод" |
| 8494 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8495 | #: builtin/pack-objects.c:2642 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8496 | msgid "include tag objects that refer to objects to be packed" |
| 8497 | msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" |
| 8498 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8499 | #: builtin/pack-objects.c:2644 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8500 | msgid "keep unreachable objects" |
| 8501 | msgstr "сохранять ссылки на недоступные объекты" |
| 8502 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8503 | #: builtin/pack-objects.c:2645 parse-options.h:142 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8504 | msgid "time" |
| 8505 | msgstr "время" |
| 8506 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8507 | #: builtin/pack-objects.c:2646 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8508 | msgid "unpack unreachable objects newer than <time>" |
| 8509 | msgstr "распаковать недоступные объекты, которые новее, чем <время>" |
| 8510 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8511 | #: builtin/pack-objects.c:2649 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8512 | msgid "create thin packs" |
| 8513 | msgstr "создавать тонкие пакеты" |
| 8514 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8515 | #: builtin/pack-objects.c:2651 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8516 | msgid "create packs suitable for shallow fetches" |
| 8517 | msgstr "создавать пакеты, подходящие для частичных извлечений" |
| 8518 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8519 | #: builtin/pack-objects.c:2653 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8520 | msgid "ignore packs that have companion .keep file" |
| 8521 | msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл" |
| 8522 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8523 | #: builtin/pack-objects.c:2655 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8524 | msgid "pack compression level" |
| 8525 | msgstr "уровень сжатия пакета" |
| 8526 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8527 | #: builtin/pack-objects.c:2657 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8528 | msgid "do not hide commits by grafts" |
| 8529 | msgstr "не скрывать коммиты сращениями" |
| 8530 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8531 | #: builtin/pack-objects.c:2659 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8532 | msgid "use a bitmap index if available to speed up counting objects" |
| 8533 | msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов" |
| 8534 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8535 | #: builtin/pack-objects.c:2661 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8536 | msgid "write a bitmap index together with the pack index" |
| 8537 | msgstr "запись индекса в битовых картах вместе с индексом пакета" |
| 8538 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8539 | #: builtin/pack-objects.c:2752 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8540 | msgid "Counting objects" |
| 8541 | msgstr "Подсчет объектов" |
| 8542 | |
| 8543 | #: builtin/pack-refs.c:6 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8544 | msgid "git pack-refs [<options>]" |
| 8545 | msgstr "git pack-refs [<опции>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8546 | |
| 8547 | #: builtin/pack-refs.c:14 |
| 8548 | msgid "pack everything" |
| 8549 | msgstr "паковать всё" |
| 8550 | |
| 8551 | #: builtin/pack-refs.c:15 |
| 8552 | msgid "prune loose refs (default)" |
| 8553 | msgstr "почистить слабые ссылки (по умолчанию)" |
| 8554 | |
| 8555 | #: builtin/prune-packed.c:7 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8556 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
| 8557 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8558 | |
| 8559 | #: builtin/prune-packed.c:40 |
| 8560 | msgid "Removing duplicate objects" |
| 8561 | msgstr "Удаление дублирующихся объектов" |
| 8562 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 8563 | #: builtin/prune.c:11 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8564 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
| 8565 | msgstr "git prune [-n] [-v] [--expire <время>] [--] [<имя-ветки>…]" |
| 8566 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8567 | #: builtin/prune.c:105 builtin/worktree.c:124 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8568 | msgid "do not remove, show only" |
| 8569 | msgstr "не удалять, только показать список" |
| 8570 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8571 | #: builtin/prune.c:106 builtin/worktree.c:125 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8572 | msgid "report pruned objects" |
| 8573 | msgstr "вывести список удаленных объектов" |
| 8574 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8575 | #: builtin/prune.c:109 builtin/worktree.c:127 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8576 | msgid "expire objects older than <time>" |
| 8577 | msgstr "удалить объекты старее чем <дата-окончания>" |
| 8578 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8579 | #: builtin/prune.c:123 |
| 8580 | msgid "cannot prune in a precious-objects repo" |
| 8581 | msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории" |
| 8582 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8583 | #: builtin/pull.c:72 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8584 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
| 8585 | msgstr "git pull [<опции>] [<репозиторий> [<спецификация-ссылки>…]]" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8586 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8587 | #: builtin/pull.c:117 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8588 | msgid "Options related to merging" |
| 8589 | msgstr "Опции, связанные со слиянием" |
| 8590 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8591 | #: builtin/pull.c:120 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8592 | msgid "incorporate changes by rebasing rather than merging" |
| 8593 | msgstr "забрать изменения с помощью перебазирования, а не слияния" |
| 8594 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8595 | #: builtin/pull.c:144 builtin/revert.c:105 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8596 | msgid "allow fast-forward" |
| 8597 | msgstr "разрешить перемотку вперед" |
| 8598 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8599 | #: builtin/pull.c:150 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8600 | msgid "verify that the named commit has a valid GPG signature" |
| 8601 | msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" |
| 8602 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8603 | #: builtin/pull.c:164 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8604 | msgid "Options related to fetching" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8605 | msgstr "Опции, связанные с извлечением изменений" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8606 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8607 | #: builtin/pull.c:186 |
| 8608 | msgid "number of submodules pulled in parallel" |
| 8609 | msgstr "количество подмодулей, которые будут получены парралельно" |
| 8610 | |
| 8611 | #: builtin/pull.c:275 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8612 | #, c-format |
| 8613 | msgid "Invalid value for pull.ff: %s" |
| 8614 | msgstr "Неправильное значение для pull.ff: %s" |
| 8615 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8616 | #: builtin/pull.c:359 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8617 | msgid "Cannot pull with rebase: You have unstaged changes." |
| 8618 | msgstr "Не удалось получить с перемещением: У вас есть непроиндексированные изменения." |
| 8619 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8620 | #: builtin/pull.c:365 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8621 | msgid "Additionally, your index contains uncommitted changes." |
| 8622 | msgstr "К тому же, в вашем индексе есть незакоммиченные изменения." |
| 8623 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8624 | #: builtin/pull.c:367 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8625 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
| 8626 | msgstr "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения." |
| 8627 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8628 | #: builtin/pull.c:443 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8629 | msgid "" |
| 8630 | "There is no candidate for rebasing against among the refs that you just " |
| 8631 | "fetched." |
| 8632 | msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили." |
| 8633 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8634 | #: builtin/pull.c:445 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8635 | msgid "" |
| 8636 | "There are no candidates for merging among the refs that you just fetched." |
| 8637 | msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили." |
| 8638 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8639 | #: builtin/pull.c:446 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8640 | msgid "" |
| 8641 | "Generally this means that you provided a wildcard refspec which had no\n" |
| 8642 | "matches on the remote end." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8643 | msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории." |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8644 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8645 | #: builtin/pull.c:449 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8646 | #, c-format |
| 8647 | msgid "" |
| 8648 | "You asked to pull from the remote '%s', but did not specify\n" |
| 8649 | "a branch. Because this is not the default configured remote\n" |
| 8650 | "for your current branch, you must specify a branch on the command line." |
| 8651 | msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке." |
| 8652 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8653 | #: builtin/pull.c:454 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8654 | msgid "You are not currently on a branch." |
| 8655 | msgstr "Вы сейчас ни на одной из веток." |
| 8656 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8657 | #: builtin/pull.c:456 builtin/pull.c:471 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8658 | msgid "Please specify which branch you want to rebase against." |
| 8659 | msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения." |
| 8660 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8661 | #: builtin/pull.c:458 builtin/pull.c:473 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8662 | msgid "Please specify which branch you want to merge with." |
| 8663 | msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения." |
| 8664 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8665 | #: builtin/pull.c:459 builtin/pull.c:474 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8666 | msgid "See git-pull(1) for details." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8667 | msgstr "Для дополнительной информации, смотрите git-pull(1)." |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8668 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8669 | #: builtin/pull.c:469 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8670 | msgid "There is no tracking information for the current branch." |
| 8671 | msgstr "У текущей ветки нет информации об отслеживании." |
| 8672 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8673 | #: builtin/pull.c:478 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8674 | #, c-format |
| 8675 | msgid "" |
| 8676 | "If you wish to set tracking information for this branch you can do so with:\n" |
| 8677 | "\n" |
| 8678 | " git branch --set-upstream-to=%s/<branch> %s\n" |
| 8679 | msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:\n\n git branch --set-upstream-to=%s/<branch> %s\n" |
| 8680 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8681 | #: builtin/pull.c:483 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8682 | #, c-format |
| 8683 | msgid "" |
| 8684 | "Your configuration specifies to merge with the ref '%s'\n" |
| 8685 | "from the remote, but no such ref was fetched." |
| 8686 | msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена." |
| 8687 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8688 | #: builtin/pull.c:841 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8689 | msgid "Updating an unborn branch with changes added to the index." |
| 8690 | msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс." |
| 8691 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8692 | #: builtin/pull.c:870 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8693 | #, c-format |
| 8694 | msgid "" |
| 8695 | "fetch updated the current branch head.\n" |
| 8696 | "fast-forwarding your working tree from\n" |
| 8697 | "commit %s." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8698 | msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s." |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8699 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8700 | #: builtin/pull.c:875 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8701 | #, c-format |
| 8702 | msgid "" |
| 8703 | "Cannot fast-forward your working tree.\n" |
| 8704 | "After making sure that you saved anything precious from\n" |
| 8705 | "$ git diff %s\n" |
| 8706 | "output, run\n" |
| 8707 | "$ git reset --hard\n" |
| 8708 | "to recover." |
| 8709 | msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния." |
| 8710 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8711 | #: builtin/pull.c:890 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8712 | msgid "Cannot merge multiple branches into empty head." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8713 | msgstr "Нельзя слить несколько веток в пустой указатель на ветку." |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8714 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8715 | #: builtin/pull.c:894 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8716 | msgid "Cannot rebase onto multiple branches." |
| 8717 | msgstr "Невозможно переместить над несколькими ветками." |
| 8718 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8719 | #: builtin/push.c:16 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8720 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
| 8721 | msgstr "git push [<опции>] [<репозиторий> [<спецификация-ссылки>…]]" |
| 8722 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8723 | #: builtin/push.c:89 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8724 | msgid "tag shorthand without <tag>" |
| 8725 | msgstr "указано сокращение tag, но не указана сама <метка>" |
| 8726 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8727 | #: builtin/push.c:99 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8728 | msgid "--delete only accepts plain target ref names" |
| 8729 | msgstr "опция --delete принимает только простые целевые имена ссылок" |
| 8730 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8731 | #: builtin/push.c:143 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8732 | msgid "" |
| 8733 | "\n" |
| 8734 | "To choose either option permanently, see push.default in 'git help config'." |
| 8735 | msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»." |
| 8736 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8737 | #: builtin/push.c:146 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8738 | #, c-format |
| 8739 | msgid "" |
| 8740 | "The upstream branch of your current branch does not match\n" |
| 8741 | "the name of your current branch. To push to the upstream branch\n" |
| 8742 | "on the remote, use\n" |
| 8743 | "\n" |
| 8744 | " git push %s HEAD:%s\n" |
| 8745 | "\n" |
| 8746 | "To push to the branch of the same name on the remote, use\n" |
| 8747 | "\n" |
| 8748 | " git push %s %s\n" |
| 8749 | "%s" |
| 8750 | msgstr "Имя вышестоящей ветки и вашей текущей ветки различаются. Чтобы отправить изменения в вышестоящую ветку на внешнем репозитории, используйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить изменения в ветку с таким же именем на внешнем репозитории, используйте:\n\n git push %s %s\n%s" |
| 8751 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8752 | #: builtin/push.c:161 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8753 | #, c-format |
| 8754 | msgid "" |
| 8755 | "You are not currently on a branch.\n" |
| 8756 | "To push the history leading to the current (detached HEAD)\n" |
| 8757 | "state now, use\n" |
| 8758 | "\n" |
| 8759 | " git push %s HEAD:<name-of-remote-branch>\n" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8760 | msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8761 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8762 | #: builtin/push.c:175 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8763 | #, c-format |
| 8764 | msgid "" |
| 8765 | "The current branch %s has no upstream branch.\n" |
| 8766 | "To push the current branch and set the remote as upstream, use\n" |
| 8767 | "\n" |
| 8768 | " git push --set-upstream %s %s\n" |
| 8769 | msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n" |
| 8770 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8771 | #: builtin/push.c:183 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8772 | #, c-format |
| 8773 | msgid "" |
| 8774 | "The current branch %s has multiple upstream branches, refusing to push." |
| 8775 | msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений." |
| 8776 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8777 | #: builtin/push.c:186 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8778 | #, c-format |
| 8779 | msgid "" |
| 8780 | "You are pushing to remote '%s', which is not the upstream of\n" |
| 8781 | "your current branch '%s', without telling me what to push\n" |
| 8782 | "to update which remote branch." |
| 8783 | msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку." |
| 8784 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8785 | #: builtin/push.c:242 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8786 | msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 8787 | msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8788 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8789 | #: builtin/push.c:249 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8790 | msgid "" |
| 8791 | "Updates were rejected because the tip of your current branch is behind\n" |
| 8792 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
| 8793 | "'git pull ...') before pushing again.\n" |
| 8794 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8795 | msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8796 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8797 | #: builtin/push.c:255 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8798 | msgid "" |
| 8799 | "Updates were rejected because a pushed branch tip is behind its remote\n" |
| 8800 | "counterpart. Check out this branch and integrate the remote changes\n" |
| 8801 | "(e.g. 'git pull ...') before pushing again.\n" |
| 8802 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8803 | msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8804 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8805 | #: builtin/push.c:261 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8806 | msgid "" |
| 8807 | "Updates were rejected because the remote contains work that you do\n" |
| 8808 | "not have locally. This is usually caused by another repository pushing\n" |
| 8809 | "to the same ref. You may want to first integrate the remote changes\n" |
| 8810 | "(e.g., 'git pull ...') before pushing again.\n" |
| 8811 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8812 | msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8813 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8814 | #: builtin/push.c:268 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8815 | msgid "Updates were rejected because the tag already exists in the remote." |
| 8816 | msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории." |
| 8817 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8818 | #: builtin/push.c:271 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8819 | msgid "" |
| 8820 | "You cannot update a remote ref that points at a non-commit object,\n" |
| 8821 | "or update a remote ref to make it point at a non-commit object,\n" |
| 8822 | "without using the '--force' option.\n" |
| 8823 | msgstr "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n" |
| 8824 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8825 | #: builtin/push.c:331 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8826 | #, c-format |
| 8827 | msgid "Pushing to %s\n" |
| 8828 | msgstr "Отправка в %s\n" |
| 8829 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8830 | #: builtin/push.c:335 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8831 | #, c-format |
| 8832 | msgid "failed to push some refs to '%s'" |
| 8833 | msgstr "не удалось отправить некоторые ссылки в «%s»" |
| 8834 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8835 | #: builtin/push.c:365 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8836 | #, c-format |
| 8837 | msgid "bad repository '%s'" |
| 8838 | msgstr "плохой репозитория «%s»" |
| 8839 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8840 | #: builtin/push.c:366 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8841 | msgid "" |
| 8842 | "No configured push destination.\n" |
| 8843 | "Either specify the URL from the command-line or configure a remote repository using\n" |
| 8844 | "\n" |
| 8845 | " git remote add <name> <url>\n" |
| 8846 | "\n" |
| 8847 | "and then push using the remote name\n" |
| 8848 | "\n" |
| 8849 | " git push <name>\n" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8850 | msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8851 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8852 | #: builtin/push.c:381 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8853 | msgid "--all and --tags are incompatible" |
| 8854 | msgstr "--all и --tags нельзя использовать одновременно" |
| 8855 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8856 | #: builtin/push.c:382 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8857 | msgid "--all can't be combined with refspecs" |
| 8858 | msgstr "--all нельзя использовать вместе со спецификациями ссылок" |
| 8859 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8860 | #: builtin/push.c:387 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8861 | msgid "--mirror and --tags are incompatible" |
| 8862 | msgstr "--mirror и --tags нельзя использовать одновременно" |
| 8863 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8864 | #: builtin/push.c:388 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8865 | msgid "--mirror can't be combined with refspecs" |
| 8866 | msgstr "--mirror нельзя использовать вместе со спецификациями ссылок" |
| 8867 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8868 | #: builtin/push.c:393 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8869 | msgid "--all and --mirror are incompatible" |
| 8870 | msgstr "--all и --mirror нельзя использовать одновременно" |
| 8871 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8872 | #: builtin/push.c:505 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8873 | msgid "repository" |
| 8874 | msgstr "репозиторий" |
| 8875 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8876 | #: builtin/push.c:506 builtin/send-pack.c:161 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8877 | msgid "push all refs" |
| 8878 | msgstr "отправить все ссылки" |
| 8879 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8880 | #: builtin/push.c:507 builtin/send-pack.c:163 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8881 | msgid "mirror all refs" |
| 8882 | msgstr "сделать зеркало всех ссылок" |
| 8883 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8884 | #: builtin/push.c:509 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8885 | msgid "delete refs" |
| 8886 | msgstr "удалить ссылки" |
| 8887 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8888 | #: builtin/push.c:510 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8889 | msgid "push tags (can't be used with --all or --mirror)" |
| 8890 | msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)" |
| 8891 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8892 | #: builtin/push.c:513 builtin/send-pack.c:164 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8893 | msgid "force updates" |
| 8894 | msgstr "принудительное обновление" |
| 8895 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8896 | #: builtin/push.c:515 builtin/send-pack.c:175 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8897 | msgid "refname>:<expect" |
| 8898 | msgstr "имя-ссылки>:<ожидается" |
| 8899 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8900 | #: builtin/push.c:516 builtin/send-pack.c:176 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8901 | msgid "require old value of ref to be at this value" |
| 8902 | msgstr "требовать, чтобы старое значение ссылки было ожидаемым" |
| 8903 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8904 | #: builtin/push.c:519 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8905 | msgid "control recursive pushing of submodules" |
| 8906 | msgstr "управление рекурсивной отправкой подмодулей" |
| 8907 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8908 | #: builtin/push.c:521 builtin/send-pack.c:169 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8909 | msgid "use thin pack" |
| 8910 | msgstr "использовать тонкие пакеты" |
| 8911 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8912 | #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8913 | #: builtin/send-pack.c:159 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8914 | msgid "receive pack program" |
| 8915 | msgstr "путь к программе упаковки на сервере" |
| 8916 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8917 | #: builtin/push.c:524 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8918 | msgid "set upstream for git pull/status" |
| 8919 | msgstr "установить вышестоящую ветку для git pull/status" |
| 8920 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8921 | #: builtin/push.c:527 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8922 | msgid "prune locally removed refs" |
| 8923 | msgstr "почистить локально удаленные ссылки" |
| 8924 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8925 | #: builtin/push.c:529 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8926 | msgid "bypass pre-push hook" |
| 8927 | msgstr "пропустить перехватчик перед-отправкой" |
| 8928 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8929 | #: builtin/push.c:530 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8930 | msgid "push missing but relevant tags" |
| 8931 | msgstr "отправить пропущенные, но нужные метки" |
| 8932 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8933 | #: builtin/push.c:533 builtin/send-pack.c:166 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8934 | msgid "GPG sign the push" |
| 8935 | msgstr "подписать отправку с помощью GPG" |
| 8936 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8937 | #: builtin/push.c:535 builtin/send-pack.c:170 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 8938 | msgid "request atomic transaction on remote side" |
| 8939 | msgstr "запросить выполнение атомарной транзакции на внешней стороне" |
| 8940 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8941 | #: builtin/push.c:549 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8942 | msgid "--delete is incompatible with --all, --mirror and --tags" |
| 8943 | msgstr "--delete несовместимо с --all, --mirror и --tags" |
| 8944 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 8945 | #: builtin/push.c:551 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8946 | msgid "--delete doesn't make sense without any refs" |
| 8947 | msgstr "--delete не имеет смысла без указания ссылок" |
| 8948 | |
| 8949 | #: builtin/read-tree.c:37 |
| 8950 | msgid "" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8951 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8952 | " [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] " |
| 8953 | "[--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 8954 | msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<префикс>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 8955 | |
| 8956 | #: builtin/read-tree.c:110 |
| 8957 | msgid "write resulting index to <file>" |
| 8958 | msgstr "записать результирующий индекс в <файл>" |
| 8959 | |
| 8960 | #: builtin/read-tree.c:113 |
| 8961 | msgid "only empty the index" |
| 8962 | msgstr "просто очистить индекс" |
| 8963 | |
| 8964 | #: builtin/read-tree.c:115 |
| 8965 | msgid "Merging" |
| 8966 | msgstr "Слияние" |
| 8967 | |
| 8968 | #: builtin/read-tree.c:117 |
| 8969 | msgid "perform a merge in addition to a read" |
| 8970 | msgstr "выполнить слияние в дополнение к чтению" |
| 8971 | |
| 8972 | #: builtin/read-tree.c:119 |
| 8973 | msgid "3-way merge if no file level merging required" |
| 8974 | msgstr "трехходовое слияние, если не требуется слияние на уровне файлов" |
| 8975 | |
| 8976 | #: builtin/read-tree.c:121 |
| 8977 | msgid "3-way merge in presence of adds and removes" |
| 8978 | msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов" |
| 8979 | |
| 8980 | #: builtin/read-tree.c:123 |
| 8981 | msgid "same as -m, but discard unmerged entries" |
| 8982 | msgstr "тоже, что и -m, но отменяет изменения не слитых записей" |
| 8983 | |
| 8984 | #: builtin/read-tree.c:124 |
| 8985 | msgid "<subdirectory>/" |
| 8986 | msgstr "<подкаталог>/" |
| 8987 | |
| 8988 | #: builtin/read-tree.c:125 |
| 8989 | msgid "read the tree into the index under <subdirectory>/" |
| 8990 | msgstr "прочитать дерево в индекс в <подкаталог>/" |
| 8991 | |
| 8992 | #: builtin/read-tree.c:128 |
| 8993 | msgid "update working tree with merge result" |
| 8994 | msgstr "обновить рабочий каталог результатом слияния" |
| 8995 | |
| 8996 | #: builtin/read-tree.c:130 |
| 8997 | msgid "gitignore" |
| 8998 | msgstr "gitignore" |
| 8999 | |
| 9000 | #: builtin/read-tree.c:131 |
| 9001 | msgid "allow explicitly ignored files to be overwritten" |
| 9002 | msgstr "разрешить перезапись явно игнорируемых файлов" |
| 9003 | |
| 9004 | #: builtin/read-tree.c:134 |
| 9005 | msgid "don't check the working tree after merging" |
| 9006 | msgstr "не проверять рабочий каталог после слияния" |
| 9007 | |
| 9008 | #: builtin/read-tree.c:135 |
| 9009 | msgid "don't update the index or the work tree" |
| 9010 | msgstr "не обновлять индекс или рабочий каталог" |
| 9011 | |
| 9012 | #: builtin/read-tree.c:137 |
| 9013 | msgid "skip applying sparse checkout filter" |
| 9014 | msgstr "пропустить применение фильтра частичного перехода" |
| 9015 | |
| 9016 | #: builtin/read-tree.c:139 |
| 9017 | msgid "debug unpack-trees" |
| 9018 | msgstr "отладка unpack-trees" |
| 9019 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9020 | #: builtin/reflog.c:423 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9021 | #, c-format |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 9022 | msgid "'%s' for '%s' is not a valid timestamp" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9023 | msgstr "«%s» для «%s» не является допустимой меткой даты/времени" |
| 9024 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9025 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9026 | #, c-format |
| 9027 | msgid "'%s' is not a valid timestamp" |
| 9028 | msgstr "«%s» не является допустимой меткой даты/времени" |
| 9029 | |
| 9030 | #: builtin/remote.c:12 |
| 9031 | msgid "git remote [-v | --verbose]" |
| 9032 | msgstr "git remote [-v | --verbose]" |
| 9033 | |
| 9034 | #: builtin/remote.c:13 |
| 9035 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9036 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] " |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9037 | "[--mirror=<fetch|push>] <name> <url>" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9038 | msgstr "git remote add [-t <ветка>] [-m <мастер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имя> <адрес>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9039 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9040 | #: builtin/remote.c:14 builtin/remote.c:34 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9041 | msgid "git remote rename <old> <new>" |
| 9042 | msgstr "git remote rename <старое-название> <новое-название>" |
| 9043 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9044 | #: builtin/remote.c:15 builtin/remote.c:39 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9045 | msgid "git remote remove <name>" |
| 9046 | msgstr "git remote remove <имя>" |
| 9047 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9048 | #: builtin/remote.c:16 builtin/remote.c:44 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9049 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
| 9050 | msgstr "git remote set-head <имя> (-a | --auto | -d | --delete | <ветка>)" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9051 | |
| 9052 | #: builtin/remote.c:17 |
| 9053 | msgid "git remote [-v | --verbose] show [-n] <name>" |
| 9054 | msgstr "git remote [-v | --verbose] show [-n] <имя>" |
| 9055 | |
| 9056 | #: builtin/remote.c:18 |
| 9057 | msgid "git remote prune [-n | --dry-run] <name>" |
| 9058 | msgstr "git remote prune [-n | --dry-run] <имя>" |
| 9059 | |
| 9060 | #: builtin/remote.c:19 |
| 9061 | msgid "" |
| 9062 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" |
| 9063 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-репозитория>)…]" |
| 9064 | |
| 9065 | #: builtin/remote.c:20 |
| 9066 | msgid "git remote set-branches [--add] <name> <branch>..." |
| 9067 | msgstr "git remote set-branches [--add] <имя> <ветка>…" |
| 9068 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9069 | #: builtin/remote.c:21 builtin/remote.c:70 |
| 9070 | msgid "git remote get-url [--push] [--all] <name>" |
| 9071 | msgstr "git remote get-url [--push] [--all] <имя>" |
| 9072 | |
| 9073 | #: builtin/remote.c:22 builtin/remote.c:75 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9074 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
| 9075 | msgstr "git remote set-url [--push] <имя> <новый-url> [<старый-url>]" |
| 9076 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9077 | #: builtin/remote.c:23 builtin/remote.c:76 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9078 | msgid "git remote set-url --add <name> <newurl>" |
| 9079 | msgstr "git remote set-url --add <имя> <новый-url>" |
| 9080 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9081 | #: builtin/remote.c:24 builtin/remote.c:77 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9082 | msgid "git remote set-url --delete <name> <url>" |
| 9083 | msgstr "git remote set-url --delete <имя> <url>" |
| 9084 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9085 | #: builtin/remote.c:29 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9086 | msgid "git remote add [<options>] <name> <url>" |
| 9087 | msgstr "git remote add [<опции>] <имя> <url>" |
| 9088 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9089 | #: builtin/remote.c:49 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9090 | msgid "git remote set-branches <name> <branch>..." |
| 9091 | msgstr "git remote set-branches <имя> <ветка>…" |
| 9092 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9093 | #: builtin/remote.c:50 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9094 | msgid "git remote set-branches --add <name> <branch>..." |
| 9095 | msgstr "git remote set-branches --add <имя> <ветка>…" |
| 9096 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9097 | #: builtin/remote.c:55 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9098 | msgid "git remote show [<options>] <name>" |
| 9099 | msgstr "git remote show [<опции>] <имя>" |
| 9100 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9101 | #: builtin/remote.c:60 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9102 | msgid "git remote prune [<options>] <name>" |
| 9103 | msgstr "git remote prune [<опции>] <имя>" |
| 9104 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9105 | #: builtin/remote.c:65 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9106 | msgid "git remote update [<options>] [<group> | <remote>]..." |
| 9107 | msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]…" |
| 9108 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9109 | #: builtin/remote.c:94 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9110 | #, c-format |
| 9111 | msgid "Updating %s" |
| 9112 | msgstr "Обновление %s" |
| 9113 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9114 | #: builtin/remote.c:126 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9115 | msgid "" |
| 9116 | "--mirror is dangerous and deprecated; please\n" |
| 9117 | "\t use --mirror=fetch or --mirror=push instead" |
| 9118 | msgstr "ключ --mirror небезопасен и не рекомендуется к использованию;\nиспользуйте вместо него --mirror=fetch или --mirror=push" |
| 9119 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9120 | #: builtin/remote.c:143 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9121 | #, c-format |
| 9122 | msgid "unknown mirror argument: %s" |
| 9123 | msgstr "неизвестный аргумент для mirror: %s" |
| 9124 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9125 | #: builtin/remote.c:159 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9126 | msgid "fetch the remote branches" |
| 9127 | msgstr "извлечь внешние ветки" |
| 9128 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9129 | #: builtin/remote.c:161 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9130 | msgid "import all tags and associated objects when fetching" |
| 9131 | msgstr "импортировать все метки и ассоциированные объекты при извлечении" |
| 9132 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9133 | #: builtin/remote.c:164 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9134 | msgid "or do not fetch any tag at all (--no-tags)" |
| 9135 | msgstr "или не извлекать метки вообще (--no-tags)" |
| 9136 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9137 | #: builtin/remote.c:166 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9138 | msgid "branch(es) to track" |
| 9139 | msgstr "отслеживаемые ветки" |
| 9140 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9141 | #: builtin/remote.c:167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9142 | msgid "master branch" |
| 9143 | msgstr "мастер ветка" |
| 9144 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9145 | #: builtin/remote.c:168 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9146 | msgid "push|fetch" |
| 9147 | msgstr "push|fetch" |
| 9148 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9149 | #: builtin/remote.c:169 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9150 | msgid "set up remote as a mirror to push to or fetch from" |
| 9151 | msgstr "настроить внешний репозиторий как зеркало для отправки или извлечения изменений" |
| 9152 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9153 | #: builtin/remote.c:181 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9154 | msgid "specifying a master branch makes no sense with --mirror" |
| 9155 | msgstr "указание мастер ветки не имеет смысла с параметром --mirror" |
| 9156 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9157 | #: builtin/remote.c:183 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9158 | msgid "specifying branches to track makes sense only with fetch mirrors" |
| 9159 | msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении" |
| 9160 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9161 | #: builtin/remote.c:190 builtin/remote.c:633 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9162 | #, c-format |
| 9163 | msgid "remote %s already exists." |
| 9164 | msgstr "внешний репозиторий %s уже существует" |
| 9165 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9166 | #: builtin/remote.c:194 builtin/remote.c:637 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9167 | #, c-format |
| 9168 | msgid "'%s' is not a valid remote name" |
| 9169 | msgstr "«%s» не является допустимым именем внешнего репозитория." |
| 9170 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9171 | #: builtin/remote.c:234 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9172 | #, c-format |
| 9173 | msgid "Could not setup master '%s'" |
| 9174 | msgstr "Не удалось настроить мастер ветку «%s»" |
| 9175 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9176 | #: builtin/remote.c:336 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9177 | #, c-format |
| 9178 | msgid "Could not get fetch map for refspec %s" |
| 9179 | msgstr "Не удалось извлечь карту для спецификации ссылки %s" |
| 9180 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9181 | #: builtin/remote.c:437 builtin/remote.c:445 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9182 | msgid "(matching)" |
| 9183 | msgstr "(соответствующая)" |
| 9184 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9185 | #: builtin/remote.c:449 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9186 | msgid "(delete)" |
| 9187 | msgstr "(удаленная)" |
| 9188 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9189 | #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9190 | #, c-format |
| 9191 | msgid "No such remote: %s" |
| 9192 | msgstr "Нет такого внешнего репозитория: %s" |
| 9193 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9194 | #: builtin/remote.c:643 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9195 | #, c-format |
| 9196 | msgid "Could not rename config section '%s' to '%s'" |
| 9197 | msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»" |
| 9198 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9199 | #: builtin/remote.c:663 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9200 | #, c-format |
| 9201 | msgid "" |
| 9202 | "Not updating non-default fetch refspec\n" |
| 9203 | "\t%s\n" |
| 9204 | "\tPlease update the configuration manually if necessary." |
| 9205 | msgstr "Не обновляю нестандартную спецификацию ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную." |
| 9206 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9207 | #: builtin/remote.c:699 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9208 | #, c-format |
| 9209 | msgid "deleting '%s' failed" |
| 9210 | msgstr "не удалось удалить «%s»" |
| 9211 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9212 | #: builtin/remote.c:733 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9213 | #, c-format |
| 9214 | msgid "creating '%s' failed" |
| 9215 | msgstr "не удалось создать «%s»" |
| 9216 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9217 | #: builtin/remote.c:796 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9218 | msgid "" |
| 9219 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" |
| 9220 | "to delete it, use:" |
| 9221 | msgid_plural "" |
| 9222 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" |
| 9223 | "to delete them, use:" |
| 9224 | msgstr[0] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" |
| 9225 | msgstr[1] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" |
| 9226 | msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9227 | msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9228 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9229 | #: builtin/remote.c:810 |
| 9230 | #, c-format |
| 9231 | msgid "Could not remove config section '%s'" |
| 9232 | msgstr "Не удалось удалить секцию файла конфигурации «%s»" |
| 9233 | |
| 9234 | #: builtin/remote.c:911 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9235 | #, c-format |
| 9236 | msgid " new (next fetch will store in remotes/%s)" |
| 9237 | msgstr " новая (следующее извлечение сохранит ее в remotes/%s)" |
| 9238 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9239 | #: builtin/remote.c:914 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9240 | msgid " tracked" |
| 9241 | msgstr " отслеживается" |
| 9242 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9243 | #: builtin/remote.c:916 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9244 | msgid " stale (use 'git remote prune' to remove)" |
| 9245 | msgstr " недействительна (используйте «git remote prune», чтобы удалить)" |
| 9246 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9247 | #: builtin/remote.c:918 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9248 | msgid " ???" |
| 9249 | msgstr " ???" |
| 9250 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9251 | #: builtin/remote.c:959 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9252 | #, c-format |
| 9253 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" |
| 9254 | msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой" |
| 9255 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9256 | #: builtin/remote.c:967 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9257 | #, c-format |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9258 | msgid "rebases interactively onto remote %s" |
| 9259 | msgstr "перемещается интерактивно над внешней веткой %s" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9260 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9261 | #: builtin/remote.c:971 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9262 | #, c-format |
| 9263 | msgid " merges with remote %s" |
| 9264 | msgstr " будет слита с внешней веткой %s" |
| 9265 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9266 | #: builtin/remote.c:972 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9267 | msgid " and with remote" |
| 9268 | msgstr " и с внешней веткой" |
| 9269 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9270 | #: builtin/remote.c:974 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9271 | #, c-format |
| 9272 | msgid "merges with remote %s" |
| 9273 | msgstr "будет слита с внешней веткой %s" |
| 9274 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9275 | #: builtin/remote.c:975 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9276 | msgid " and with remote" |
| 9277 | msgstr " и с внешней веткой" |
| 9278 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9279 | #: builtin/remote.c:1021 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9280 | msgid "create" |
| 9281 | msgstr "создана" |
| 9282 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9283 | #: builtin/remote.c:1024 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9284 | msgid "delete" |
| 9285 | msgstr "удалена" |
| 9286 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9287 | #: builtin/remote.c:1028 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9288 | msgid "up to date" |
| 9289 | msgstr "уже актуальна" |
| 9290 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9291 | #: builtin/remote.c:1031 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9292 | msgid "fast-forwardable" |
| 9293 | msgstr "возможна перемотка вперед" |
| 9294 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9295 | #: builtin/remote.c:1034 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9296 | msgid "local out of date" |
| 9297 | msgstr "локальная ветка устарела" |
| 9298 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9299 | #: builtin/remote.c:1041 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9300 | #, c-format |
| 9301 | msgid " %-*s forces to %-*s (%s)" |
| 9302 | msgstr " %-*s будет принудительно отправлена в %-*s (%s)" |
| 9303 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9304 | #: builtin/remote.c:1044 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9305 | #, c-format |
| 9306 | msgid " %-*s pushes to %-*s (%s)" |
| 9307 | msgstr " %-*s будет отправлена в %-*s (%s)" |
| 9308 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9309 | #: builtin/remote.c:1048 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9310 | #, c-format |
| 9311 | msgid " %-*s forces to %s" |
| 9312 | msgstr " %-*s будет принудительно отправлена в %s" |
| 9313 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9314 | #: builtin/remote.c:1051 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9315 | #, c-format |
| 9316 | msgid " %-*s pushes to %s" |
| 9317 | msgstr " %-*s будет отправлена в %s" |
| 9318 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9319 | #: builtin/remote.c:1119 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9320 | msgid "do not query remotes" |
| 9321 | msgstr "не опрашивать внешние репозитории" |
| 9322 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9323 | #: builtin/remote.c:1146 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9324 | #, c-format |
| 9325 | msgid "* remote %s" |
| 9326 | msgstr "* внешний репозиторий %s" |
| 9327 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9328 | #: builtin/remote.c:1147 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9329 | #, c-format |
| 9330 | msgid " Fetch URL: %s" |
| 9331 | msgstr " URL для извлечения: %s" |
| 9332 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9333 | #: builtin/remote.c:1148 builtin/remote.c:1299 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9334 | msgid "(no URL)" |
| 9335 | msgstr "(нет URL)" |
| 9336 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9337 | #: builtin/remote.c:1157 builtin/remote.c:1159 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9338 | #, c-format |
| 9339 | msgid " Push URL: %s" |
| 9340 | msgstr " URL для отправки: %s" |
| 9341 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9342 | #: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9343 | #, c-format |
| 9344 | msgid " HEAD branch: %s" |
| 9345 | msgstr " HEAD ветка: %s" |
| 9346 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9347 | #: builtin/remote.c:1167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9348 | #, c-format |
| 9349 | msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" |
| 9350 | msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n" |
| 9351 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9352 | #: builtin/remote.c:1179 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9353 | #, c-format |
| 9354 | msgid " Remote branch:%s" |
| 9355 | msgid_plural " Remote branches:%s" |
| 9356 | msgstr[0] " Внешняя ветка:%s" |
| 9357 | msgstr[1] " Внешние ветки:%s" |
| 9358 | msgstr[2] " Внешние ветки:%s" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9359 | msgstr[3] " Внешние ветки:%s" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9360 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9361 | #: builtin/remote.c:1182 builtin/remote.c:1209 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9362 | msgid " (status not queried)" |
| 9363 | msgstr " (статус не запрошен)" |
| 9364 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9365 | #: builtin/remote.c:1191 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9366 | msgid " Local branch configured for 'git pull':" |
| 9367 | msgid_plural " Local branches configured for 'git pull':" |
| 9368 | msgstr[0] " Локальная ветка, настроенная для «git pull»:" |
| 9369 | msgstr[1] " Локальные ветки, настроенные для «git pull»:" |
| 9370 | msgstr[2] " Локальные ветки, настроенные для «git pull»:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9371 | msgstr[3] " Локальные ветки, настроенные для «git pull»:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9372 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9373 | #: builtin/remote.c:1199 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9374 | msgid " Local refs will be mirrored by 'git push'" |
| 9375 | msgstr " Локальные ссылки, зеркалируемые с помощью «git push»" |
| 9376 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9377 | #: builtin/remote.c:1206 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9378 | #, c-format |
| 9379 | msgid " Local ref configured for 'git push'%s:" |
| 9380 | msgid_plural " Local refs configured for 'git push'%s:" |
| 9381 | msgstr[0] " Локальная ссылка, настроенная для «git push»%s:" |
| 9382 | msgstr[1] " Локальные ссылки, настроенные для «git push»%s:" |
| 9383 | msgstr[2] " Локальные ссылки, настроенные для «git push»%s:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9384 | msgstr[3] " Локальные ссылки, настроенные для «git push»%s:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9385 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9386 | #: builtin/remote.c:1227 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9387 | msgid "set refs/remotes/<name>/HEAD according to remote" |
| 9388 | msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория" |
| 9389 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9390 | #: builtin/remote.c:1229 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9391 | msgid "delete refs/remotes/<name>/HEAD" |
| 9392 | msgstr "удалить refs/remotes/<имя>/HEAD" |
| 9393 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9394 | #: builtin/remote.c:1244 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9395 | msgid "Cannot determine remote HEAD" |
| 9396 | msgstr "Не удалось определить внешний HEAD" |
| 9397 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9398 | #: builtin/remote.c:1246 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9399 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
| 9400 | msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:" |
| 9401 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9402 | #: builtin/remote.c:1256 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9403 | #, c-format |
| 9404 | msgid "Could not delete %s" |
| 9405 | msgstr "Не удалось удалить %s" |
| 9406 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9407 | #: builtin/remote.c:1264 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9408 | #, c-format |
| 9409 | msgid "Not a valid ref: %s" |
| 9410 | msgstr "Неправильная ссылка: %s" |
| 9411 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9412 | #: builtin/remote.c:1266 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9413 | #, c-format |
| 9414 | msgid "Could not setup %s" |
| 9415 | msgstr "Не удалось настроить %s" |
| 9416 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9417 | #: builtin/remote.c:1284 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9418 | #, c-format |
| 9419 | msgid " %s will become dangling!" |
| 9420 | msgstr " %s будет висящей веткой!" |
| 9421 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9422 | #: builtin/remote.c:1285 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9423 | #, c-format |
| 9424 | msgid " %s has become dangling!" |
| 9425 | msgstr " %s стала висящей веткой!" |
| 9426 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9427 | #: builtin/remote.c:1295 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9428 | #, c-format |
| 9429 | msgid "Pruning %s" |
| 9430 | msgstr "Удаление %s" |
| 9431 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9432 | #: builtin/remote.c:1296 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9433 | #, c-format |
| 9434 | msgid "URL: %s" |
| 9435 | msgstr "URL: %s" |
| 9436 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9437 | #: builtin/remote.c:1312 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9438 | #, c-format |
| 9439 | msgid " * [would prune] %s" |
| 9440 | msgstr " * [будет удалена] %s" |
| 9441 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9442 | #: builtin/remote.c:1315 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9443 | #, c-format |
| 9444 | msgid " * [pruned] %s" |
| 9445 | msgstr " * [удалена] %s" |
| 9446 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9447 | #: builtin/remote.c:1360 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9448 | msgid "prune remotes after fetching" |
| 9449 | msgstr "почистить внешние репозитории после извлечения" |
| 9450 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9451 | #: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9452 | #, c-format |
| 9453 | msgid "No such remote '%s'" |
| 9454 | msgstr "Нет такого внешнего репозитория «%s»" |
| 9455 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9456 | #: builtin/remote.c:1439 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9457 | msgid "add branch" |
| 9458 | msgstr "добавить ветку" |
| 9459 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9460 | #: builtin/remote.c:1446 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9461 | msgid "no remote specified" |
| 9462 | msgstr "не указан внешний репозиторий" |
| 9463 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9464 | #: builtin/remote.c:1463 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9465 | msgid "query push URLs rather than fetch URLs" |
| 9466 | msgstr "запросить URL отправки, вместо URL извлечения" |
| 9467 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9468 | #: builtin/remote.c:1465 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9469 | msgid "return all URLs" |
| 9470 | msgstr "вернуть все URL" |
| 9471 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9472 | #: builtin/remote.c:1493 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9473 | #, c-format |
| 9474 | msgid "no URLs configured for remote '%s'" |
| 9475 | msgstr "URL не настроены для внешнего репозитория «%s»" |
| 9476 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9477 | #: builtin/remote.c:1519 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9478 | msgid "manipulate push URLs" |
| 9479 | msgstr "управление URL отправки" |
| 9480 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9481 | #: builtin/remote.c:1521 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9482 | msgid "add URL" |
| 9483 | msgstr "добавить URL" |
| 9484 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9485 | #: builtin/remote.c:1523 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9486 | msgid "delete URLs" |
| 9487 | msgstr "удалить URL" |
| 9488 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9489 | #: builtin/remote.c:1530 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9490 | msgid "--add --delete doesn't make sense" |
| 9491 | msgstr "--add нельзя использовать одновременно с --delete" |
| 9492 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9493 | #: builtin/remote.c:1571 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9494 | #, c-format |
| 9495 | msgid "Invalid old URL pattern: %s" |
| 9496 | msgstr "Неправильный шаблон старого URL: %s" |
| 9497 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9498 | #: builtin/remote.c:1579 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9499 | #, c-format |
| 9500 | msgid "No such URL found: %s" |
| 9501 | msgstr "Не найдены совпадения URL: %s" |
| 9502 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9503 | #: builtin/remote.c:1581 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9504 | msgid "Will not delete all non-push URLs" |
| 9505 | msgstr "Нельзя удалить все URL не-отправки" |
| 9506 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9507 | #: builtin/remote.c:1595 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9508 | msgid "be verbose; must be placed before a subcommand" |
| 9509 | msgstr "быть многословнее; должно стоять перед подкомандой" |
| 9510 | |
| 9511 | #: builtin/repack.c:17 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9512 | msgid "git repack [<options>]" |
| 9513 | msgstr "git repack [<опции>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9514 | |
| 9515 | #: builtin/repack.c:159 |
| 9516 | msgid "pack everything in a single pack" |
| 9517 | msgstr "упаковать всё в один пакет" |
| 9518 | |
| 9519 | #: builtin/repack.c:161 |
| 9520 | msgid "same as -a, and turn unreachable objects loose" |
| 9521 | msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты" |
| 9522 | |
| 9523 | #: builtin/repack.c:164 |
| 9524 | msgid "remove redundant packs, and run git-prune-packed" |
| 9525 | msgstr "удалите лишние пакеты и запустите git-prune-packed" |
| 9526 | |
| 9527 | #: builtin/repack.c:166 |
| 9528 | msgid "pass --no-reuse-delta to git-pack-objects" |
| 9529 | msgstr "передать опцию --no-reuse-delta в git-pack-objects" |
| 9530 | |
| 9531 | #: builtin/repack.c:168 |
| 9532 | msgid "pass --no-reuse-object to git-pack-objects" |
| 9533 | msgstr "передать опцию --no-reuse-object в git-pack-objects" |
| 9534 | |
| 9535 | #: builtin/repack.c:170 |
| 9536 | msgid "do not run git-update-server-info" |
| 9537 | msgstr "не запускать git-update-server-info" |
| 9538 | |
| 9539 | #: builtin/repack.c:173 |
| 9540 | msgid "pass --local to git-pack-objects" |
| 9541 | msgstr "передать опцию --local в git-pack-objects" |
| 9542 | |
| 9543 | #: builtin/repack.c:175 |
| 9544 | msgid "write bitmap index" |
| 9545 | msgstr "запись индекса в битовых картах" |
| 9546 | |
| 9547 | #: builtin/repack.c:176 |
| 9548 | msgid "approxidate" |
| 9549 | msgstr "примерная-дата" |
| 9550 | |
| 9551 | #: builtin/repack.c:177 |
| 9552 | msgid "with -A, do not loosen objects older than this" |
| 9553 | msgstr "с опцией -A, не отбрасывать объекты старее, чем указано" |
| 9554 | |
| 9555 | #: builtin/repack.c:179 |
| 9556 | msgid "size of the window used for delta compression" |
| 9557 | msgstr "размер окна, используемый для компрессии дельт" |
| 9558 | |
| 9559 | #: builtin/repack.c:180 builtin/repack.c:184 |
| 9560 | msgid "bytes" |
| 9561 | msgstr "количество-байт" |
| 9562 | |
| 9563 | #: builtin/repack.c:181 |
| 9564 | msgid "same as the above, but limit memory size instead of entries count" |
| 9565 | msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей" |
| 9566 | |
| 9567 | #: builtin/repack.c:183 |
| 9568 | msgid "limits the maximum delta depth" |
| 9569 | msgstr "ограничение на максимальную глубину дельт" |
| 9570 | |
| 9571 | #: builtin/repack.c:185 |
| 9572 | msgid "maximum size of each packfile" |
| 9573 | msgstr "максимальный размер каждого из файлов пакета" |
| 9574 | |
| 9575 | #: builtin/repack.c:187 |
| 9576 | msgid "repack objects in packs marked with .keep" |
| 9577 | msgstr "переупаковать объекты в пакеты, помеченные файлом .keep" |
| 9578 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9579 | #: builtin/repack.c:197 |
| 9580 | msgid "cannot delete packs in a precious-objects repo" |
| 9581 | msgstr "нельзя удалять пакеты в precious-objects репозитории" |
| 9582 | |
| 9583 | #: builtin/repack.c:381 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9584 | #, c-format |
| 9585 | msgid "removing '%s' failed" |
| 9586 | msgstr "не удалось удалить «%s»" |
| 9587 | |
| 9588 | #: builtin/replace.c:19 |
| 9589 | msgid "git replace [-f] <object> <replacement>" |
| 9590 | msgstr "git replace [-f] <объект> <замена>" |
| 9591 | |
| 9592 | #: builtin/replace.c:20 |
| 9593 | msgid "git replace [-f] --edit <object>" |
| 9594 | msgstr "git replace [-f] --edit <объект>" |
| 9595 | |
| 9596 | #: builtin/replace.c:21 |
| 9597 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
| 9598 | msgstr "git replace [-f] --graft <коммит> [<родитель>…]" |
| 9599 | |
| 9600 | #: builtin/replace.c:22 |
| 9601 | msgid "git replace -d <object>..." |
| 9602 | msgstr "git replace -d <объект>…" |
| 9603 | |
| 9604 | #: builtin/replace.c:23 |
| 9605 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
| 9606 | msgstr "git replace [--format=<формат>] [-l [<шаблон>]]" |
| 9607 | |
| 9608 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
| 9609 | #, c-format |
| 9610 | msgid "Not a valid object name: '%s'" |
| 9611 | msgstr "Недопустимое имя объекта: «%s»" |
| 9612 | |
| 9613 | #: builtin/replace.c:355 |
| 9614 | #, c-format |
| 9615 | msgid "bad mergetag in commit '%s'" |
| 9616 | msgstr "плохая метка слияния в коммите «%s»" |
| 9617 | |
| 9618 | #: builtin/replace.c:357 |
| 9619 | #, c-format |
| 9620 | msgid "malformed mergetag in commit '%s'" |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 9621 | msgstr "повреждённая метка слияния в коммите «%s»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9622 | |
| 9623 | #: builtin/replace.c:368 |
| 9624 | #, c-format |
| 9625 | msgid "" |
| 9626 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " |
| 9627 | "instead of --graft" |
| 9628 | msgstr "оригинальный коммит «%s» содержит метку слияния «%s», которая была отброшена; используйте --edit вместо --graft" |
| 9629 | |
| 9630 | #: builtin/replace.c:401 |
| 9631 | #, c-format |
| 9632 | msgid "the original commit '%s' has a gpg signature." |
| 9633 | msgstr "оригинальный коммит «%s» содержит подпись gpg." |
| 9634 | |
| 9635 | #: builtin/replace.c:402 |
| 9636 | msgid "the signature will be removed in the replacement commit!" |
| 9637 | msgstr "подпись будет удалена в замененном коммите!" |
| 9638 | |
| 9639 | #: builtin/replace.c:408 |
| 9640 | #, c-format |
| 9641 | msgid "could not write replacement commit for: '%s'" |
| 9642 | msgstr "не удалось записать замену для коммита: «%s»" |
| 9643 | |
| 9644 | #: builtin/replace.c:432 |
| 9645 | msgid "list replace refs" |
| 9646 | msgstr "вывести список заменяемых ссылок" |
| 9647 | |
| 9648 | #: builtin/replace.c:433 |
| 9649 | msgid "delete replace refs" |
| 9650 | msgstr "удаление заменяемых ссылок" |
| 9651 | |
| 9652 | #: builtin/replace.c:434 |
| 9653 | msgid "edit existing object" |
| 9654 | msgstr "изменение существующего объекта" |
| 9655 | |
| 9656 | #: builtin/replace.c:435 |
| 9657 | msgid "change a commit's parents" |
| 9658 | msgstr "изменение родителя коммита" |
| 9659 | |
| 9660 | #: builtin/replace.c:436 |
| 9661 | msgid "replace the ref if it exists" |
| 9662 | msgstr "замена ссылки, если она существует" |
| 9663 | |
| 9664 | #: builtin/replace.c:437 |
| 9665 | msgid "do not pretty-print contents for --edit" |
| 9666 | msgstr "не делать структурированный вывод содержимого для --edit" |
| 9667 | |
| 9668 | #: builtin/replace.c:438 |
| 9669 | msgid "use this format" |
| 9670 | msgstr "использовать этот формат" |
| 9671 | |
| 9672 | #: builtin/rerere.c:12 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9673 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
| 9674 | msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9675 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9676 | #: builtin/rerere.c:58 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9677 | msgid "register clean resolutions in index" |
| 9678 | msgstr "записать чистые разрешения конфликтов в индекс" |
| 9679 | |
| 9680 | #: builtin/reset.c:26 |
| 9681 | msgid "" |
| 9682 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" |
| 9683 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]" |
| 9684 | |
| 9685 | #: builtin/reset.c:27 |
| 9686 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
| 9687 | msgstr "git reset [-q] <указатель-дерева> [--] <пути>…" |
| 9688 | |
| 9689 | #: builtin/reset.c:28 |
| 9690 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
| 9691 | msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]" |
| 9692 | |
| 9693 | #: builtin/reset.c:34 |
| 9694 | msgid "mixed" |
| 9695 | msgstr "смешанный" |
| 9696 | |
| 9697 | #: builtin/reset.c:34 |
| 9698 | msgid "soft" |
| 9699 | msgstr "мягкий" |
| 9700 | |
| 9701 | #: builtin/reset.c:34 |
| 9702 | msgid "hard" |
| 9703 | msgstr "жесткий" |
| 9704 | |
| 9705 | #: builtin/reset.c:34 |
| 9706 | msgid "merge" |
| 9707 | msgstr "слиянием" |
| 9708 | |
| 9709 | #: builtin/reset.c:34 |
| 9710 | msgid "keep" |
| 9711 | msgstr "оставлением" |
| 9712 | |
| 9713 | #: builtin/reset.c:74 |
| 9714 | msgid "You do not have a valid HEAD." |
| 9715 | msgstr "У вас нет верного HEAD." |
| 9716 | |
| 9717 | #: builtin/reset.c:76 |
| 9718 | msgid "Failed to find tree of HEAD." |
| 9719 | msgstr "Не удалось найти дерево у HEAD." |
| 9720 | |
| 9721 | #: builtin/reset.c:82 |
| 9722 | #, c-format |
| 9723 | msgid "Failed to find tree of %s." |
| 9724 | msgstr "Не удалось найти дерево у %s." |
| 9725 | |
| 9726 | #: builtin/reset.c:100 |
| 9727 | #, c-format |
| 9728 | msgid "HEAD is now at %s" |
| 9729 | msgstr "HEAD сейчас на %s" |
| 9730 | |
| 9731 | #: builtin/reset.c:183 |
| 9732 | #, c-format |
| 9733 | msgid "Cannot do a %s reset in the middle of a merge." |
Dimitriy Ryazantcev | 9af95af | 2015-04-03 16:30:14 +0300 | [diff] [blame] | 9734 | msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9735 | |
| 9736 | #: builtin/reset.c:276 |
| 9737 | msgid "be quiet, only report errors" |
| 9738 | msgstr "тихий режим, выводить только ошибки" |
| 9739 | |
| 9740 | #: builtin/reset.c:278 |
| 9741 | msgid "reset HEAD and index" |
| 9742 | msgstr "сбросить HEAD и индекс" |
| 9743 | |
| 9744 | #: builtin/reset.c:279 |
| 9745 | msgid "reset only HEAD" |
| 9746 | msgstr "сбросить только HEAD" |
| 9747 | |
| 9748 | #: builtin/reset.c:281 builtin/reset.c:283 |
| 9749 | msgid "reset HEAD, index and working tree" |
| 9750 | msgstr "сбросить HEAD, индекс и рабочий каталог" |
| 9751 | |
| 9752 | #: builtin/reset.c:285 |
| 9753 | msgid "reset HEAD but keep local changes" |
| 9754 | msgstr "сбросить HEAD, но оставить локальные изменения" |
| 9755 | |
| 9756 | #: builtin/reset.c:288 |
| 9757 | msgid "record only the fact that removed paths will be added later" |
| 9758 | msgstr "записать только факт того, что удаленные пути будут добавлены позже" |
| 9759 | |
| 9760 | #: builtin/reset.c:305 |
| 9761 | #, c-format |
| 9762 | msgid "Failed to resolve '%s' as a valid revision." |
| 9763 | msgstr "Не удалось распознать «%s» как действительную редакцию." |
| 9764 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9765 | #: builtin/reset.c:313 |
| 9766 | #, c-format |
| 9767 | msgid "Failed to resolve '%s' as a valid tree." |
| 9768 | msgstr "Не удалось распознать «%s» как действительное дерево." |
| 9769 | |
| 9770 | #: builtin/reset.c:322 |
| 9771 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
| 9772 | msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}" |
| 9773 | |
| 9774 | #: builtin/reset.c:331 |
| 9775 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
| 9776 | msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead." |
| 9777 | |
| 9778 | #: builtin/reset.c:333 |
| 9779 | #, c-format |
| 9780 | msgid "Cannot do %s reset with paths." |
Dimitriy Ryazantcev | 9af95af | 2015-04-03 16:30:14 +0300 | [diff] [blame] | 9781 | msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9782 | |
| 9783 | #: builtin/reset.c:343 |
| 9784 | #, c-format |
| 9785 | msgid "%s reset is not allowed in a bare repository" |
| 9786 | msgstr "сброс «%s» разрешен только с голым репозиторием" |
| 9787 | |
| 9788 | #: builtin/reset.c:347 |
| 9789 | msgid "-N can only be used with --mixed" |
| 9790 | msgstr "-N можно использовать вместе с --mixed" |
| 9791 | |
| 9792 | #: builtin/reset.c:364 |
| 9793 | msgid "Unstaged changes after reset:" |
| 9794 | msgstr "Непроиндексированные изменения после сброса:" |
| 9795 | |
| 9796 | #: builtin/reset.c:370 |
| 9797 | #, c-format |
| 9798 | msgid "Could not reset index file to revision '%s'." |
| 9799 | msgstr "Не удалось сбросить файл индекса на редакцию «%s»." |
| 9800 | |
| 9801 | #: builtin/reset.c:374 |
| 9802 | msgid "Could not write new index file." |
| 9803 | msgstr "Не удалось записать новый файл индекса." |
| 9804 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 9805 | #: builtin/rev-list.c:350 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 9806 | msgid "rev-list does not support display of notes" |
| 9807 | msgstr "rev-list не поддерживает отображение заметок" |
| 9808 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9809 | #: builtin/rev-parse.c:358 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9810 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
| 9811 | msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9812 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9813 | #: builtin/rev-parse.c:363 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9814 | msgid "keep the `--` passed as an arg" |
| 9815 | msgstr "передавать далее «--» как аргумент" |
| 9816 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9817 | #: builtin/rev-parse.c:365 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9818 | msgid "stop parsing after the first non-option argument" |
| 9819 | msgstr "остановить разбор после первого аргумента не являющегося опцией" |
| 9820 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9821 | #: builtin/rev-parse.c:368 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9822 | msgid "output in stuck long form" |
| 9823 | msgstr "выводить аргументы в длинном формате" |
| 9824 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 9825 | #: builtin/rev-parse.c:499 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9826 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9827 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9828 | " or: git rev-parse --sq-quote [<arg>...]\n" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9829 | " or: git rev-parse [<options>] [<arg>...]\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9830 | "\n" |
| 9831 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9832 | msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]\n or: git rev-parse --sq-quote [<аргумент>…]\n or: git rev-parse [<опции>] [<аргумент>…]\n\nЗапустите команду «git rev-parse --parseopt -h» для получения подробной информации о первом использовании." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9833 | |
| 9834 | #: builtin/revert.c:22 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9835 | msgid "git revert [<options>] <commit-ish>..." |
| 9836 | msgstr "git revert [<опции>] <указатель-коммита>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9837 | |
| 9838 | #: builtin/revert.c:23 |
| 9839 | msgid "git revert <subcommand>" |
| 9840 | msgstr "git revert <подкоманда>" |
| 9841 | |
| 9842 | #: builtin/revert.c:28 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9843 | msgid "git cherry-pick [<options>] <commit-ish>..." |
| 9844 | msgstr "git cherry-pick [<опции>] <указатель-коммита>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9845 | |
| 9846 | #: builtin/revert.c:29 |
| 9847 | msgid "git cherry-pick <subcommand>" |
| 9848 | msgstr "git cherry-pick <подкоманда>" |
| 9849 | |
| 9850 | #: builtin/revert.c:71 |
| 9851 | #, c-format |
| 9852 | msgid "%s: %s cannot be used with %s" |
| 9853 | msgstr "%s: %s нельзя использовать одновременно с %s" |
| 9854 | |
| 9855 | #: builtin/revert.c:80 |
| 9856 | msgid "end revert or cherry-pick sequence" |
| 9857 | msgstr "конец последовательности отбора лучшего или возврата коммита" |
| 9858 | |
| 9859 | #: builtin/revert.c:81 |
| 9860 | msgid "resume revert or cherry-pick sequence" |
| 9861 | msgstr "продолжить последовательность отбора лучшего или возврата коммита" |
| 9862 | |
| 9863 | #: builtin/revert.c:82 |
| 9864 | msgid "cancel revert or cherry-pick sequence" |
| 9865 | msgstr "отмена последовательности отбора лучшего или возврата коммита" |
| 9866 | |
| 9867 | #: builtin/revert.c:83 |
| 9868 | msgid "don't automatically commit" |
| 9869 | msgstr "не коммитить автоматически" |
| 9870 | |
| 9871 | #: builtin/revert.c:84 |
| 9872 | msgid "edit the commit message" |
| 9873 | msgstr "изменить сообщение коммита" |
| 9874 | |
| 9875 | #: builtin/revert.c:87 |
| 9876 | msgid "parent number" |
| 9877 | msgstr "номер родителя" |
| 9878 | |
| 9879 | #: builtin/revert.c:89 |
| 9880 | msgid "merge strategy" |
| 9881 | msgstr "стратегия слияния" |
| 9882 | |
| 9883 | #: builtin/revert.c:90 |
| 9884 | msgid "option" |
| 9885 | msgstr "опция" |
| 9886 | |
| 9887 | #: builtin/revert.c:91 |
| 9888 | msgid "option for merge strategy" |
| 9889 | msgstr "опция для стратегии слияния" |
| 9890 | |
| 9891 | #: builtin/revert.c:104 |
| 9892 | msgid "append commit name" |
| 9893 | msgstr "добавить имя коммита" |
| 9894 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9895 | #: builtin/revert.c:106 |
| 9896 | msgid "preserve initially empty commits" |
| 9897 | msgstr "сохранить изначально пустые коммиты" |
| 9898 | |
| 9899 | #: builtin/revert.c:107 |
| 9900 | msgid "allow commits with empty messages" |
| 9901 | msgstr "разрешить коммиты с пустыми сообщениями" |
| 9902 | |
| 9903 | #: builtin/revert.c:108 |
| 9904 | msgid "keep redundant, empty commits" |
| 9905 | msgstr "оставить избыточные, пустые коммиты" |
| 9906 | |
| 9907 | #: builtin/revert.c:112 |
| 9908 | msgid "program error" |
| 9909 | msgstr "ошибка в программе" |
| 9910 | |
| 9911 | #: builtin/revert.c:197 |
| 9912 | msgid "revert failed" |
| 9913 | msgstr "сбой возврата коммита" |
| 9914 | |
| 9915 | #: builtin/revert.c:212 |
| 9916 | msgid "cherry-pick failed" |
| 9917 | msgstr "сбой при отборе лучшего" |
| 9918 | |
| 9919 | #: builtin/rm.c:17 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 9920 | msgid "git rm [<options>] [--] <file>..." |
| 9921 | msgstr "git rm [<опции>] [--] <файл>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9922 | |
| 9923 | #: builtin/rm.c:65 |
| 9924 | msgid "" |
| 9925 | "the following submodule (or one of its nested submodules)\n" |
| 9926 | "uses a .git directory:" |
| 9927 | msgid_plural "" |
| 9928 | "the following submodules (or one of their nested submodules)\n" |
| 9929 | "use a .git directory:" |
| 9930 | msgstr[0] "следующий подмодуль (или один из вложенных подмодулей)\nиспользует каталог .git:" |
| 9931 | msgstr[1] "следующие подмодули (или один из вложенных подмодулей)\nиспользуют каталог .git:" |
| 9932 | msgstr[2] "следующие подмодули (или один из вложенных подмодулей)\nиспользуют каталог .git:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9933 | msgstr[3] "следующие подмодули (или один из вложенных подмодулей)\nиспользуют каталог .git:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9934 | |
| 9935 | #: builtin/rm.c:71 |
| 9936 | msgid "" |
| 9937 | "\n" |
| 9938 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
| 9939 | msgstr "\n(используйте «rm -rf», если вы действительно хотите удалить его, включая всю его историю)" |
| 9940 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9941 | #: builtin/rm.c:230 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9942 | msgid "" |
| 9943 | "the following file has staged content different from both the\n" |
| 9944 | "file and the HEAD:" |
| 9945 | msgid_plural "" |
| 9946 | "the following files have staged content different from both the\n" |
| 9947 | "file and the HEAD:" |
| 9948 | msgstr[0] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:" |
| 9949 | msgstr[1] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:" |
| 9950 | msgstr[2] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9951 | msgstr[3] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9952 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9953 | #: builtin/rm.c:235 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9954 | msgid "" |
| 9955 | "\n" |
| 9956 | "(use -f to force removal)" |
| 9957 | msgstr "\n(используйте опцию «-f» для принудительного удаления)" |
| 9958 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9959 | #: builtin/rm.c:239 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9960 | msgid "the following file has changes staged in the index:" |
| 9961 | msgid_plural "the following files have changes staged in the index:" |
| 9962 | msgstr[0] "следующие файлы содержат проиндексированные изменения в индексе:" |
| 9963 | msgstr[1] "следующие файлы содержат проиндексированные изменения в индексе:" |
| 9964 | msgstr[2] "следующие файлы содержат проиндексированные изменения в индексе:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9965 | msgstr[3] "следующие файлы содержат проиндексированные изменения в индексе:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9966 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9967 | #: builtin/rm.c:243 builtin/rm.c:254 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9968 | msgid "" |
| 9969 | "\n" |
| 9970 | "(use --cached to keep the file, or -f to force removal)" |
| 9971 | msgstr "\n(используйте опцию «--cached» для оставления файла, или «-f» для принудительного удаления)" |
| 9972 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9973 | #: builtin/rm.c:251 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9974 | msgid "the following file has local modifications:" |
| 9975 | msgid_plural "the following files have local modifications:" |
| 9976 | msgstr[0] "следующие файлы содержат локальные изменения:" |
| 9977 | msgstr[1] "следующие файлы содержат локальные изменения:" |
| 9978 | msgstr[2] "следующие файлы содержат локальные изменения:" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9979 | msgstr[3] "следующие файлы содержат локальные изменения:" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9980 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9981 | #: builtin/rm.c:269 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9982 | msgid "do not list removed files" |
| 9983 | msgstr "не выводить список удаленных файлов" |
| 9984 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9985 | #: builtin/rm.c:270 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9986 | msgid "only remove from the index" |
| 9987 | msgstr "удалить только из индекса" |
| 9988 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9989 | #: builtin/rm.c:271 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9990 | msgid "override the up-to-date check" |
| 9991 | msgstr "пропустить проверку актуальности" |
| 9992 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9993 | #: builtin/rm.c:272 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9994 | msgid "allow recursive removal" |
| 9995 | msgstr "разрешить рекурсивное удаление" |
| 9996 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 9997 | #: builtin/rm.c:274 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 9998 | msgid "exit with a zero status even if nothing matched" |
| 9999 | msgstr "выход с нулевым кодом возврата, даже если ничего не найдено" |
| 10000 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10001 | #: builtin/rm.c:317 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10002 | msgid "Please, stage your changes to .gitmodules or stash them to proceed" |
| 10003 | msgstr "Пожалуйста, проиндексируйте ваши изменения в .gitmodules или спрячьте их, чтобы продолжить" |
| 10004 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10005 | #: builtin/rm.c:335 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10006 | #, c-format |
| 10007 | msgid "not removing '%s' recursively without -r" |
| 10008 | msgstr "не удаляю рекурсивно «%s» без указания опции -r" |
| 10009 | |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10010 | #: builtin/rm.c:374 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10011 | #, c-format |
| 10012 | msgid "git rm: unable to remove %s" |
| 10013 | msgstr "git rm: не удалось удалить %s" |
| 10014 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10015 | #: builtin/send-pack.c:18 |
| 10016 | msgid "" |
| 10017 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n" |
| 10018 | " --all and explicit <ref> specification are mutually exclusive." |
| 10019 | msgstr "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<сервер>:]<каталог> [<ссылка>…]\n --all и явная спецификация <ссылки> взаимно исключающие." |
| 10020 | |
| 10021 | #: builtin/send-pack.c:160 |
| 10022 | msgid "remote name" |
| 10023 | msgstr "имя внешнего репозитория" |
| 10024 | |
| 10025 | #: builtin/send-pack.c:171 |
| 10026 | msgid "use stateless RPC protocol" |
| 10027 | msgstr "протокол без сохранения состояния для RPC" |
| 10028 | |
| 10029 | #: builtin/send-pack.c:172 |
| 10030 | msgid "read refs from stdin" |
| 10031 | msgstr "прочитать ссылки из стандартного ввода" |
| 10032 | |
| 10033 | #: builtin/send-pack.c:173 |
| 10034 | msgid "print status from remote helper" |
| 10035 | msgstr "вывести статус от скрипта внешнего сервера" |
| 10036 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10037 | #: builtin/shortlog.c:13 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10038 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
| 10039 | msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10040 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10041 | #: builtin/shortlog.c:242 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10042 | msgid "sort output according to the number of commits per author" |
| 10043 | msgstr "отсортировать вывод по количеству коммитов у автора" |
| 10044 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10045 | #: builtin/shortlog.c:244 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10046 | msgid "Suppress commit descriptions, only provides commit count" |
| 10047 | msgstr "Не выводить описания коммитов, а только их количество" |
| 10048 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10049 | #: builtin/shortlog.c:246 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10050 | msgid "Show the email address of each author" |
| 10051 | msgstr "Показать почту каждого из авторов" |
| 10052 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10053 | #: builtin/shortlog.c:247 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10054 | msgid "w[,i1[,i2]]" |
| 10055 | msgstr "w[,i1[,i2]]" |
| 10056 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10057 | #: builtin/shortlog.c:248 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10058 | msgid "Linewrap output" |
| 10059 | msgstr "Перенос строк на выводе" |
| 10060 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10061 | #: builtin/show-branch.c:10 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10062 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10063 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10064 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
| 10065 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" |
| 10066 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10067 | msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакция> | <шаблон>)…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10068 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10069 | #: builtin/show-branch.c:14 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10070 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
| 10071 | msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ссылка>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10072 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10073 | #: builtin/show-branch.c:640 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10074 | msgid "show remote-tracking and local branches" |
| 10075 | msgstr "показать список и отслеживаемых внешних и локальных веток" |
| 10076 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10077 | #: builtin/show-branch.c:642 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10078 | msgid "show remote-tracking branches" |
| 10079 | msgstr "показать список отслеживаемых внешних веток" |
| 10080 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10081 | #: builtin/show-branch.c:644 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10082 | msgid "color '*!+-' corresponding to the branch" |
| 10083 | msgstr "окрашивать «*!+-» в соответствии с веткой" |
| 10084 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10085 | #: builtin/show-branch.c:646 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10086 | msgid "show <n> more commits after the common ancestor" |
| 10087 | msgstr "показать <n> коммитов после общего предка" |
| 10088 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10089 | #: builtin/show-branch.c:648 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10090 | msgid "synonym to more=-1" |
| 10091 | msgstr "синоним для more=-1" |
| 10092 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10093 | #: builtin/show-branch.c:649 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10094 | msgid "suppress naming strings" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10095 | msgstr "не выводить именованные строки" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10096 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10097 | #: builtin/show-branch.c:651 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10098 | msgid "include the current branch" |
| 10099 | msgstr "включить в вывод текущую ветку" |
| 10100 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10101 | #: builtin/show-branch.c:653 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10102 | msgid "name commits with their object names" |
| 10103 | msgstr "именовать коммиты их именами объектов" |
| 10104 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10105 | #: builtin/show-branch.c:655 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10106 | msgid "show possible merge bases" |
| 10107 | msgstr "вывести возможные базы слияния" |
| 10108 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10109 | #: builtin/show-branch.c:657 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10110 | msgid "show refs unreachable from any other ref" |
| 10111 | msgstr "вывести ссылки, недоступные из любых других ссылок" |
| 10112 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10113 | #: builtin/show-branch.c:659 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10114 | msgid "show commits in topological order" |
| 10115 | msgstr "вывести коммиты в топологическом порядке" |
| 10116 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10117 | #: builtin/show-branch.c:662 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10118 | msgid "show only commits not on the first branch" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10119 | msgstr "вывести только коммиты, отсутствующие в первой ветке" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10120 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10121 | #: builtin/show-branch.c:664 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10122 | msgid "show merges reachable from only one tip" |
| 10123 | msgstr "вывести слияния, достижимые только из одной из верхушек" |
| 10124 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10125 | #: builtin/show-branch.c:666 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10126 | msgid "topologically sort, maintaining date order where possible" |
| 10127 | msgstr "топологическая сортировка, с сохранением порядка дат, если возможно" |
| 10128 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10129 | #: builtin/show-branch.c:669 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10130 | msgid "<n>[,<base>]" |
| 10131 | msgstr "<n>[,<база>]" |
| 10132 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10133 | #: builtin/show-branch.c:670 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10134 | msgid "show <n> most recent ref-log entries starting at base" |
| 10135 | msgstr "показать <n> последних записей в журнале ссылок, начиная с базы" |
| 10136 | |
| 10137 | #: builtin/show-ref.c:10 |
| 10138 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10139 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | " |
| 10140 | "--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" |
| 10141 | msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10142 | |
| 10143 | #: builtin/show-ref.c:11 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10144 | msgid "git show-ref --exclude-existing[=<pattern>]" |
| 10145 | msgstr "git show-ref --exclude-existing[=<шаблон>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10146 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10147 | #: builtin/show-ref.c:165 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10148 | msgid "only show tags (can be combined with heads)" |
| 10149 | msgstr "вывести только метки (можно использовать одновременно с --heads)" |
| 10150 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10151 | #: builtin/show-ref.c:166 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10152 | msgid "only show heads (can be combined with tags)" |
| 10153 | msgstr "вывести только головы (можно использовать одновременно с --tags)" |
| 10154 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10155 | #: builtin/show-ref.c:167 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10156 | msgid "stricter reference checking, requires exact ref path" |
| 10157 | msgstr "более строгая проверка ссылок, требует точный путь ссылки" |
| 10158 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10159 | #: builtin/show-ref.c:170 builtin/show-ref.c:172 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10160 | msgid "show the HEAD reference, even if it would be filtered out" |
| 10161 | msgstr "вывести ссылку HEAD, даже если она будет отфильтрована" |
| 10162 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10163 | #: builtin/show-ref.c:174 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10164 | msgid "dereference tags into object IDs" |
| 10165 | msgstr "разыменовать метки в идентификаторы объектов" |
| 10166 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10167 | #: builtin/show-ref.c:176 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10168 | msgid "only show SHA1 hash using <n> digits" |
| 10169 | msgstr "использовать <n> цифр для вывода SHA-1" |
| 10170 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10171 | #: builtin/show-ref.c:180 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10172 | msgid "do not print results to stdout (useful with --verify)" |
| 10173 | msgstr "не печатать результат на стандартный вывод (полезно с опцией «--verify»)" |
| 10174 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10175 | #: builtin/show-ref.c:182 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10176 | msgid "show refs from stdin that aren't in local repository" |
| 10177 | msgstr "вывести ссылки со стандартного ввода, которых нет в локальном репозитории" |
| 10178 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10179 | #: builtin/stripspace.c:17 |
| 10180 | msgid "git stripspace [-s | --strip-comments]" |
| 10181 | msgstr "git stripspace [-s | --strip-comments]" |
| 10182 | |
| 10183 | #: builtin/stripspace.c:18 |
| 10184 | msgid "git stripspace [-c | --comment-lines]" |
| 10185 | msgstr "git stripspace [-c | --comment-lines]" |
| 10186 | |
| 10187 | #: builtin/stripspace.c:35 |
| 10188 | msgid "skip and remove all lines starting with comment character" |
| 10189 | msgstr "пропустить и удалить все строки, начинающиеся с символа комметария" |
| 10190 | |
| 10191 | #: builtin/stripspace.c:38 |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10192 | msgid "prepend comment character and space to each line" |
| 10193 | msgstr "добавить перед каждой строкой символ комметария и пробел" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10194 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10195 | #: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10196 | msgid "alternative anchor for relative paths" |
| 10197 | msgstr "альтернативный символ для относительных путей" |
| 10198 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10199 | #: builtin/submodule--helper.c:78 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10200 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
| 10201 | msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]" |
| 10202 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10203 | #: builtin/submodule--helper.c:108 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10204 | msgid "git submodule--helper name <path>" |
| 10205 | msgstr "git submodule--helper name <путь>" |
| 10206 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10207 | #: builtin/submodule--helper.c:114 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10208 | #, c-format |
| 10209 | msgid "no submodule mapping found in .gitmodules for path '%s'" |
| 10210 | msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»" |
| 10211 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10212 | #: builtin/submodule--helper.c:164 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10213 | msgid "where the new submodule will be cloned to" |
| 10214 | msgstr "куда должен быть склонирован новый подмодуль" |
| 10215 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10216 | #: builtin/submodule--helper.c:167 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10217 | msgid "name of the new submodule" |
| 10218 | msgstr "имя нового подмодуля" |
| 10219 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10220 | #: builtin/submodule--helper.c:170 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10221 | msgid "url where to clone the submodule from" |
| 10222 | msgstr "url откуда должен был склонирован новый подмодуль" |
| 10223 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10224 | #: builtin/submodule--helper.c:176 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10225 | msgid "depth for shallow clones" |
| 10226 | msgstr "глубина для частичного клона" |
| 10227 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10228 | #: builtin/submodule--helper.c:182 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10229 | msgid "" |
| 10230 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " |
| 10231 | "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] " |
| 10232 | "[<path>...]" |
| 10233 | msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--url <url>][--depth <глубина>] [--] [<путь>…]" |
| 10234 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10235 | #: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 |
| 10236 | #: builtin/submodule--helper.c:210 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10237 | #, c-format |
| 10238 | msgid "could not create directory '%s'" |
| 10239 | msgstr "не удалось создать каталог «%s»" |
| 10240 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10241 | #: builtin/submodule--helper.c:198 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10242 | #, c-format |
| 10243 | msgid "clone of '%s' into submodule path '%s' failed" |
| 10244 | msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»" |
| 10245 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10246 | #: builtin/submodule--helper.c:221 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10247 | #, c-format |
| 10248 | msgid "cannot open file '%s'" |
| 10249 | msgstr "не удалось открыть файл «%s»" |
| 10250 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10251 | #: builtin/submodule--helper.c:226 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10252 | #, c-format |
| 10253 | msgid "could not close file %s" |
| 10254 | msgstr "не удалось закрыть файл %s" |
| 10255 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10256 | #: builtin/submodule--helper.c:241 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10257 | #, c-format |
| 10258 | msgid "could not get submodule directory for '%s'" |
| 10259 | msgstr "не удалось получить каталог для подмодуля «%s»" |
| 10260 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10261 | #: builtin/submodule--helper.c:267 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10262 | msgid "fatal: submodule--helper subcommand must be called with a subcommand" |
| 10263 | msgstr "критическая ошибка: подкоманда submodule--helper должна вызываться с указанием подкоманды" |
| 10264 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10265 | #: builtin/submodule--helper.c:274 |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10266 | #, c-format |
| 10267 | msgid "fatal: '%s' is not a valid submodule--helper subcommand" |
| 10268 | msgstr "критическая ошибка: «%s» не является подкомандой submodule--helper" |
| 10269 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10270 | #: builtin/symbolic-ref.c:7 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10271 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
| 10272 | msgstr "git symbolic-ref [<опции>] <имя> [<ссылка>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10273 | |
| 10274 | #: builtin/symbolic-ref.c:8 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10275 | msgid "git symbolic-ref -d [-q] <name>" |
| 10276 | msgstr "git symbolic-ref -d [-q] <имя>" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10277 | |
| 10278 | #: builtin/symbolic-ref.c:40 |
| 10279 | msgid "suppress error message for non-symbolic (detached) refs" |
| 10280 | msgstr "не выводить сообщения об ошибках для несимвольных (отсоединенных) ссылок" |
| 10281 | |
| 10282 | #: builtin/symbolic-ref.c:41 |
| 10283 | msgid "delete symbolic ref" |
| 10284 | msgstr "удалить символьные ссылки" |
| 10285 | |
| 10286 | #: builtin/symbolic-ref.c:42 |
| 10287 | msgid "shorten ref output" |
| 10288 | msgstr "укороченный вывод ссылок" |
| 10289 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10290 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10291 | msgid "reason" |
| 10292 | msgstr "причина" |
| 10293 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10294 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10295 | msgid "reason of the update" |
| 10296 | msgstr "причина обновления" |
| 10297 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10298 | #: builtin/tag.c:23 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10299 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10300 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
| 10301 | "[<head>]" |
| 10302 | msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <сообщение> | -F <файл>] <имя-метки> [<редакция>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10303 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10304 | #: builtin/tag.c:24 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10305 | msgid "git tag -d <tagname>..." |
| 10306 | msgstr "git tag -d <имя-метки>…" |
| 10307 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10308 | #: builtin/tag.c:25 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10309 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10310 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10311 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
| 10312 | msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10313 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10314 | #: builtin/tag.c:27 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10315 | msgid "git tag -v <tagname>..." |
| 10316 | msgstr "git tag -v <имя-метки>…" |
| 10317 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10318 | #: builtin/tag.c:80 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10319 | #, c-format |
| 10320 | msgid "tag name too long: %.*s..." |
| 10321 | msgstr "слишком длинное имя метки: %.*s…" |
| 10322 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10323 | #: builtin/tag.c:85 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10324 | #, c-format |
| 10325 | msgid "tag '%s' not found." |
| 10326 | msgstr "метка «%s» не найдена." |
| 10327 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10328 | #: builtin/tag.c:100 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10329 | #, c-format |
| 10330 | msgid "Deleted tag '%s' (was %s)\n" |
| 10331 | msgstr "Метка «%s» удалена (была %s)\n" |
| 10332 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10333 | #: builtin/tag.c:112 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10334 | #, c-format |
| 10335 | msgid "could not verify the tag '%s'" |
| 10336 | msgstr "не удалось проверить метку «%s»" |
| 10337 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10338 | #: builtin/tag.c:122 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10339 | #, c-format |
| 10340 | msgid "" |
| 10341 | "\n" |
| 10342 | "Write a message for tag:\n" |
| 10343 | " %s\n" |
| 10344 | "Lines starting with '%c' will be ignored.\n" |
| 10345 | msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n" |
| 10346 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10347 | #: builtin/tag.c:126 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10348 | #, c-format |
| 10349 | msgid "" |
| 10350 | "\n" |
| 10351 | "Write a message for tag:\n" |
| 10352 | " %s\n" |
| 10353 | "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" |
| 10354 | msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n" |
| 10355 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10356 | #: builtin/tag.c:199 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10357 | msgid "unable to sign the tag" |
| 10358 | msgstr "не удалось подписать метку" |
| 10359 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10360 | #: builtin/tag.c:201 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10361 | msgid "unable to write tag file" |
| 10362 | msgstr "не удалось записать файл метки" |
| 10363 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10364 | #: builtin/tag.c:226 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10365 | msgid "bad object type." |
| 10366 | msgstr "неправильный тип объекта" |
| 10367 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10368 | #: builtin/tag.c:239 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10369 | msgid "tag header too big." |
| 10370 | msgstr "заголовок метки слишком большой." |
| 10371 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10372 | #: builtin/tag.c:275 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10373 | msgid "no tag message?" |
| 10374 | msgstr "нет описания метки?" |
| 10375 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10376 | #: builtin/tag.c:281 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10377 | #, c-format |
| 10378 | msgid "The tag message has been left in %s\n" |
| 10379 | msgstr "Сообщение метки было оставлено в %s\n" |
| 10380 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10381 | #: builtin/tag.c:339 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10382 | msgid "list tag names" |
| 10383 | msgstr "список названий меток" |
| 10384 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10385 | #: builtin/tag.c:341 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10386 | msgid "print <n> lines of each tag message" |
| 10387 | msgstr "печатать <n> строк описания от каждой метки" |
| 10388 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10389 | #: builtin/tag.c:343 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10390 | msgid "delete tags" |
| 10391 | msgstr "удалить метки" |
| 10392 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10393 | #: builtin/tag.c:344 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10394 | msgid "verify tags" |
| 10395 | msgstr "проверить метки" |
| 10396 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10397 | #: builtin/tag.c:346 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10398 | msgid "Tag creation options" |
| 10399 | msgstr "Настройки создания метки" |
| 10400 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10401 | #: builtin/tag.c:348 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10402 | msgid "annotated tag, needs a message" |
| 10403 | msgstr "для аннотированной метки нужно сообщение" |
| 10404 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10405 | #: builtin/tag.c:350 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10406 | msgid "tag message" |
| 10407 | msgstr "описание метки" |
| 10408 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10409 | #: builtin/tag.c:352 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10410 | msgid "annotated and GPG-signed tag" |
| 10411 | msgstr "аннотированная и подписанная с помощью GPG метка" |
| 10412 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10413 | #: builtin/tag.c:356 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10414 | msgid "use another key to sign the tag" |
| 10415 | msgstr "использовать другой ключ для подписания метки" |
| 10416 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10417 | #: builtin/tag.c:357 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10418 | msgid "replace the tag if exists" |
| 10419 | msgstr "замена метки, если она существует" |
| 10420 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10421 | #: builtin/tag.c:358 builtin/update-ref.c:368 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10422 | msgid "create a reflog" |
| 10423 | msgstr "создать журнал ссылок" |
| 10424 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10425 | #: builtin/tag.c:360 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10426 | msgid "Tag listing options" |
| 10427 | msgstr "Настройки вывода списка меток" |
| 10428 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10429 | #: builtin/tag.c:361 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10430 | msgid "show tag list in columns" |
| 10431 | msgstr "показать список меток по столбцам" |
| 10432 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10433 | #: builtin/tag.c:362 builtin/tag.c:363 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10434 | msgid "print only tags that contain the commit" |
| 10435 | msgstr "вывод только меток, которые содержат коммит" |
| 10436 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10437 | #: builtin/tag.c:364 |
| 10438 | msgid "print only tags that are merged" |
| 10439 | msgstr "вывод только слитых меток" |
| 10440 | |
| 10441 | #: builtin/tag.c:365 |
| 10442 | msgid "print only tags that are not merged" |
| 10443 | msgstr "вывод только не слитых меток" |
| 10444 | |
| 10445 | #: builtin/tag.c:370 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10446 | msgid "print only tags of the object" |
| 10447 | msgstr "вывод только меток, определенного объекта" |
| 10448 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10449 | #: builtin/tag.c:399 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10450 | msgid "--column and -n are incompatible" |
| 10451 | msgstr "--column и -n нельзя использовать одновременно" |
| 10452 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10453 | #: builtin/tag.c:419 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10454 | msgid "-n option is only allowed with -l." |
| 10455 | msgstr "опцию -n можно использовать только вместе с -l." |
| 10456 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10457 | #: builtin/tag.c:421 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10458 | msgid "--contains option is only allowed with -l." |
| 10459 | msgstr "опцию --contains можно использовать только вместе с -l." |
| 10460 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10461 | #: builtin/tag.c:423 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10462 | msgid "--points-at option is only allowed with -l." |
| 10463 | msgstr "опцию --points-at можно использовать только вместе с -l." |
| 10464 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10465 | #: builtin/tag.c:425 |
| 10466 | msgid "--merged and --no-merged option are only allowed with -l" |
| 10467 | msgstr "опции --merged и --no-merged можно использовать только вместе с -l." |
| 10468 | |
| 10469 | #: builtin/tag.c:433 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10470 | msgid "only one -F or -m option is allowed." |
| 10471 | msgstr "-F и -m нельзя использовать одновременно." |
| 10472 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10473 | #: builtin/tag.c:453 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10474 | msgid "too many params" |
| 10475 | msgstr "передано слишком много параметров" |
| 10476 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10477 | #: builtin/tag.c:459 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10478 | #, c-format |
| 10479 | msgid "'%s' is not a valid tag name." |
| 10480 | msgstr "«%s» не является допустимым именем метки." |
| 10481 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10482 | #: builtin/tag.c:464 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10483 | #, c-format |
| 10484 | msgid "tag '%s' already exists" |
| 10485 | msgstr "метка «%s» уже существует" |
| 10486 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10487 | #: builtin/tag.c:489 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10488 | #, c-format |
| 10489 | msgid "Updated tag '%s' (was %s)\n" |
| 10490 | msgstr "Метка «%s» обновлена (была %s)\n" |
| 10491 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10492 | #: builtin/unpack-objects.c:490 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10493 | msgid "Unpacking objects" |
| 10494 | msgstr "Распаковка объектов" |
| 10495 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10496 | #: builtin/update-index.c:79 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10497 | #, c-format |
| 10498 | msgid "failed to create directory %s" |
| 10499 | msgstr "не удалось создать каталог %s" |
| 10500 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10501 | #: builtin/update-index.c:85 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10502 | #, c-format |
| 10503 | msgid "failed to stat %s" |
| 10504 | msgstr "не удалось выполнить stat %s" |
| 10505 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10506 | #: builtin/update-index.c:95 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10507 | #, c-format |
| 10508 | msgid "failed to create file %s" |
| 10509 | msgstr "не удалось создать файл %s" |
| 10510 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10511 | #: builtin/update-index.c:103 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10512 | #, c-format |
| 10513 | msgid "failed to delete file %s" |
| 10514 | msgstr "не удалось удалить файл %s" |
| 10515 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10516 | #: builtin/update-index.c:110 builtin/update-index.c:212 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10517 | #, c-format |
| 10518 | msgid "failed to delete directory %s" |
| 10519 | msgstr "не удалось удалить каталог %s" |
| 10520 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10521 | #: builtin/update-index.c:133 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10522 | #, c-format |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10523 | msgid "Testing mtime in '%s' " |
| 10524 | msgstr "Проверка mtime в «%s» " |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10525 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10526 | #: builtin/update-index.c:145 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10527 | msgid "directory stat info does not change after adding a new file" |
| 10528 | msgstr "информация статистики каталога не изменяется после добавления нового файла" |
| 10529 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10530 | #: builtin/update-index.c:158 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10531 | msgid "directory stat info does not change after adding a new directory" |
| 10532 | msgstr "информация статистики каталога не изменяется после добавления нового каталога" |
| 10533 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10534 | #: builtin/update-index.c:171 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10535 | msgid "directory stat info changes after updating a file" |
| 10536 | msgstr "информация статистики каталога изменяется после добавления нового файла" |
| 10537 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10538 | #: builtin/update-index.c:182 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10539 | msgid "directory stat info changes after adding a file inside subdirectory" |
| 10540 | msgstr "информация статистики каталога изменяется после добавления нового файла внутри подкаталога" |
| 10541 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10542 | #: builtin/update-index.c:193 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10543 | msgid "directory stat info does not change after deleting a file" |
| 10544 | msgstr "информация статистики каталога не изменяется после удаления файла" |
| 10545 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10546 | #: builtin/update-index.c:206 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10547 | msgid "directory stat info does not change after deleting a directory" |
| 10548 | msgstr "информация статистики каталога не изменяется после удаления каталога" |
| 10549 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10550 | #: builtin/update-index.c:213 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10551 | msgid " OK" |
| 10552 | msgstr " OK" |
| 10553 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10554 | #: builtin/update-index.c:575 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10555 | msgid "git update-index [<options>] [--] [<file>...]" |
| 10556 | msgstr "git update-index [<опции>] [--] [<файл>…]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10557 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10558 | #: builtin/update-index.c:930 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10559 | msgid "continue refresh even when index needs update" |
| 10560 | msgstr "продолжить обновление, даже если индекс требует обновления" |
| 10561 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10562 | #: builtin/update-index.c:933 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10563 | msgid "refresh: ignore submodules" |
| 10564 | msgstr "обновление: игнорировать подмодули" |
| 10565 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10566 | #: builtin/update-index.c:936 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10567 | msgid "do not ignore new files" |
| 10568 | msgstr "не игнорировать новые файлы" |
| 10569 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10570 | #: builtin/update-index.c:938 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10571 | msgid "let files replace directories and vice-versa" |
| 10572 | msgstr "разрешить файлам заменять каталоги и наоборот" |
| 10573 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10574 | #: builtin/update-index.c:940 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10575 | msgid "notice files missing from worktree" |
| 10576 | msgstr "замечать файлы отсутствующие в рабочем каталоге" |
| 10577 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10578 | #: builtin/update-index.c:942 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10579 | msgid "refresh even if index contains unmerged entries" |
| 10580 | msgstr "обновить, даже если в индексе имеются не слитые записи" |
| 10581 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10582 | #: builtin/update-index.c:945 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10583 | msgid "refresh stat information" |
| 10584 | msgstr "обновить информацию о статусе файлов" |
| 10585 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10586 | #: builtin/update-index.c:949 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10587 | msgid "like --refresh, but ignore assume-unchanged setting" |
| 10588 | msgstr "как --refresh, но игнорировать настройку assume-unchanged" |
| 10589 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10590 | #: builtin/update-index.c:953 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10591 | msgid "<mode>,<object>,<path>" |
| 10592 | msgstr "<режим доступа>,<объект>,<путь>" |
| 10593 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10594 | #: builtin/update-index.c:954 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10595 | msgid "add the specified entry to the index" |
| 10596 | msgstr "добавить указанную запись в индекс" |
| 10597 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10598 | #: builtin/update-index.c:958 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10599 | msgid "(+/-)x" |
| 10600 | msgstr "(+/-)x" |
| 10601 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10602 | #: builtin/update-index.c:959 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10603 | msgid "override the executable bit of the listed files" |
| 10604 | msgstr "переопределить бит выполнения на указанных файлах" |
| 10605 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10606 | #: builtin/update-index.c:963 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10607 | msgid "mark files as \"not changing\"" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10608 | msgstr "пометить файлы как «не измененные»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10609 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10610 | #: builtin/update-index.c:966 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10611 | msgid "clear assumed-unchanged bit" |
| 10612 | msgstr "убрать пометку assumed-unchanged" |
| 10613 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10614 | #: builtin/update-index.c:969 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10615 | msgid "mark files as \"index-only\"" |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10616 | msgstr "пометить файлы как «только в индексе»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10617 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10618 | #: builtin/update-index.c:972 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10619 | msgid "clear skip-worktree bit" |
| 10620 | msgstr "убрать пометку skip-worktree" |
| 10621 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10622 | #: builtin/update-index.c:975 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10623 | msgid "add to index only; do not add content to object database" |
| 10624 | msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов" |
| 10625 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10626 | #: builtin/update-index.c:977 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10627 | msgid "remove named paths even if present in worktree" |
| 10628 | msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге" |
| 10629 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10630 | #: builtin/update-index.c:979 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10631 | msgid "with --stdin: input lines are terminated by null bytes" |
| 10632 | msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом" |
| 10633 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10634 | #: builtin/update-index.c:981 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10635 | msgid "read list of paths to be updated from standard input" |
| 10636 | msgstr "прочитать список обновляемых путей из стандартного ввода" |
| 10637 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10638 | #: builtin/update-index.c:985 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10639 | msgid "add entries from standard input to the index" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10640 | msgstr "добавить записи из стандартного ввода в индекс" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10641 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10642 | #: builtin/update-index.c:989 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10643 | msgid "repopulate stages #2 and #3 for the listed paths" |
| 10644 | msgstr "заново заполнить индекс #2 и #3 для указанных путей" |
| 10645 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10646 | #: builtin/update-index.c:993 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10647 | msgid "only update entries that differ from HEAD" |
| 10648 | msgstr "обновить только записи, которые отличаются от HEAD" |
| 10649 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10650 | #: builtin/update-index.c:997 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10651 | msgid "ignore files missing from worktree" |
| 10652 | msgstr "игнорировать файлы, отсутствующие в рабочем каталоге" |
| 10653 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10654 | #: builtin/update-index.c:1000 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10655 | msgid "report actions to standard output" |
| 10656 | msgstr "вывести выполняемые действия на стандартный вывод" |
| 10657 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10658 | #: builtin/update-index.c:1002 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10659 | msgid "(for porcelains) forget saved unresolved conflicts" |
| 10660 | msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты" |
| 10661 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10662 | #: builtin/update-index.c:1006 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10663 | msgid "write index in this format" |
| 10664 | msgstr "записать индекс в указанном формате" |
| 10665 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10666 | #: builtin/update-index.c:1008 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10667 | msgid "enable or disable split index" |
| 10668 | msgstr "разрешить или запретить раздельный индекс" |
| 10669 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10670 | #: builtin/update-index.c:1010 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10671 | msgid "enable/disable untracked cache" |
| 10672 | msgstr "включить/отключить кэш неотслеживаемых файлов" |
| 10673 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10674 | #: builtin/update-index.c:1012 |
| 10675 | msgid "test if the filesystem supports untracked cache" |
| 10676 | msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов" |
| 10677 | |
| 10678 | #: builtin/update-index.c:1014 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10679 | msgid "enable untracked cache without testing the filesystem" |
| 10680 | msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы" |
| 10681 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10682 | #: builtin/update-index.c:1134 |
| 10683 | msgid "Untracked cache disabled" |
| 10684 | msgstr "Кэш неотслеживаемых файлов отключен" |
| 10685 | |
| 10686 | #: builtin/update-index.c:1146 |
| 10687 | #, c-format |
| 10688 | msgid "Untracked cache enabled for '%s'" |
| 10689 | msgstr "Кэш неотслеживаемых файлов включен для «%s»" |
| 10690 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10691 | #: builtin/update-ref.c:9 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10692 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
| 10693 | msgstr "git update-ref [<опции>] -d <имя-ссылки> [<старое-значение>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10694 | |
| 10695 | #: builtin/update-ref.c:10 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10696 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
| 10697 | msgstr "git update-ref [<опции>] <имя-ссылки> <новое-значение> [<старое-значение>]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10698 | |
| 10699 | #: builtin/update-ref.c:11 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10700 | msgid "git update-ref [<options>] --stdin [-z]" |
| 10701 | msgstr "git update-ref [<опции>] --stdin [-z]" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10702 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10703 | #: builtin/update-ref.c:363 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10704 | msgid "delete the reference" |
| 10705 | msgstr "удалить ссылку" |
| 10706 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10707 | #: builtin/update-ref.c:365 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10708 | msgid "update <refname> not the one it points to" |
| 10709 | msgstr "обновить <имя-ссылки> а не то, на что она указывает" |
| 10710 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10711 | #: builtin/update-ref.c:366 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10712 | msgid "stdin has NUL-terminated arguments" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10713 | msgstr "ввод отделённый НУЛЕВЫМИ символами" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10714 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10715 | #: builtin/update-ref.c:367 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10716 | msgid "read updates from stdin" |
| 10717 | msgstr "прочитать обновления из стандартного ввода" |
| 10718 | |
| 10719 | #: builtin/update-server-info.c:6 |
| 10720 | msgid "git update-server-info [--force]" |
| 10721 | msgstr "git update-server-info [--force]" |
| 10722 | |
| 10723 | #: builtin/update-server-info.c:14 |
| 10724 | msgid "update the info files from scratch" |
| 10725 | msgstr "обновить информацию о серверах с нуля" |
| 10726 | |
| 10727 | #: builtin/verify-commit.c:17 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10728 | msgid "git verify-commit [-v | --verbose] <commit>..." |
| 10729 | msgstr "git verify-commit [-v | --verbose] <коммит>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10730 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10731 | #: builtin/verify-commit.c:72 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10732 | msgid "print commit contents" |
| 10733 | msgstr "вывести содержимое коммита" |
| 10734 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10735 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:84 |
| 10736 | msgid "print raw gpg status output" |
| 10737 | msgstr "выводить сырой вывод статуса от gpg" |
| 10738 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10739 | #: builtin/verify-pack.c:54 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10740 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
| 10741 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10742 | |
| 10743 | #: builtin/verify-pack.c:64 |
| 10744 | msgid "verbose" |
| 10745 | msgstr "быть многословнее" |
| 10746 | |
| 10747 | #: builtin/verify-pack.c:66 |
| 10748 | msgid "show statistics only" |
| 10749 | msgstr "вывести только статистику" |
| 10750 | |
| 10751 | #: builtin/verify-tag.c:17 |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 10752 | msgid "git verify-tag [-v | --verbose] <tag>..." |
| 10753 | msgstr "git verify-tag [-v | --verbose] <метка>…" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10754 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10755 | #: builtin/verify-tag.c:83 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10756 | msgid "print tag contents" |
| 10757 | msgstr "вывести содержимое метки" |
| 10758 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10759 | #: builtin/worktree.c:15 |
| 10760 | msgid "git worktree add [<options>] <path> [<branch>]" |
| 10761 | msgstr "git worktree add [<опции>] <путь> [<ветка>]" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10762 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10763 | #: builtin/worktree.c:16 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10764 | msgid "git worktree prune [<options>]" |
| 10765 | msgstr "git worktree prune [<опции>]" |
| 10766 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10767 | #: builtin/worktree.c:17 |
| 10768 | msgid "git worktree list [<options>]" |
| 10769 | msgstr "git worktree list [<опции>]" |
| 10770 | |
| 10771 | #: builtin/worktree.c:39 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10772 | #, c-format |
| 10773 | msgid "Removing worktrees/%s: not a valid directory" |
| 10774 | msgstr "Удаление рабочих каталогов/%s: не является каталогом" |
| 10775 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10776 | #: builtin/worktree.c:45 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10777 | #, c-format |
| 10778 | msgid "Removing worktrees/%s: gitdir file does not exist" |
| 10779 | msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует" |
| 10780 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10781 | #: builtin/worktree.c:50 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10782 | #, c-format |
| 10783 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" |
| 10784 | msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)" |
| 10785 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10786 | #: builtin/worktree.c:61 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10787 | #, c-format |
| 10788 | msgid "Removing worktrees/%s: invalid gitdir file" |
| 10789 | msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir" |
| 10790 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10791 | #: builtin/worktree.c:77 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10792 | #, c-format |
| 10793 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" |
| 10794 | msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение" |
| 10795 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10796 | #: builtin/worktree.c:112 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10797 | #, c-format |
| 10798 | msgid "failed to remove: %s" |
| 10799 | msgstr "не удалось удалить: %s" |
| 10800 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10801 | #: builtin/worktree.c:201 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10802 | #, c-format |
| 10803 | msgid "'%s' already exists" |
| 10804 | msgstr "«%s» уже существует" |
| 10805 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10806 | #: builtin/worktree.c:233 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10807 | #, c-format |
| 10808 | msgid "could not create directory of '%s'" |
| 10809 | msgstr "не удалось создать каталог «%s»" |
| 10810 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10811 | #: builtin/worktree.c:269 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10812 | #, c-format |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10813 | msgid "Preparing %s (identifier %s)" |
| 10814 | msgstr "Подготовка %s (идентификатор %s)" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10815 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10816 | #: builtin/worktree.c:317 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10817 | msgid "checkout <branch> even if already checked out in other worktree" |
| 10818 | msgstr "перейти на <ветка> даже если она уже активна в другом рабочесм каталоге" |
| 10819 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10820 | #: builtin/worktree.c:319 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10821 | msgid "create a new branch" |
| 10822 | msgstr "создать новую ветку" |
| 10823 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10824 | #: builtin/worktree.c:321 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10825 | msgid "create or reset a branch" |
| 10826 | msgstr "создать или перейти на ветку" |
| 10827 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10828 | #: builtin/worktree.c:322 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10829 | msgid "detach HEAD at named commit" |
| 10830 | msgstr "отсоединить HEAD на указанном коммите" |
| 10831 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10832 | #: builtin/worktree.c:329 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10833 | msgid "-b, -B, and --detach are mutually exclusive" |
| 10834 | msgstr "-b, -B и --detach нельзя использовать одновременно" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10835 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10836 | #: builtin/write-tree.c:13 |
| 10837 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
| 10838 | msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]" |
| 10839 | |
| 10840 | #: builtin/write-tree.c:26 |
| 10841 | msgid "<prefix>/" |
| 10842 | msgstr "<префикс>/" |
| 10843 | |
| 10844 | #: builtin/write-tree.c:27 |
| 10845 | msgid "write tree object for a subdirectory <prefix>" |
| 10846 | msgstr "вывести объект дерева для подкаталога с <префикс>" |
| 10847 | |
| 10848 | #: builtin/write-tree.c:30 |
| 10849 | msgid "only useful for debugging" |
| 10850 | msgstr "используется только при отладке" |
| 10851 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10852 | #: credential-cache--daemon.c:262 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10853 | msgid "print debugging messages to stderr" |
| 10854 | msgstr "вывод отладочных сообщений на stderr" |
| 10855 | |
| 10856 | #: git.c:14 |
| 10857 | msgid "" |
| 10858 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
| 10859 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
| 10860 | "to read about a specific subcommand or concept." |
| 10861 | msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме." |
| 10862 | |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 10863 | #: http.c:321 |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10864 | msgid "Public key pinning not supported with cURL < 7.44.0" |
| 10865 | msgstr "Public key pinning не поддерживается с cURL < 7.44.0" |
| 10866 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10867 | #: common-cmds.h:9 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10868 | msgid "start a working area (see also: git help tutorial)" |
| 10869 | msgstr "создать рабочую область (смотрите также: git help tutorial)" |
| 10870 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10871 | #: common-cmds.h:10 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10872 | msgid "work on the current change (see also: git help everyday)" |
| 10873 | msgstr "работа с текущими изменениями (смотрите также: git help everyday)" |
| 10874 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10875 | #: common-cmds.h:11 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10876 | msgid "examine the history and state (see also: git help revisions)" |
| 10877 | msgstr "просмотр истории и текущего состояния (смотрите также: git help revisions)" |
| 10878 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10879 | #: common-cmds.h:12 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10880 | msgid "grow, mark and tweak your common history" |
| 10881 | msgstr "выращивание, отметка и настройка вашей общей истории" |
| 10882 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10883 | #: common-cmds.h:13 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10884 | msgid "collaborate (see also: git help workflows)" |
| 10885 | msgstr "совместная работа (смотрите также: git help workflows)" |
| 10886 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10887 | #: common-cmds.h:17 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10888 | msgid "Add file contents to the index" |
| 10889 | msgstr "Добавление содержимого файла в индекс" |
| 10890 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10891 | #: common-cmds.h:18 |
| 10892 | msgid "Use binary search to find the commit that introduced a bug" |
| 10893 | msgstr "Использовать двоичный поиск изменения, которое вносит ошибку" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10894 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10895 | #: common-cmds.h:19 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10896 | msgid "List, create, or delete branches" |
| 10897 | msgstr "Вывод списка, создание или удаление веток" |
| 10898 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10899 | #: common-cmds.h:20 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 10900 | msgid "Switch branches or restore working tree files" |
| 10901 | msgstr "Переключение веток или восстановление файлов в рабочем каталоге" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10902 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10903 | #: common-cmds.h:21 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10904 | msgid "Clone a repository into a new directory" |
| 10905 | msgstr "Клонирование репозитория в новый каталог" |
| 10906 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10907 | #: common-cmds.h:22 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10908 | msgid "Record changes to the repository" |
| 10909 | msgstr "Запись изменений в репозиторий" |
| 10910 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10911 | #: common-cmds.h:23 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10912 | msgid "Show changes between commits, commit and working tree, etc" |
| 10913 | msgstr "Вывод разницы между коммитами, коммитом и рабочим каталогом и т.д." |
| 10914 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10915 | #: common-cmds.h:24 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10916 | msgid "Download objects and refs from another repository" |
| 10917 | msgstr "Загрузка объектов и ссылок из другого репозитория" |
| 10918 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10919 | #: common-cmds.h:25 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10920 | msgid "Print lines matching a pattern" |
| 10921 | msgstr "Вывод строк, соответствующих шаблону" |
| 10922 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10923 | #: common-cmds.h:26 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10924 | msgid "Create an empty Git repository or reinitialize an existing one" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 10925 | msgstr "Создание пустого репозитория Git или переинициализация существующего" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10926 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10927 | #: common-cmds.h:27 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10928 | msgid "Show commit logs" |
| 10929 | msgstr "Вывод истории коммитов" |
| 10930 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10931 | #: common-cmds.h:28 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10932 | msgid "Join two or more development histories together" |
| 10933 | msgstr "Объединение одной или нескольких историй разработки вместе" |
| 10934 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10935 | #: common-cmds.h:29 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10936 | msgid "Move or rename a file, a directory, or a symlink" |
| 10937 | msgstr "Перемещение или переименование файла, каталога или символьной ссылки" |
| 10938 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10939 | #: common-cmds.h:30 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10940 | msgid "Fetch from and integrate with another repository or a local branch" |
| 10941 | msgstr "Извлечение изменений и объединение с другим репозиторием или локальной веткой" |
| 10942 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10943 | #: common-cmds.h:31 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10944 | msgid "Update remote refs along with associated objects" |
| 10945 | msgstr "Обновление внешних ссылок и связанных объектов" |
| 10946 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10947 | #: common-cmds.h:32 |
Dimitriy Ryazantcev | f3aeef1 | 2016-03-13 02:07:09 +0200 | [diff] [blame] | 10948 | msgid "Reapply commits on top of another base tip" |
| 10949 | msgstr "Повторно применить коммиты над верхушкой другой ветки" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10950 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10951 | #: common-cmds.h:33 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10952 | msgid "Reset current HEAD to the specified state" |
| 10953 | msgstr "Сброс текущего состояния HEAD на указанное состояние" |
| 10954 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10955 | #: common-cmds.h:34 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10956 | msgid "Remove files from the working tree and from the index" |
| 10957 | msgstr "Удаление файлов из рабочего каталога и индекса" |
| 10958 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10959 | #: common-cmds.h:35 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10960 | msgid "Show various types of objects" |
| 10961 | msgstr "Вывод различных типов объектов" |
| 10962 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10963 | #: common-cmds.h:36 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10964 | msgid "Show the working tree status" |
| 10965 | msgstr "Вывод состояния рабочего каталога" |
| 10966 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10967 | #: common-cmds.h:37 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10968 | msgid "Create, list, delete or verify a tag object signed with GPG" |
| 10969 | msgstr "Создание, вывод списка, удаление или проверка метки, подписанной с помощью GPG" |
| 10970 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10971 | #: parse-options.h:145 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10972 | msgid "expiry-date" |
| 10973 | msgstr "дата-окончания" |
| 10974 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 10975 | #: parse-options.h:160 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10976 | msgid "no-op (backward compatibility)" |
| 10977 | msgstr "ничего не делает (оставлено для обратной совместимости)" |
| 10978 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10979 | #: parse-options.h:237 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10980 | msgid "be more verbose" |
| 10981 | msgstr "быть многословнее" |
| 10982 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10983 | #: parse-options.h:239 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10984 | msgid "be more quiet" |
| 10985 | msgstr "тихий режим" |
| 10986 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10987 | #: parse-options.h:245 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10988 | msgid "use <n> digits to display SHA-1s" |
| 10989 | msgstr "использовать <n> цифр для вывода SHA-1" |
| 10990 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10991 | #: rerere.h:38 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10992 | msgid "update the index with reused conflict resolution if possible" |
| 10993 | msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно" |
| 10994 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 10995 | #: git-bisect.sh:55 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 10996 | msgid "You need to start by \"git bisect start\"" |
| 10997 | msgstr "Вам нужно начать с помощью «git bisect start»" |
| 10998 | |
| 10999 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 11000 | #. translation. The program will only accept English input |
| 11001 | #. at this point. |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11002 | #: git-bisect.sh:61 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11003 | msgid "Do you want me to do it for you [Y/n]? " |
| 11004 | msgstr "Вы уверены, что хотите, чтобы я сделал это [Y - да/n - нет]? " |
| 11005 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11006 | #: git-bisect.sh:122 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11007 | #, sh-format |
| 11008 | msgid "unrecognised option: '$arg'" |
| 11009 | msgstr "неопознанная опция: «$arg»" |
| 11010 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11011 | #: git-bisect.sh:126 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11012 | #, sh-format |
| 11013 | msgid "'$arg' does not appear to be a valid revision" |
| 11014 | msgstr "«$arg» не похоже на действительную редакцию" |
| 11015 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11016 | #: git-bisect.sh:155 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11017 | msgid "Bad HEAD - I need a HEAD" |
| 11018 | msgstr "Плохой указатель HEAD — Необходим указатель HEAD" |
| 11019 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11020 | #: git-bisect.sh:168 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11021 | #, sh-format |
| 11022 | msgid "" |
Dimitriy Ryazantcev | 76f92c1 | 2015-03-27 12:54:35 +0200 | [diff] [blame] | 11023 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11024 | msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <существующая-ветка>»." |
| 11025 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11026 | #: git-bisect.sh:178 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11027 | msgid "won't bisect on cg-seek'ed tree" |
| 11028 | msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek" |
| 11029 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11030 | #: git-bisect.sh:182 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11031 | msgid "Bad HEAD - strange symbolic ref" |
| 11032 | msgstr "Плохой указатель HEAD — странная символьная ссылка" |
| 11033 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11034 | #: git-bisect.sh:234 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11035 | #, sh-format |
| 11036 | msgid "Bad bisect_write argument: $state" |
| 11037 | msgstr "Плохой аргумент bisect_write: $state" |
| 11038 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11039 | #: git-bisect.sh:263 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11040 | #, sh-format |
| 11041 | msgid "Bad rev input: $arg" |
| 11042 | msgstr "Плохой ввод номера редакции: $arg" |
| 11043 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11044 | #: git-bisect.sh:278 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11045 | msgid "Please call 'bisect_state' with at least one argument." |
| 11046 | msgstr "Пожалуйста, вызывайте «bisect_state» как минимум с одним аргументом." |
| 11047 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11048 | #: git-bisect.sh:290 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11049 | #, sh-format |
| 11050 | msgid "Bad rev input: $rev" |
| 11051 | msgstr "Плохой ввод номера редакции: $rev" |
| 11052 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11053 | #: git-bisect.sh:299 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11054 | #, sh-format |
| 11055 | msgid "'git bisect $TERM_BAD' can take only one argument." |
| 11056 | msgstr "«git bisect $TERM_BAD» может принимать только один аргумент." |
| 11057 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11058 | #: git-bisect.sh:322 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11059 | #, sh-format |
| 11060 | msgid "Warning: bisecting only with a $TERM_BAD commit." |
| 11061 | msgstr "Предупреждение: попытка двоичного поиска с указанием только $TERM_BAD коммита." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11062 | |
| 11063 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 11064 | #. translation. The program will only accept English input |
| 11065 | #. at this point. |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11066 | #: git-bisect.sh:328 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11067 | msgid "Are you sure [Y/n]? " |
| 11068 | msgstr "Вы уверены [Y - да/n - нет]? " |
| 11069 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11070 | #: git-bisect.sh:340 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11071 | #, sh-format |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11072 | msgid "" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11073 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
| 11074 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" |
| 11075 | msgstr "Вам нужно передать мне как минимум одну $bad_syn и одну $good_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $bad_syn» и «git bisect $good_syn».)" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11076 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11077 | #: git-bisect.sh:343 |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11078 | #, sh-format |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11079 | msgid "" |
| 11080 | "You need to start by \"git bisect start\".\n" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11081 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
| 11082 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" |
| 11083 | msgstr "Для начала нужно запустить «git bisect start».\nПосле этого, вам нужно передать мне как минимум одну $good_syn и одну $bad_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $good_syn» и «git bisect $good_syn».)" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11084 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11085 | #: git-bisect.sh:414 git-bisect.sh:546 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11086 | msgid "We are not bisecting." |
| 11087 | msgstr "Вы сейчас не в процессе бинарного поиска." |
| 11088 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11089 | #: git-bisect.sh:421 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11090 | #, sh-format |
| 11091 | msgid "'$invalid' is not a valid commit" |
| 11092 | msgstr "«$invalid» не является действительным коммитом" |
| 11093 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11094 | #: git-bisect.sh:430 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11095 | #, sh-format |
| 11096 | msgid "" |
| 11097 | "Could not check out original HEAD '$branch'.\n" |
| 11098 | "Try 'git bisect reset <commit>'." |
| 11099 | msgstr "Не удалось перейти на оригинальную ветку HEAD «$branch».\nПопробуйте запустить «git bisect reset <коммит>»." |
| 11100 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11101 | #: git-bisect.sh:458 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11102 | msgid "No logfile given" |
| 11103 | msgstr "Не передан файл журнала" |
| 11104 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11105 | #: git-bisect.sh:459 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11106 | #, sh-format |
| 11107 | msgid "cannot read $file for replaying" |
| 11108 | msgstr "не удалось прочитать $file для повтора изменений" |
| 11109 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11110 | #: git-bisect.sh:480 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11111 | msgid "?? what are you talking about?" |
| 11112 | msgstr "?? вы о чем?" |
| 11113 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11114 | #: git-bisect.sh:492 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11115 | #, sh-format |
| 11116 | msgid "running $command" |
| 11117 | msgstr "запускаю $command" |
| 11118 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11119 | #: git-bisect.sh:499 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11120 | #, sh-format |
| 11121 | msgid "" |
| 11122 | "bisect run failed:\n" |
| 11123 | "exit code $res from '$command' is < 0 or >= 128" |
| 11124 | msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128" |
| 11125 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11126 | #: git-bisect.sh:525 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11127 | msgid "bisect run cannot continue any more" |
| 11128 | msgstr "bisect run больше не может продолжать" |
| 11129 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11130 | #: git-bisect.sh:531 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11131 | #, sh-format |
| 11132 | msgid "" |
| 11133 | "bisect run failed:\n" |
| 11134 | "'bisect_state $state' exited with error code $res" |
| 11135 | msgstr "не удалось выполнить двоичный поиск:\n«bisect_state $state» завершился с кодом ошибки $res" |
| 11136 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11137 | #: git-bisect.sh:538 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11138 | msgid "bisect run success" |
| 11139 | msgstr "bisect run выполнен успешно" |
| 11140 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11141 | #: git-bisect.sh:565 |
| 11142 | msgid "please use two different terms" |
| 11143 | msgstr "используйте два разных определения" |
| 11144 | |
| 11145 | #: git-bisect.sh:575 |
| 11146 | #, sh-format |
| 11147 | msgid "'$term' is not a valid term" |
| 11148 | msgstr "«$term» не является допустимым определением" |
| 11149 | |
| 11150 | #: git-bisect.sh:578 |
| 11151 | #, sh-format |
| 11152 | msgid "can't use the builtin command '$term' as a term" |
| 11153 | msgstr "нельзя использовать встроенную команду «$term» как определение" |
| 11154 | |
| 11155 | #: git-bisect.sh:587 git-bisect.sh:593 |
| 11156 | #, sh-format |
| 11157 | msgid "can't change the meaning of term '$term'" |
| 11158 | msgstr "нельзя изменить значение определения «$term»" |
| 11159 | |
| 11160 | #: git-bisect.sh:606 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11161 | #, sh-format |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11162 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
| 11163 | msgstr "Недопустимая команда: вы сейчас находитесь на $TERM_BAD/$TERM_GOOD двоичном поиске." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11164 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11165 | #: git-bisect.sh:636 |
| 11166 | msgid "no terms defined" |
| 11167 | msgstr "определения не заданы" |
| 11168 | |
| 11169 | #: git-bisect.sh:653 |
| 11170 | #, sh-format |
| 11171 | msgid "" |
| 11172 | "invalid argument $arg for 'git bisect terms'.\n" |
| 11173 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." |
| 11174 | msgstr "недопустимый аргумент $arg для «git bisect terms».\nПоддерживаемые параметры: --term-good|--term-old и --term-bad|--term-new." |
| 11175 | |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11176 | #: git-rebase.sh:57 |
| 11177 | msgid "" |
| 11178 | "When you have resolved this problem, run \"git rebase --continue\".\n" |
| 11179 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" |
| 11180 | "To check out the original branch and stop rebasing, run \"git rebase --abort\"." |
| 11181 | msgstr "Когда вы разрешите этот конфликт, запустите «git rebase --continue».\nЕсли вы хотите пропустить этот патч, то запустите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и остановить перемещение, запустите «git rebase --abort»." |
| 11182 | |
| 11183 | #: git-rebase.sh:165 |
| 11184 | msgid "Applied autostash." |
| 11185 | msgstr "Применено автоматическое прятанье." |
| 11186 | |
| 11187 | #: git-rebase.sh:168 |
| 11188 | #, sh-format |
| 11189 | msgid "Cannot store $stash_sha1" |
| 11190 | msgstr "Не удалось сохранить $stash_sha1" |
| 11191 | |
| 11192 | #: git-rebase.sh:169 |
| 11193 | msgid "" |
| 11194 | "Applying autostash resulted in conflicts.\n" |
| 11195 | "Your changes are safe in the stash.\n" |
| 11196 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
| 11197 | msgstr "Применение автоматического прятанья вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" |
| 11198 | |
| 11199 | #: git-rebase.sh:208 |
| 11200 | msgid "The pre-rebase hook refused to rebase." |
| 11201 | msgstr "Перехватчик пре-перемещения отказал в перемещении." |
| 11202 | |
| 11203 | #: git-rebase.sh:213 |
| 11204 | msgid "It looks like git-am is in progress. Cannot rebase." |
| 11205 | msgstr "Похоже, git-am выполняется. Перемещение невозможно." |
| 11206 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11207 | #: git-rebase.sh:354 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11208 | msgid "The --exec option must be used with the --interactive option" |
| 11209 | msgstr "Опция --exec должна использоваться вместе с опцией --interactive" |
| 11210 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11211 | #: git-rebase.sh:359 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11212 | msgid "No rebase in progress?" |
| 11213 | msgstr "Нет перемещения в процессе?" |
| 11214 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11215 | #: git-rebase.sh:370 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11216 | msgid "The --edit-todo action can only be used during interactive rebase." |
| 11217 | msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении." |
| 11218 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11219 | #: git-rebase.sh:377 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11220 | msgid "Cannot read HEAD" |
| 11221 | msgstr "Не удалось прочитать HEAD" |
| 11222 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11223 | #: git-rebase.sh:380 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11224 | msgid "" |
| 11225 | "You must edit all merge conflicts and then\n" |
| 11226 | "mark them as resolved using git add" |
| 11227 | msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add" |
| 11228 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11229 | #: git-rebase.sh:398 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11230 | #, sh-format |
| 11231 | msgid "Could not move back to $head_name" |
| 11232 | msgstr "Не удалось перейти назад на $head_name" |
| 11233 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11234 | #: git-rebase.sh:417 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11235 | #, sh-format |
| 11236 | msgid "" |
| 11237 | "It seems that there is already a $state_dir_base directory, and\n" |
| 11238 | "I wonder if you are in the middle of another rebase. If that is the\n" |
| 11239 | "case, please try\n" |
| 11240 | "\t$cmd_live_rebase\n" |
| 11241 | "If that is not the case, please\n" |
| 11242 | "\t$cmd_clear_stale_rebase\n" |
| 11243 | "and run me again. I am stopping in case you still have something\n" |
| 11244 | "valuable there." |
| 11245 | msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное." |
| 11246 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11247 | #: git-rebase.sh:468 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11248 | #, sh-format |
| 11249 | msgid "invalid upstream $upstream_name" |
| 11250 | msgstr "недействительная вышестоящая ветка $upstream_name" |
| 11251 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11252 | #: git-rebase.sh:492 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11253 | #, sh-format |
| 11254 | msgid "$onto_name: there are more than one merge bases" |
| 11255 | msgstr "$onto_name: имеется больше одной базы слияния" |
| 11256 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11257 | #: git-rebase.sh:495 git-rebase.sh:499 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11258 | #, sh-format |
| 11259 | msgid "$onto_name: there is no merge base" |
| 11260 | msgstr "$onto_name: нет базы слияния" |
| 11261 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11262 | #: git-rebase.sh:504 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11263 | #, sh-format |
| 11264 | msgid "Does not point to a valid commit: $onto_name" |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11265 | msgstr "Не указывает на действительный коммит: $onto_name" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11266 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11267 | #: git-rebase.sh:527 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11268 | #, sh-format |
| 11269 | msgid "fatal: no such branch: $branch_name" |
| 11270 | msgstr "критическая ошибка: нет такой ветки: $branch_name" |
| 11271 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11272 | #: git-rebase.sh:560 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11273 | msgid "Cannot autostash" |
| 11274 | msgstr "Не удалось выполнить автоматическое прятанье" |
| 11275 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11276 | #: git-rebase.sh:565 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11277 | #, sh-format |
| 11278 | msgid "Created autostash: $stash_abbrev" |
| 11279 | msgstr "Изменения автоматически спрятаны: $stash_abbrev" |
| 11280 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11281 | #: git-rebase.sh:569 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11282 | msgid "Please commit or stash them." |
| 11283 | msgstr "Сделайте коммит или спрячьте их." |
| 11284 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11285 | #: git-rebase.sh:589 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11286 | #, sh-format |
| 11287 | msgid "Current branch $branch_name is up to date." |
| 11288 | msgstr "Текущая ветка $branch_name уже свежая." |
| 11289 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11290 | #: git-rebase.sh:593 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11291 | #, sh-format |
| 11292 | msgid "Current branch $branch_name is up to date, rebase forced." |
| 11293 | msgstr "Текущая ветка $branch_name уже свежая, принудительное перемещение." |
| 11294 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11295 | #: git-rebase.sh:604 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11296 | #, sh-format |
| 11297 | msgid "Changes from $mb to $onto:" |
| 11298 | msgstr "Изменения от $mb до $onto:" |
| 11299 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11300 | #: git-rebase.sh:613 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11301 | msgid "First, rewinding head to replay your work on top of it..." |
| 11302 | msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…" |
| 11303 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11304 | #: git-rebase.sh:623 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11305 | #, sh-format |
| 11306 | msgid "Fast-forwarded $branch_name to $onto_name." |
| 11307 | msgstr "Перемотана вперед $branch_name до $onto_name." |
| 11308 | |
| 11309 | #: git-stash.sh:51 |
| 11310 | msgid "git stash clear with parameters is unimplemented" |
| 11311 | msgstr "git stash очистка с параметрами не реализована" |
| 11312 | |
| 11313 | #: git-stash.sh:74 |
| 11314 | msgid "You do not have the initial commit yet" |
| 11315 | msgstr "У вас еще нет начального коммита" |
| 11316 | |
| 11317 | #: git-stash.sh:89 |
| 11318 | msgid "Cannot save the current index state" |
| 11319 | msgstr "Не удалось сохранить текущее состояние индекса" |
| 11320 | |
| 11321 | #: git-stash.sh:124 git-stash.sh:137 |
| 11322 | msgid "Cannot save the current worktree state" |
| 11323 | msgstr "Не удалось сохранить текущее состояние рабочего каталога" |
| 11324 | |
| 11325 | #: git-stash.sh:141 |
| 11326 | msgid "No changes selected" |
| 11327 | msgstr "Изменения не выбраны" |
| 11328 | |
| 11329 | #: git-stash.sh:144 |
| 11330 | msgid "Cannot remove temporary index (can't happen)" |
| 11331 | msgstr "Не удалось удалить временный индекс (не должно случаться)" |
| 11332 | |
| 11333 | #: git-stash.sh:157 |
| 11334 | msgid "Cannot record working tree state" |
| 11335 | msgstr "Не удалось записать состояние рабочего каталога" |
| 11336 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11337 | #: git-stash.sh:189 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11338 | #, sh-format |
| 11339 | msgid "Cannot update $ref_stash with $w_commit" |
| 11340 | msgstr "Не удалось обновить $ref_stash с помощью $w_commit" |
| 11341 | |
| 11342 | #. TRANSLATORS: $option is an invalid option, like |
| 11343 | #. `--blah-blah'. The 7 spaces at the beginning of the |
| 11344 | #. second line correspond to "error: ". So you should line |
| 11345 | #. up the second line with however many characters the |
| 11346 | #. translation of "error: " takes in your language. E.g. in |
| 11347 | #. English this is: |
| 11348 | #. $ git stash save --blah-blah 2>&1 | head -n 2 |
| 11349 | #. error: unknown option for 'stash save': --blah-blah |
| 11350 | #. To provide a message, use git stash save -- '--blah-blah' |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11351 | #: git-stash.sh:239 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11352 | #, sh-format |
| 11353 | msgid "" |
| 11354 | "error: unknown option for 'stash save': $option\n" |
| 11355 | " To provide a message, use git stash save -- '$option'" |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 11356 | msgstr "ошибка: неизвестная опция для «stash save»: $option\n Для предоставления сообщения, используйте git stash save -- «$option»" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11357 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11358 | #: git-stash.sh:260 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11359 | msgid "No local changes to save" |
| 11360 | msgstr "Нет локальных изменений для сохранения" |
| 11361 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11362 | #: git-stash.sh:264 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11363 | msgid "Cannot initialize stash" |
| 11364 | msgstr "Не удалось инициализировать спрятанные изменения" |
| 11365 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11366 | #: git-stash.sh:268 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11367 | msgid "Cannot save the current status" |
| 11368 | msgstr "Не удалось сохранить текущий статус" |
| 11369 | |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11370 | #: git-stash.sh:286 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11371 | msgid "Cannot remove worktree changes" |
| 11372 | msgstr "Не удалось удалить изменения рабочего каталога" |
| 11373 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11374 | #: git-stash.sh:405 |
Dimitriy Ryazantcev | a3e55f7 | 2015-07-14 16:34:00 +0300 | [diff] [blame] | 11375 | #, sh-format |
| 11376 | msgid "unknown option: $opt" |
| 11377 | msgstr "неизвестная опция: $opt" |
| 11378 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11379 | #: git-stash.sh:415 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11380 | msgid "No stash found." |
| 11381 | msgstr "Не найдены спрятанные изменения." |
| 11382 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11383 | #: git-stash.sh:422 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11384 | #, sh-format |
| 11385 | msgid "Too many revisions specified: $REV" |
| 11386 | msgstr "Передано слишком много редакций: $REV" |
| 11387 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11388 | #: git-stash.sh:428 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11389 | #, sh-format |
| 11390 | msgid "$reference is not a valid reference" |
| 11391 | msgstr "$reference не является действительной ссылкой" |
| 11392 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11393 | #: git-stash.sh:456 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11394 | #, sh-format |
| 11395 | msgid "'$args' is not a stash-like commit" |
| 11396 | msgstr "«$args» не похоже на коммит со спрятанными изменениями" |
| 11397 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11398 | #: git-stash.sh:467 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11399 | #, sh-format |
| 11400 | msgid "'$args' is not a stash reference" |
| 11401 | msgstr "«$args» не является ссылкой на спрятанные изменения" |
| 11402 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11403 | #: git-stash.sh:475 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11404 | msgid "unable to refresh index" |
| 11405 | msgstr "не удалось обновить индекс" |
| 11406 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11407 | #: git-stash.sh:479 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11408 | msgid "Cannot apply a stash in the middle of a merge" |
| 11409 | msgstr "Нельзя применить спрятанные изменения во время выполнения слияния" |
| 11410 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11411 | #: git-stash.sh:487 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11412 | msgid "Conflicts in index. Try without --index." |
| 11413 | msgstr "Конфликты в индексе. Попробуйте без --index." |
| 11414 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11415 | #: git-stash.sh:489 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11416 | msgid "Could not save index tree" |
| 11417 | msgstr "Не удалось сохранить дерево индекса" |
| 11418 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11419 | #: git-stash.sh:523 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11420 | msgid "Cannot unstage modified files" |
| 11421 | msgstr "Невозможно убрать из индекса измененные файлы" |
| 11422 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11423 | #: git-stash.sh:538 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11424 | msgid "Index was not unstashed." |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11425 | msgstr "Индекс не был извлечён из спрятанных изменений." |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11426 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11427 | #: git-stash.sh:561 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11428 | #, sh-format |
| 11429 | msgid "Dropped ${REV} ($s)" |
| 11430 | msgstr "Отброшено ${REV} ($s)" |
| 11431 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11432 | #: git-stash.sh:562 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11433 | #, sh-format |
| 11434 | msgid "${REV}: Could not drop stash entry" |
| 11435 | msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений" |
| 11436 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11437 | #: git-stash.sh:570 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11438 | msgid "No branch name specified" |
| 11439 | msgstr "Не указано имя ветки" |
| 11440 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11441 | #: git-stash.sh:642 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11442 | msgid "(To restore them type \"git stash apply\")" |
| 11443 | msgstr "(Чтобы восстановить их, наберите «git stash apply»)" |
| 11444 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11445 | #: git-submodule.sh:104 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11446 | #, sh-format |
| 11447 | msgid "cannot strip one component off url '$remoteurl'" |
| 11448 | msgstr "не удалось отрезать один компонент адреса «$remoteurl»" |
| 11449 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11450 | #: git-submodule.sh:281 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11451 | msgid "Relative path can only be used from the toplevel of the working tree" |
| 11452 | msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога" |
| 11453 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11454 | #: git-submodule.sh:291 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11455 | #, sh-format |
| 11456 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" |
| 11457 | msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../" |
| 11458 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11459 | #: git-submodule.sh:308 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11460 | #, sh-format |
| 11461 | msgid "'$sm_path' already exists in the index" |
| 11462 | msgstr "«$sm_path» уже содержится в индексе" |
| 11463 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11464 | #: git-submodule.sh:312 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11465 | #, sh-format |
| 11466 | msgid "" |
| 11467 | "The following path is ignored by one of your .gitignore files:\n" |
| 11468 | "$sm_path\n" |
| 11469 | "Use -f if you really want to add it." |
| 11470 | msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить." |
| 11471 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11472 | #: git-submodule.sh:330 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11473 | #, sh-format |
| 11474 | msgid "Adding existing repo at '$sm_path' to the index" |
| 11475 | msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс" |
| 11476 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11477 | #: git-submodule.sh:332 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11478 | #, sh-format |
| 11479 | msgid "'$sm_path' already exists and is not a valid git repo" |
| 11480 | msgstr "«$sm_path» уже существует и не является действительным репозиторием git" |
| 11481 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11482 | #: git-submodule.sh:340 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11483 | #, sh-format |
| 11484 | msgid "A git directory for '$sm_name' is found locally with remote(s):" |
| 11485 | msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:" |
| 11486 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11487 | #: git-submodule.sh:342 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11488 | #, sh-format |
| 11489 | msgid "" |
| 11490 | "If you want to reuse this local git directory instead of cloning again from" |
| 11491 | msgstr "Если вы хотите переиспользовать локальный каталог git вместо повторного клонирования из" |
| 11492 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11493 | #: git-submodule.sh:344 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11494 | #, sh-format |
| 11495 | msgid "" |
| 11496 | "use the '--force' option. If the local git directory is not the correct repo" |
| 11497 | msgstr ", то используйте опцию «--force». Если локальный каталог git не является действительным репозиторием" |
| 11498 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11499 | #: git-submodule.sh:345 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11500 | #, sh-format |
| 11501 | msgid "" |
| 11502 | "or you are unsure what this means choose another name with the '--name' " |
| 11503 | "option." |
| 11504 | msgstr "или если вы не поняли, что это значит, то просто используйте другое имя с помощью опции «--name»." |
| 11505 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11506 | #: git-submodule.sh:347 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11507 | #, sh-format |
| 11508 | msgid "Reactivating local git directory for submodule '$sm_name'." |
| 11509 | msgstr "Восстановление локального каталога git для подмодуля «$sm_name»." |
| 11510 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11511 | #: git-submodule.sh:359 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11512 | #, sh-format |
| 11513 | msgid "Unable to checkout submodule '$sm_path'" |
| 11514 | msgstr "Не удалось перейти на состояние у подмодуля «$sm_path»" |
| 11515 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11516 | #: git-submodule.sh:364 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11517 | #, sh-format |
| 11518 | msgid "Failed to add submodule '$sm_path'" |
| 11519 | msgstr "Сбой добавления подмодуля «$sm_path»" |
| 11520 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11521 | #: git-submodule.sh:373 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11522 | #, sh-format |
| 11523 | msgid "Failed to register submodule '$sm_path'" |
| 11524 | msgstr "Не удалось зарегистрировать подмодуль «$sm_path»" |
| 11525 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11526 | #: git-submodule.sh:417 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11527 | #, sh-format |
| 11528 | msgid "Entering '$prefix$displaypath'" |
| 11529 | msgstr "Заходим в «$prefix$displaypath»" |
| 11530 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11531 | #: git-submodule.sh:437 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11532 | #, sh-format |
| 11533 | msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." |
| 11534 | msgstr "Останавливаемся на «$prefix$displaypath»; сценарий вернул не нулевой код возврата." |
| 11535 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11536 | #: git-submodule.sh:483 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11537 | #, sh-format |
| 11538 | msgid "No url found for submodule path '$displaypath' in .gitmodules" |
| 11539 | msgstr "Адрес для пути подмодуля «$displaypath» не найден в .gitmodules" |
| 11540 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11541 | #: git-submodule.sh:492 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11542 | #, sh-format |
| 11543 | msgid "Failed to register url for submodule path '$displaypath'" |
| 11544 | msgstr "Сбой регистрации адресе для пути подмодуля «$displaypath»" |
| 11545 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11546 | #: git-submodule.sh:494 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11547 | #, sh-format |
| 11548 | msgid "Submodule '$name' ($url) registered for path '$displaypath'" |
| 11549 | msgstr "Подмодуль «$name» ($url) зарегистрирован для пути «$displaypath»" |
| 11550 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11551 | #: git-submodule.sh:511 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11552 | #, sh-format |
| 11553 | msgid "Failed to register update mode for submodule path '$displaypath'" |
| 11554 | msgstr "Сбой регистрации режима обновления для пути подмодуля «$displaypath»" |
| 11555 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11556 | #: git-submodule.sh:549 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11557 | #, sh-format |
| 11558 | msgid "Use '.' if you really want to deinitialize all submodules" |
| 11559 | msgstr "Используйте «.», если вы действительно хотите деинициализировать все подмодули" |
| 11560 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11561 | #: git-submodule.sh:566 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11562 | #, sh-format |
| 11563 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
| 11564 | msgstr "Рабочий каталог подмодуля «$displaypath» содержит каталог .git" |
| 11565 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11566 | #: git-submodule.sh:567 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11567 | #, sh-format |
| 11568 | msgid "" |
| 11569 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
| 11570 | msgstr "(используйте «rm -rf», если вы действительно хотите удалить его, включая всю его историю)" |
| 11571 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11572 | #: git-submodule.sh:573 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11573 | #, sh-format |
| 11574 | msgid "" |
| 11575 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to" |
| 11576 | " discard them" |
| 11577 | msgstr "Рабочий каталог подмодуля «$displaypath» содержит локальные изменения; используйте «-f», чтобы отменить их" |
| 11578 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11579 | #: git-submodule.sh:576 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11580 | #, sh-format |
| 11581 | msgid "Cleared directory '$displaypath'" |
| 11582 | msgstr "Очищен каталог «$displaypath»" |
| 11583 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11584 | #: git-submodule.sh:577 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11585 | #, sh-format |
| 11586 | msgid "Could not remove submodule work tree '$displaypath'" |
| 11587 | msgstr "Не удалось удалить рабочий каталог подмодуля «$displaypath»" |
| 11588 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11589 | #: git-submodule.sh:580 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11590 | #, sh-format |
| 11591 | msgid "Could not create empty submodule directory '$displaypath'" |
| 11592 | msgstr "Не удалось создать пустой каталог подмодуля «$displaypath»" |
| 11593 | |
Dimitriy Ryazantcev | 5fa9ab8 | 2015-12-25 14:02:48 +0200 | [diff] [blame] | 11594 | #: git-submodule.sh:589 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11595 | #, sh-format |
| 11596 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
| 11597 | msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»" |
| 11598 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11599 | #: git-submodule.sh:723 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11600 | #, sh-format |
| 11601 | msgid "" |
| 11602 | "Submodule path '$displaypath' not initialized\n" |
| 11603 | "Maybe you want to use 'update --init'?" |
| 11604 | msgstr "Подмодуль по пути «$displaypath» не инициализирован\nВозможно, вам нужно использовать «update --init»?" |
| 11605 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11606 | #: git-submodule.sh:736 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11607 | #, sh-format |
| 11608 | msgid "Unable to find current revision in submodule path '$displaypath'" |
| 11609 | msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»" |
| 11610 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11611 | #: git-submodule.sh:745 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11612 | #, sh-format |
| 11613 | msgid "Unable to fetch in submodule path '$sm_path'" |
| 11614 | msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»" |
| 11615 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11616 | #: git-submodule.sh:768 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11617 | #, sh-format |
| 11618 | msgid "Unable to fetch in submodule path '$displaypath'" |
| 11619 | msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»" |
| 11620 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11621 | #: git-submodule.sh:788 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11622 | #, sh-format |
| 11623 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" |
| 11624 | msgstr "Не удалось выполнить переход на состояние «$sha1» для подмодуля по пути «$displaypath»" |
| 11625 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11626 | #: git-submodule.sh:789 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11627 | #, sh-format |
| 11628 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
| 11629 | msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»" |
| 11630 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11631 | #: git-submodule.sh:793 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11632 | #, sh-format |
| 11633 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
| 11634 | msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»" |
| 11635 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11636 | #: git-submodule.sh:794 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11637 | #, sh-format |
| 11638 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
| 11639 | msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" |
| 11640 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11641 | #: git-submodule.sh:799 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11642 | #, sh-format |
| 11643 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
| 11644 | msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»" |
| 11645 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11646 | #: git-submodule.sh:800 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11647 | #, sh-format |
| 11648 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
| 11649 | msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»" |
| 11650 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11651 | #: git-submodule.sh:805 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11652 | #, sh-format |
| 11653 | msgid "" |
Dimitriy Ryazantcev | 82aa9b7 | 2015-09-30 18:01:23 +0300 | [diff] [blame] | 11654 | "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11655 | msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$prefix$sm_path»" |
| 11656 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11657 | #: git-submodule.sh:806 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11658 | #, sh-format |
| 11659 | msgid "Submodule path '$prefix$sm_path': '$command $sha1'" |
| 11660 | msgstr "Подмодуль по пути «$prefix$sm_path»: «$command $sha1»" |
| 11661 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11662 | #: git-submodule.sh:836 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11663 | #, sh-format |
| 11664 | msgid "Failed to recurse into submodule path '$displaypath'" |
| 11665 | msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»" |
| 11666 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11667 | #: git-submodule.sh:944 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11668 | msgid "The --cached option cannot be used with the --files option" |
| 11669 | msgstr "Опцию --cached нельзя использовать одновременно с опцией --files" |
| 11670 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11671 | #: git-submodule.sh:996 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11672 | #, sh-format |
| 11673 | msgid "unexpected mode $mod_dst" |
| 11674 | msgstr "неизвестный режим $mod_dst" |
| 11675 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11676 | #: git-submodule.sh:1016 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11677 | #, sh-format |
| 11678 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
| 11679 | msgstr " Предупреждение: $display_name не содержит коммит $sha1_src" |
| 11680 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11681 | #: git-submodule.sh:1019 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11682 | #, sh-format |
| 11683 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
| 11684 | msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst" |
| 11685 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11686 | #: git-submodule.sh:1022 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11687 | #, sh-format |
| 11688 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
| 11689 | msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst" |
| 11690 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11691 | #: git-submodule.sh:1047 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11692 | msgid "blob" |
| 11693 | msgstr "двоичный объект" |
| 11694 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11695 | #: git-submodule.sh:1165 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11696 | #, sh-format |
| 11697 | msgid "Failed to recurse into submodule path '$sm_path'" |
| 11698 | msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»" |
| 11699 | |
Dimitriy Ryazantcev | 03eb39a | 2016-03-02 17:37:55 +0200 | [diff] [blame] | 11700 | #: git-submodule.sh:1229 |
Dimitriy Ryazantcev | f088104 | 2015-03-20 17:18:53 +0200 | [diff] [blame] | 11701 | #, sh-format |
| 11702 | msgid "Synchronizing submodule url for '$displaypath'" |
| 11703 | msgstr "Синхронизация url для подмодуля «$displaypath»" |