diff options
Diffstat (limited to 'po/ru.po')
| -rw-r--r-- | po/ru.po | 6873 |
1 files changed, 4279 insertions, 2594 deletions
@@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-05-24 23:42+0800\n" -"PO-Revision-Date: 2016-06-11 09:37+0000\n" +"POT-Creation-Date: 2016-11-25 22:50+0800\n" +"PO-Revision-Date: 2016-11-28 23:58+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -25,24 +25,683 @@ msgstr "" msgid "hint: %.*s\n" msgstr "ΠΏΠΎΠ΄ΡΠΊΠ°Π·ΠΊΠ°: %.*s\n" -#: advice.c:88 +#: advice.c:83 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π² ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ." + +#: advice.c:85 +msgid "Committing is not possible because you have unmerged files." +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ." + +#: advice.c:87 +msgid "Merging is not possible because you have unmerged files." +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ." + +#: advice.c:89 +msgid "Pulling is not possible because you have unmerged files." +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ." + +#: advice.c:91 +msgid "Reverting is not possible because you have unmerged files." +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ." + +#: advice.c:93 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ %s, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ." + +#: advice.c:101 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "ΠΡΠΏΡΠ°Π²ΡΡΠ΅ ΠΈΡ
Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git add/rm <ΡΠ°ΠΉΠ»>Β»,\nΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΠΈ ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ." -#: advice.c:101 builtin/merge.c:1238 +#: advice.c:109 +msgid "Exiting because of an unresolved conflict." +msgstr "ΠΡΡ
ΠΎΠ΄ ΠΈΠ·-Π·Π° Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°." + +#: advice.c:114 builtin/merge.c:1181 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» MERGE_HEAD)." -#: advice.c:103 +#: advice.c:116 msgid "Please, commit your changes before merging." msgstr "ΠΠ΅ΡΠ΅Π΄ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ, Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ Π²Π°ΡΠΈΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." -#: advice.c:104 +#: advice.c:117 msgid "Exiting because of unfinished merge." msgstr "ΠΡΡ
ΠΎΠ΄ ΠΈΠ·-Π·Π° Π½Π΅Π·Π°Π²Π΅ΡΡΠ΅Π½Π½ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ." +#: advice.c:123 +#, c-format +msgid "" +"Note: checking out '%s'.\n" +"\n" +"You are in 'detached HEAD' state. You can look around, make experimental\n" +"changes and commit them, and you can discard any commits you make in this\n" +"state without impacting any branches by performing another checkout.\n" +"\n" +"If you want to create a new branch to retain commits you create, you may\n" +"do so (now or later) by using -b with the checkout command again. Example:\n" +"\n" +" git checkout -b <new-branch-name>\n" +"\n" +msgstr "ΠΡΠΈΠΌΠ΅ΡΠ°Π½ΠΈΠ΅: ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ Π½Π° Β«%sΒ».\n\nΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π² ΡΠΎΡΡΠΎΡΠ½ΠΈΠΈ Β«ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΠΎΠ³ΠΎ HEADΒ». ΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΎΡΠΌΠΎΡΡΠ΅ΡΡΡΡ, ΡΠ΄Π΅Π»Π°ΡΡ\nΡΠΊΡΠΏΠ΅ΡΠΈΠΌΠ΅Π½ΡΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΈΡ
, ΡΠ°ΠΊΠΆΠ΅ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ\nΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π»ΡΠ±ΡΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π² ΡΡΠΎΠΌ ΡΠΎΡΡΠΎΡΠ½ΠΈΠΈ Π½Π΅ Π·Π°ΡΡΠ°Π³ΠΈΠ²Π°Ρ Π»ΡΠ±ΡΠ΅ Π²Π΅ΡΠΊΠΈ ΠΈ\nΠ½Π΅ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄Ρ Π½Π° Π½ΠΈΡ
.\n\nΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ²ΠΎΠΈ ΠΊΠΎΠΌΠΌΠΈΡΡ, ΡΠΎ Π²Ρ\nΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ (ΡΠ΅ΠΉΡΠ°Ρ ΠΈΠ»ΠΈ ΠΏΠΎΠ·ΠΆΠ΅) Π²ΡΠ·Π²Π°Π² ΠΊΠΎΠΌΠ°Π½Π΄Ρ checkout ΡΠ½ΠΎΠ²Π°,\nΠ½ΠΎ Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠΌ -b. ΠΠ°ΠΏΡΠΈΠΌΠ΅Ρ:\n\n git checkout -b <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ>\n\n" + +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² Β«%sΒ»" + +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² Β«%sΒ»" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject ΠΈ --3way Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached ΠΈ --3way Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" + +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΈΡΡ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΎΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΌΠ΅ΡΠΊΠΈ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ %s" + +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΠ» %d Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°: %s" + +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π² ΡΡΡΠΎΠΊΠ΅ ΠΏΠ°ΡΡΠ° %d" + +#: apply.c:977 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" + +#: apply.c:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ Π½ΠΎΠ²ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" + +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ ΡΡΠ°ΡΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" + +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" + +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: Π½Π΅ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ°: %.*s" + +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "ΡΡΠ°Π³ΠΌΠ΅Π½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π±Π΅Π· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s" + +#: apply.c:1577 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname" +" component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname" +" components (line %d)" +msgstr[0] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½ΡΠ° ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" +msgstr[1] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" +msgstr[2] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" +msgstr[3] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" + +#: apply.c:1589 +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° (ΡΡΡΠΎΠΊΠ° %d)" + +#: apply.c:1759 +msgid "new file depends on old contents" +msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ" + +#: apply.c:1761 +msgid "deleted file still has contents" +msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅" + +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" +msgstr "ΠΏΠ°ΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" + +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" +msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» %s Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ" + +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" +msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» %s Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅" + +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠ°ΠΉΠ» %s ΡΡΠ°Π½ΠΎΠ²ΠΈΡΡΡ ΠΏΡΡΡΡΠΌ, Π½ΠΎ Π½Π΅ ΡΠ΄Π°Π»ΡΠ΅ΡΡΡ" + +#: apply.c:1984 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s" + +#: apply.c:2021 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" + +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "ΠΏΠ°ΡΡ Ρ ΠΌΡΡΠΎΡΠΎΠΌ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" + +#: apply.c:2274 +#, c-format +msgid "unable to read symlink %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ %s" + +#: apply.c:2278 +#, c-format +msgid "unable to open or read %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠ΅ΡΡΡ %s" + +#: apply.c:2931 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π½Π°ΡΠ°Π»ΠΎ ΡΡΡΠΎΠΊΠΈ: Β«%cΒ»" + +#: apply.c:3050 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΡ)." +msgstr[1] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΠΈ)." +msgstr[2] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)." +msgstr[3] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)." + +#: apply.c:3062 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "ΠΠΎΠ½ΡΠ΅ΠΊΡΡ ΡΡΠΆΠ΅Π½ Π΄ΠΎ (%ld/%ld), ΡΡΠΎΠ±Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΡΠ°Π³ΠΌΠ΅Π½Ρ Π½Π° %d ΡΡΡΠΎΠΊΠ΅" + +#: apply.c:3068 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅:\n%.*s" + +#: apply.c:3090 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "ΠΏΡΠΎΠΏΡΡΠ΅Π½Ρ Π΄Π°Π½Π½ΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ Β«%sΒ»" + +#: apply.c:3098 +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ reverse-apply Π΄Π»Ρ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ°, Π±Π΅Π· ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π±Π»ΠΎΠΊΠ° Β«%sΒ»" + +#: apply.c:3144 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Β«%sΒ» Π±Π΅Π· ΡΡΡΠΎΠΊΠΈ Ρ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ ΠΏΠΎΠ»Π½ΠΎΠΉ Π²Π΅ΡΡΠΈΠ΅ΠΉ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" + +#: apply.c:3154 +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡΡ ΠΊ ΡΠ°ΠΉΠ»Ρ Β«%sΒ» (%s), Π½ΠΎ Π΅Π³ΠΎ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΠ²ΡΠ΅Ρ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΠΎΠΌΡ." + +#: apply.c:3162 +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ ΠΊ ΠΏΡΡΡΠΎΠΌΡ ΡΠ°ΠΉΠ»Ρ Β«%sΒ», Π½ΠΎ ΡΠ°ΠΉΠ» Π½Π΅ ΠΏΡΡΡΠΎΠΉ" + +#: apply.c:3180 +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΡ ΠΏΠΎΡΡΠ»ΠΊΡ %s Π΄Π»Ρ Β«%sΒ»" + +#: apply.c:3193 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ ΠΊ Β«%sΒ»" + +#: apply.c:3199 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "ΠΏΠΎΡΠ»Π΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ Β«%sΒ» Π±ΡΠ» ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ (ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ %s, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s)" + +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: %s:%ld" + +#: apply.c:3342 +#, c-format +msgid "cannot checkout %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Π½Π° %s" + +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#, c-format +msgid "failed to read %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s" + +#: apply.c:3398 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "ΡΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· Β«%sΒ» Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" + +#: apply.c:3427 apply.c:3667 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "ΠΏΡΡΡ %s Π±ΡΠ» ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½/ΡΠ΄Π°Π»Π΅Π½" + +#: apply.c:3510 apply.c:3681 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: Π½Π΅Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" + +#: apply.c:3519 apply.c:3689 +#, c-format +msgid "%s: does not match index" +msgstr "%s: Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ" + +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." +msgstr "Π² ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π»Ρ ΠΎΡΠΊΠ°ΡΠ° ΠΊ ΡΡΡΡ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ." + +#: apply.c:3557 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "ΠΡΠΊΠ°Ρ ΠΊ ΡΡΡΡ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡβ¦\n" + +#: apply.c:3573 apply.c:3577 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Β«%sΒ»" + +#: apply.c:3589 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΠ°ΡΠΈΡΡΡΡ ΠΊ ΡΡΡΡ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡβ¦\n" + +#: apply.c:3603 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "ΠΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ ΠΊ Β«%sΒ» Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°ΠΌΠΈ.\n" + +#: apply.c:3608 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "ΠΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ ΠΊ Β«%sΒ» Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ.\n" + +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "ΠΏΠ°ΡΡ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ ΡΠ΄Π°Π»ΠΈΠ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π°" + +#: apply.c:3706 +#, c-format +msgid "%s: wrong type" +msgstr "%s: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠΈΠΏ" + +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s ΠΈΠΌΠ΅Π΅Ρ ΡΠΈΠΏ %o, Π° ΠΎΠΆΠΈΠ΄Π°Π»ΡΡ %o" + +#: apply.c:3859 apply.c:3861 +#, c-format +msgid "invalid path '%s'" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΡΡΡ Β«%sΒ»" + +#: apply.c:3917 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" + +#: apply.c:3920 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" + +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o)" + +#: apply.c:3945 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s" + +#: apply.c:3965 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "Π·Π°ΡΡΠΎΠ½ΡΡΡΠΉ ΡΠ°ΠΉΠ» Β«%sΒ» Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" + +#: apply.c:3969 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ" + +#: apply.c:3984 +#, c-format +msgid "Checking patch %s..." +msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΠ°ΡΡΠ° %sβ¦" + +#: apply.c:4075 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± sha1 ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ ΠΈΠ»ΠΈ Π±Π΅ΡΠΏΠΎΠ»Π΅Π·Π½Π° Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s" + +#: apply.c:4082 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ ΡΠ΅ΠΆΠΈΠΌ Π΄Π»Ρ %s, ΠΊΠΎΡΠΎΡΡΠΉ Π½Π΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π² ΡΠ΅ΠΊΡΡΠ΅ΠΌ HEAD" + +#: apply.c:4085 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± sha1 ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ ΠΈΠ»ΠΈ Π±Π΅ΡΠΏΠΎΠ»Π΅Π·Π½Π° (%s)." + +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "ΡΠ±ΠΎΠΉ make_cache_entry Π΄Π»Ρ ΠΏΡΡΠΈ Β«%sΒ»" + +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ %s Π²ΠΎ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ" + +#: apply.c:4104 +#, c-format +msgid "could not write temporary index to %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄ΠΊΠ΅ΠΊΡ Π² %s" + +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" + +#: apply.c:4277 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ ΠΏΠ°ΡΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s" + +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° Β«%sΒ»" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° %s" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π·Π°ΠΏΠΈΡΡ Π² ΠΊΡΡΠ΅ Π΄Π»Ρ %s" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² Β«%sΒ»" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "Π·Π°ΠΊΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Π° Β«%sΒ»" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ» Ρ ΡΠ΅ΠΆΠΈΠΌΠΎΠΌ Π΄ΠΎΡΡΡΠΏΠ° %o" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "ΠΠ°ΡΡ %s ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ." + +#: apply.c:4518 +msgid "internal error" +msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ°" + +#: apply.c:4521 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·ΠΎΠΌβ¦" +msgstr[1] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" +msgstr[2] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" +msgstr[3] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" + +#: apply.c:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "ΡΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠΌΠ΅Π½ΠΈ .rej ΡΠ°ΠΉΠ»Π° Π΄ΠΎ %.*s.rej" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "ΠΠ»ΠΎΠΊ β%d ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ." + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "ΠΠ»ΠΎΠΊ β%d ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½." + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "ΠΠ°ΡΡ Β«%sΒ» ΠΏΡΠΎΠΏΡΡΠ΅Π½." + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "Π½Π΅ ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π²Π²ΠΎΠ΄" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΏΠ°ΡΡ Β«%sΒ»: %s" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "ΠΏΡΠΎΠΏΡΡΠ΅Π½Π° %d ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" +msgstr[1] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" +msgstr[2] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" +msgstr[3] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d ΡΡΡΠΎΠΊΠ° Π΄ΠΎΠ±Π°Π²ΠΈΠ»Π° ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." +msgstr[1] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." +msgstr[2] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." +msgstr[3] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." + +#: apply.c:4872 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "%d ΡΡΡΠΎΠΊΠ° Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π° ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
." +msgstr[1] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
." +msgstr[2] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
." +msgstr[3] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
." + +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" + +#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +msgid "path" +msgstr "ΠΏΡΡΡ" + +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ" + +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ" + +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ" + +#: apply.c:4926 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "ΡΠ΄Π°Π»ΠΈΡΡ <ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ> Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΡΡΡ
ΡΠ΅ΡΡ ΠΈΠ· ΡΡΠ°Π΄ΠΈΡΠΈΠΎΠ½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ ΡΠΏΠΈΡΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ, ΡΠ΄Π΅Π»Π°Π½Π½ΡΠ΅ ΡΡΠΈΠΌ ΠΏΠ°ΡΡΠ΅ΠΌ" + +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠΉ ΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°" + +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
ΠΈ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
ΡΡΡΠΎΠΊ Π² Π΄Π΅ΡΡΡΠΈΡΠ½ΠΎΠΌ ΠΏΡΠ΅Π΄ΡΡΠ°Π²Π»Π΅Π½ΠΈΠΈ" + +#: apply.c:4937 +msgid "instead of applying the patch, output a summary for the input" +msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°" + +#: apply.c:4939 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΠΈΡ Π»ΠΈ ΠΎΠ½" + +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ ΠΊ ΡΠ΅ΠΊΡΡΠ΅ΠΌΡ ΠΈΠ½Π΄Π΅ΠΊΡΡ" + +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ, Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" + +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "ΠΏΡΠΈΠ½ΡΡΡ ΠΏΠ°ΡΡ, ΠΊΠΎΡΠΎΡΡΠΉ Π·Π°ΡΡΠ°Π³ΠΈΠ²Π°Π΅Ρ ΡΠ°ΠΉΠ»Ρ Π·Π° ΡΠ°Π±ΠΎΡΠΈΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" + +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "Π° ΡΠ°ΠΊΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Ρ --stat/--summary/--check)" + +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "ΠΏΠΎΠΏΡΡΠ°ΡΡΡΡ ΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π΅ΡΠ»ΠΈ ΠΏΠ°ΡΡ Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ" + +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "ΠΏΠΎΡΡΡΠΎΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΠΉ Π½Π° Π²ΡΡΡΠΎΠ΅Π½Π½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" + +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "ΠΏΡΡΠΈ, ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠ΅ ΠΠ£ΠΠΠΠ«Π ΡΠΈΠΌΠ²ΠΎΠ»ΠΎΠΌ" + +#: apply.c:4956 +msgid "ensure at least <n> lines of context match" +msgstr "ΡΠ΄ΠΎΡΡΠΎΠ²Π΅ΡΠΈΡΡΡΡ, ΡΡΠΎ ΠΏΠΎ ΠΊΡΠ°ΠΉΠ½Π΅ΠΉ ΠΌΠ΅ΡΠ΅ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ" + +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅" + +#: apply.c:4958 +msgid "detect new or modified lines that have whitespace errors" +msgstr "ΠΎΠΏΡΠ΅Π΄Π΅Π»ΡΡΡ Π½ΠΎΠ²ΡΠ΅ ΠΈΠ»ΠΈ ΠΌΠΎΠ΄ΠΈΡΠΈΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ, Ρ ΠΊΠΎΡΠΎΡΡΡ
Π΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" + +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" + +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ Ρ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "Π½Π΅ ΠΎΠΆΠΈΠ΄Π°ΡΡ ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ ΠΎΠ΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" + +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½Π½ΡΠ΅ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΡ
*.rej ΡΠ°ΠΉΠ»Π°Ρ
" + +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΊΡΡΠ²Π°ΡΡΠΈΠ΅ΡΡ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 +#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +msgid "be verbose" +msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅" + +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π½Π΅ΠΊΠΎΡΡΠ΅ΠΊΡΠ½ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΠΎΠΏΡΡΠ΅Π½Π½ΡΠ΅ ΠΏΡΡΡΡΠ΅ ΡΡΡΠΎΠΊΠΈ Π² ΠΊΠΎΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Π°" + +#: apply.c:4979 +msgid "do not trust the line counts in the hunk headers" +msgstr "Π½Π΅ Π΄ΠΎΠ²Π΅ΡΡΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΡΡΡΠΎΠΊ ΠΈΠ· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π±Π»ΠΎΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "ΠΊΠΎΡΠ΅Π½Ρ" + +#: apply.c:4982 +msgid "prepend <root> to all filenames" +msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ <ΠΊΠΎΡΠ΅Π½Ρ> ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊΠΎ Π²ΡΠ΅ΠΌ ΠΈΠΌΠ΅Π½Π°ΠΌ ΡΠ°ΠΉΠ»ΠΎΠ²" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<ΠΎΠΏΡΠΈΠΈ>] <ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°> [<ΠΏΡΡΡ>β¦]" @@ -61,7 +720,7 @@ msgstr "git archive --remote <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [--exec <ΠΊΠΎΠΌΠ°Π½Π΄Π°>] msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [--exec <ΠΊΠΎΠΌΠ°Π½Π΄Π°>] --list" -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ Β«%sΒ» Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ Π½ΠΈ ΠΎΠ΄Π½ΠΎΠΌΡ ΡΠ°ΠΉΠ»Ρ" @@ -74,7 +733,7 @@ msgstr "ΡΠΎΡΠΌΠ°Ρ" msgid "archive format" msgstr "ΡΠΎΡΠΌΠ°Ρ Π°ΡΡ
ΠΈΠ²Π°" -#: archive.c:430 builtin/log.c:1395 +#: archive.c:430 builtin/log.c:1429 msgid "prefix" msgstr "ΠΏΡΠ΅ΡΠΈΠΊΡ" @@ -82,11 +741,11 @@ msgstr "ΠΏΡΠ΅ΡΠΈΠΊΡ" msgid "prepend prefix to each pathname in the archive" msgstr "Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ ΠΏΡΠ΅ΡΠΈΠΊΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠ°ΠΆΠ΄ΡΠΌ ΠΏΡΡΠ΅ΠΌ ΡΠ°ΠΉΠ»Π° Π² Π°ΡΡ
ΠΈΠ²Π΅" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 -#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 -#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "ΡΠ°ΠΉΠ»" @@ -118,8 +777,8 @@ msgstr "ΡΠΆΠΈΠΌΠ°ΡΡ Π»ΡΡΡΠ΅" msgid "list supported archive formats" msgstr "ΠΏΠ΅ΡΠ΅ΡΠΈΡΠ»ΠΈΡΡ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠΎΡΠΌΠ°ΡΡ Π°ΡΡ
ΠΈΠ²ΠΎΠ²" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:776 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 +#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 msgid "repo" msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" @@ -127,7 +786,7 @@ msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" msgid "retrieve the archive from remote repository <repo>" msgstr "ΠΏΠΎΠ»ΡΡΠΈΡΡ Π°ΡΡ
ΠΈΠ² ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ>" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 msgid "command" msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Π°" @@ -135,12 +794,147 @@ msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Π°" msgid "path to the remote git-upload-archive command" msgstr "ΠΏΡΡΡ ΠΊ ΠΊΠΎΠΌΠ°Π½Π΄Π΅ git-upload-archive Π½Π° ΠΌΠ°ΡΠΈΠ½Π΅ Ρ Π²Π½Π΅ΡΠ½ΠΈΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ" +#: archive.c:461 +msgid "Unexpected option --remote" +msgstr "ΠΠ΅ΠΎΠΆΠΈΠ΄Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ --remote" + +#: archive.c:463 +msgid "Option --exec can only be used together with --remote" +msgstr "ΠΠΏΡΠΈΡ --exec ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π²ΠΌΠ΅ΡΡΠ΅ Ρ --remote" + +#: archive.c:465 +msgid "Unexpected option --output" +msgstr "ΠΠ΅ΠΎΠΆΠΈΠ΄Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ --output" + +#: archive.c:487 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠΎΡΠΌΠ°Ρ Π°ΡΡ
ΠΈΠ²Π° Β«%sΒ»" + +#: archive.c:494 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "ΠΡΠ³ΡΠΌΠ΅Π½Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ Π΄Π»Ρ ΡΠΎΡΠΌΠ°ΡΠ° Β«%sΒ»: -%d" + #: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "ΠΡΡΠΈΡΠ°ΡΡΠΈΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ Π² Π°ΡΡΠΈΠ±ΡΡΠ°Ρ
git ΠΈΠ³Π½ΠΎΡΠΈΡΡΡΡΡΡ.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«\\!Β» Π΄Π»Ρ Π±ΡΠΊΠ²Π°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΡΠΈΠΌΠ²ΠΎΠ»Π° Π² Π·Π½Π°ΡΠ΅Π½ΠΈΠΈ Β«Π²ΠΎΡΠΊΠ»ΠΈΡΠ°ΡΠ΅Π»ΡΠ½ΡΠΉ Π·Π½Π°ΠΊΒ»." +#: bisect.c:441 +#, c-format +msgid "Could not open file '%s'" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» Β«%sΒ»" + +#: bisect.c:446 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "ΠΠ»ΠΎΡ
ΠΎΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π° Β«%sΒ»: %s" + +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ Π±ΠΈΠ½Π°ΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ!\n" + +#: bisect.c:708 +#, c-format +msgid "Not a valid commit name %s" +msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s" + +#: bisect.c:732 +#, c-format +msgid "" +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" +msgstr "ΠΠ°Π·Π° ΡΠ»ΠΈΡΠ½ΠΈΡ %s ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠ»ΠΎΡ
ΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ.\nΠΡΠΎ Π·Π½Π°ΡΠΈΡ, ΡΡΠΎ ΠΎΡΠΈΠ±ΠΊΠ° Π±ΡΠ»Π° ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π° Π³Π΄Π΅-ΡΠΎ ΠΌΠ΅ΠΆΠ΄Ρ %s ΠΈ [%s].\n" + +#: bisect.c:737 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "ΠΠ°Π·Π° ΡΠ»ΠΈΡΠ½ΠΈΡ %s ΡΠ²Π»ΡΠ΅ΡΡΡ Π½ΠΎΠ²ΠΎΠΉ.\nΠ‘Π²ΠΎΠΉΡΡΠ²ΠΎ Π±ΡΠ»ΠΎ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ Π³Π΄Π΅-ΡΠΎ ΠΌΠ΅ΠΆΠ΄Ρ %s ΠΈ [%s].\n" + +#: bisect.c:742 +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +msgstr "ΠΠ°Π·Π° ΡΠ»ΠΈΡΠ½ΠΈΡ %s ΡΠ²Π»ΡΠ΅ΡΡΡ %s.\nΠΡΠΎ Π·Π½Π°ΡΠΈΡ, ΡΡΠΎ Β«%sΒ» ΠΊΠΎΠΌΠΌΠΈΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π³Π΄Π΅-ΡΠΎ ΠΌΠ΅ΠΆΠ΄Ρ %s ΠΈ [%s].\n" + +#: bisect.c:750 +#, c-format +msgid "" +"Some %s revs are not ancestor of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "ΠΠ΅ΡΠΊΠΎΠ»ΡΠΊΠΎ %s ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π½Π΅ ΡΠ²Π»ΡΡΡΡΡ ΠΏΡΠ΅Π΄ΠΊΠ°ΠΌΠΈ %s ΠΊΠΎΠΌΠΌΠΈΡΠ°.\nΠ ΡΡΠΎΠΌ ΡΠ»ΡΡΠ°Π΅ git bisect Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ ΡΠ°Π±ΠΎΡΠ°ΡΡ ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎ.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΏΠ΅ΡΠ΅ΠΏΡΡΠ°Π»ΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ %s ΠΈ %s ΠΌΠ΅ΡΡΠ°ΠΌΠΈ?\n" + +#: bisect.c:763 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "ΠΠ°Π·Π° ΡΠ»ΠΈΡΠ½ΠΈΡ ΠΌΠ΅ΠΆΠ΄Ρ %s ΠΈ [%s] Π΄ΠΎΠ»ΠΆΠ½ΠΎ Π±ΡΡΡ ΠΏΡΠΎΠΏΡΡΠ΅Π½Π°.\nΠΠΎΡΡΠΎΠΌΡ ΠΌΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ΠΌ Π±ΡΡΡ ΡΠ²Π΅ΡΠ΅Π½Ρ, ΡΡΠΎ ΠΏΠ΅ΡΠ²ΡΠΉ %s ΠΊΠΎΠΌΠΌΠΈΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ ΠΌΠ΅ΠΆΠ΄Ρ %s ΠΈ %s.\nΠΠΎ Π²ΡΠ΅ ΠΆΠ΅ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ°Π΅ΠΌ ΠΏΠΎΠΈΡΠΊ." + +#: bisect.c:798 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "ΠΠΈΠ½Π°ΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ: Π±Π°Π·Π° ΡΠ»ΠΈΡΠ½ΠΈΡ Π΄ΠΎΠ»ΠΆΠ½Π° Π±ΡΡΡ ΠΏΡΠΎΠ²Π΅ΡΠ΅Π½Π°\n" + +#: bisect.c:849 +#, c-format +msgid "a %s revision is needed" +msgstr "Π½ΡΠΆΠ½ΠΎ ΡΠΊΠ°Π·Π°ΡΡ %s ΡΠ΅Π΄Π°ΠΊΡΠΈΡ" + +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#, c-format +msgid "could not create file '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ»" + +#: bisect.c:917 +#, c-format +msgid "could not read file '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ»" + +#: bisect.c:947 +msgid "reading bisect refs failed" +msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΡΡΠ΅Π½ΠΈΠΈ ΡΡΡΠ»ΠΎΠΊ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ°" + +#: bisect.c:967 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s Π±ΡΠ»Π° ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΈ %s ΠΈ %s\n" + +#: bisect.c:975 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "Π’Π΅ΡΡΠΈΡΡΠ΅ΠΌΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π½Π°ΡΠ°Π»ΠΈ ΠΏΠΎΠΈΡΠΊ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΏΡΡΠΈ?\n" + +#: bisect.c:994 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(ΠΏΡΠΈΠΌΠ΅ΡΠ½ΠΎ %d ΡΠ°Π³)" +msgstr[1] "(ΠΏΡΠΈΠΌΠ΅ΡΠ½ΠΎ %d ΡΠ°Π³Π°)" +msgstr[2] "(ΠΏΡΠΈΠΌΠ΅ΡΠ½ΠΎ %d ΡΠ°Π³ΠΎΠ²)" +msgstr[3] "(ΠΏΡΠΈΠΌΠ΅ΡΠ½ΠΎ %d ΡΠ°Π³ΠΎΠ²)" + +#. TRANSLATORS: the last %s will be replaced with +#. "(roughly %d steps)" translation +#: bisect.c:998 +#, c-format +msgid "Bisecting: %d revision left to test after this %s\n" +msgid_plural "Bisecting: %d revisions left to test after this %s\n" +msgstr[0] "ΠΠΈΠ½Π°ΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ: %d ΡΠ΅Π΄Π°ΠΊΡΠΈΡ ΠΎΡΡΠ°Π»ΠΎΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΎΠΉ %s\n" +msgstr[1] "ΠΠΈΠ½Π°ΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ: %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ ΠΎΡΡΠ°Π»ΠΎΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΎΠΉ %s\n" +msgstr[2] "ΠΠΈΠ½Π°ΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ: %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ ΠΎΡΡΠ°Π»ΠΎΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΎΠΉ %s\n" +msgstr[3] "ΠΠΈΠ½Π°ΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ: %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ ΠΎΡΡΠ°Π»ΠΎΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΎΠΉ %s\n" + #: branch.c:53 #, c-format msgid "" @@ -241,27 +1035,27 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "\nΠΡΠ»ΠΈ Π²Ρ ΠΏΠ»Π°Π½ΠΈΡΡΠ΅ΡΠ΅ ΠΎΡΠ½ΠΎΠ²ΡΠ²Π°ΡΡ ΡΠ²ΠΎΡ ΡΠ°Π±ΠΎΡΡ Π½Π° Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅, ΠΊΠΎΡΠΎΡΠ°Ρ ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ, Π²Π°ΠΌ ΠΌΠΎΠΆΠ΅Ρ ΠΏΠΎΡΡΠ΅Π±ΠΎΠ²Π°ΡΡΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ Β«git fetchΒ» Π΄Π»Ρ Π΅Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ.\n\nΠΡΠ»ΠΈ Π²Ρ ΠΏΠ»Π°Π½ΠΈΡΡΠ΅ΡΠ΅ ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ Π½ΠΎΠ²ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ, ΠΊΠΎΡΠΎΡΠ°Ρ Π±ΡΠ΄Π΅Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡΡΡ, Π²ΠΎ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ, Π²Π°ΠΌ ΠΌΠΎΠΆΠ΅Ρ ΠΏΠΎΡΡΠ΅Π±ΠΎΠ²Π°ΡΡΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ Β«git push -uΒ» β ΡΡΠΎΠ±Ρ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ." -#: branch.c:266 +#: branch.c:265 #, c-format msgid "Not a valid object name: '%s'." msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: Β«%sΒ»." -#: branch.c:286 +#: branch.c:285 #, c-format msgid "Ambiguous object name: '%s'." msgstr "ΠΠ΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: Β«%sΒ»." -#: branch.c:291 +#: branch.c:290 #, c-format msgid "Not a valid branch point: '%s'." msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΠΎΡΠΊΠ° Π²Π΅ΡΠΊΠΈ: Β«%sΒ»." -#: branch.c:345 +#: branch.c:344 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "Β«%sΒ» ΡΠΆΠ΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π½Π° Β«%sΒ»" -#: branch.c:364 +#: branch.c:363 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° %s Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ½" @@ -276,7 +1070,7 @@ msgstr "Β«%sΒ» Π½Π΅ ΠΏΠΎΡ
ΠΎΠΆ Π½Π° ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° Π²Π΅ΡΡΠΈΠΈ 2" msgid "unrecognized header: %s%s (%d)" msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" @@ -285,10 +1079,10 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" msgid "Repository lacks these prerequisite commits:" msgstr "Π ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 -#: builtin/merge.c:361 builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 +#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 +#: builtin/merge.c:356 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΠΈ ΠΏΡΠΎΡ
ΠΎΠ΄Π° ΠΏΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΌ" @@ -331,7 +1125,7 @@ msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° rev-list" msgid "ref '%s' is excluded by the rev-list options" msgstr "ΡΡΡΠ»ΠΊΠ° Β«%sΒ» ΠΈΡΠΊΠ»ΡΡΠ΅Π½Π° Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ rev-list" -#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ: %s" @@ -349,13 +1143,13 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Β«%sΒ»" msgid "index-pack died" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° index-pack" -#: color.c:275 +#: color.c:290 #, c-format msgid "invalid color value: %.*s" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ²Π΅ΡΠ°: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 -#: builtin/am.c:2134 +#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 +#: builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ %s" @@ -365,90 +1159,195 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ %s" msgid "%s %s is not a commit!" msgstr "%s %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ!" +#: commit.c:1514 +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ UTF-8.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Ρ
ΠΎΡΠΈΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ Π΅Π³ΠΎ ΠΏΠΎΡΠ»Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ\nΠΈΠ»ΠΈ Π½Π°ΡΡΡΠΎΠΈΡΡ ΠΎΠΏΡΠΈΡ i18n.commitencoding ΠΈ ΡΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΡ\nΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅Ρ Π²Π°Ρ ΠΏΡΠΎΠ΅ΠΊΡ.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "ΠΏΠ°ΠΌΡΡΡ ΠΈΡΡΠ΅ΡΠΏΠ°Π½Π°" -#: config.c:475 config.c:477 +#: config.c:516 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² %d ΡΡΡΠΎΠΊΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s" + +#: config.c:520 +#, c-format +msgid "bad config line %d in file %s" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² %d ΡΡΡΠΎΠΊΠ΅ ΡΠ°ΠΉΠ»Π° %s" + +#: config.c:524 +#, c-format +msgid "bad config line %d in standard input" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² %d ΡΡΡΠΎΠΊΠ΅ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" + +#: config.c:528 #, c-format -msgid "bad config line %d in %s %s" -msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² %d ΡΡΡΠΎΠΊΠ΅ ΡΠ°ΠΉΠ»Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ Π² %s %s" +msgid "bad config line %d in submodule-blob %s" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² %d ΡΡΡΠΎΠΊΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s" -#: config.c:593 +#: config.c:532 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s %s: %s" -msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ» Π² %s %s: %s" +msgid "bad config line %d in command line %s" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² %d ΡΡΡΠΎΠΊΠ΅ ΠΊΠΎΠΌΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ %s" -#: config.c:595 +#: config.c:536 +#, c-format +msgid "bad config line %d in %s" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² %d ΡΡΡΠΎΠΊΠ΅ Π² %s" + +#: config.c:655 +msgid "out of range" +msgstr "Π²Π½Π΅ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½Π°" + +#: config.c:655 +msgid "invalid unit" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎ" + +#: config.c:661 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ»: %s" -#: config.c:680 +#: config.c:666 +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ» Π² Π΄Π²ΠΎΠΈΡΠ½ΠΎΠΌ ΠΎΠ±ΡΠ΅ΠΊΡΠ΅ %s: %s" + +#: config.c:669 +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ» Π² ΡΠ°ΠΉΠ»Π΅ %s: %s" + +#: config.c:672 +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ» Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠΌ Π²Π²ΠΎΠ΄Π΅: %s" + +#: config.c:675 +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ» Π² Π΄Π²ΠΎΠΈΡΠ½ΠΎΠΌ ΠΎΠ±ΡΠ΅ΠΊΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s: %s" + +#: config.c:678 +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ» Π½Π° ΠΊΠΎΠΌΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠ΅ %s: %s" + +#: config.c:681 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ Β«%sΒ» Π² %s: %s" + +#: config.c:768 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "ΡΠ±ΠΎΠΉ ΡΠ°Π·Π²ΠΎΡΠ°ΡΠΈΠ²Π°Π½ΠΈΡ ΠΏΡΡΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ: Β«%sΒ»" -#: config.c:761 config.c:772 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΡΠΎΠ²Π΅Π½Ρ ΡΠΆΠ°ΡΠΈΡ zlib %d" -#: config.c:890 +#: config.c:978 #, c-format msgid "invalid mode for object creation: %s" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ ΡΠ΅ΠΆΠΈΠΌ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: %s" -#: config.c:1228 +#: config.c:1312 msgid "unable to parse command-line config" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ ΠΈΠ· ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ" -#: config.c:1284 -msgid "unknown error occured while reading the configuration files" +#: config.c:1362 +msgid "unknown error occurred while reading the configuration files" msgstr "ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»Π° Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΡΡΠ΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ² ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: config.c:1629 +#: config.c:1716 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ Β«%sΒ» Π² ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ ΠΈΠ· ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ" -#: config.c:1631 +#: config.c:1718 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½Π°Ρ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ Β«%sΒ» Π² ΡΠ°ΠΉΠ»Π΅ Β«%sΒ» Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: config.c:1690 +#: config.c:1777 #, c-format msgid "%s has multiple values" msgstr "%s ΠΈΠΌΠ΅Π΅Ρ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ" -#: config.c:2224 +#: config.c:2311 #, c-format msgid "could not set '%s' to '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Β«%sΒ» Π² Β«%sΒ»" -#: config.c:2226 +#: config.c:2313 #, c-format msgid "could not unset '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ±ΡΠΎΡΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ Β«%sΒ»" -#: connected.c:69 +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "ΠΠ½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΡΠ²Π΅Ρ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΠ»ΡΡ Π΄ΠΎ Π½Π°ΡΠ°Π»Π° ΡΠ΅Π°Π½ΡΠ° ΡΠ²ΡΠ·ΠΈ" + +#: connect.c:51 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ.\n\nΠ£Π΄ΠΎΡΡΠΎΠ²Π΅ΡΡΡΠ΅ΡΡ, ΡΡΠΎ Ρ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΏΡΠ°Π²Π° Π΄ΠΎΡΡΡΠΏΠ°\nΠΈ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." + +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +msgid "Checking connectivity" +msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ" + +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ Β«git rev-listΒ»" -#: connected.c:89 +#: connected.c:95 msgid "failed write to rev-list" msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ Π² rev-list" -#: connected.c:96 +#: connected.c:102 msgid "failed to close rev-list's stdin" msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΊΡΡΡΠΈΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π° Ρ rev-list" -#: date.c:95 +#: convert.c:201 +#, c-format +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "CRLF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° LF Π² %s.\nΠ€Π°ΠΉΠ» Π±ΡΠ΄Π΅Ρ ΠΈΠΌΠ΅ΡΡ ΡΠ²ΠΎΠΈ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΠ΅ ΠΊΠΎΠ½ΡΡ ΡΡΡΠΎΠΊ Π² ΡΠ°ΡΠ΅ΠΉ ΡΠ°Π±ΠΎΡΠ΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ." + +#: convert.c:205 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "CRLF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° LF Π² %s." + +#: convert.c:211 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "LF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° CRLF Π² %s.\nΠ€Π°ΠΉΠ» Π±ΡΠ΄Π΅Ρ ΠΈΠΌΠ΅ΡΡ ΡΠ²ΠΎΠΈ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΠ΅ ΠΊΠΎΠ½ΡΡ ΡΡΡΠΎΠΊ Π² ΡΠ°ΡΠ΅ΠΉ ΡΠ°Π±ΠΎΡΠ΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ." + +#: convert.c:215 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "LF Π±ΡΠ΄Π΅Ρ Π·Π°ΠΌΠ΅Π½Π΅Π½ Π½Π° CRLF Π² %s" + +#: date.c:97 msgid "in the future" msgstr "Π² Π±ΡΠ΄ΡΡΠ΅ΠΌ" -#: date.c:101 +#: date.c:103 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" @@ -457,7 +1356,7 @@ msgstr[1] "%lu ΡΠ΅ΠΊΡΠ½Π΄Ρ Π½Π°Π·Π°Π΄" msgstr[2] "%lu ΡΠ΅ΠΊΡΠ½Π΄ Π½Π°Π·Π°Π΄" msgstr[3] "%lu ΡΠ΅ΠΊΡΠ½Π΄ Π½Π°Π·Π°Π΄" -#: date.c:108 +#: date.c:110 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" @@ -466,7 +1365,7 @@ msgstr[1] "%lu ΠΌΠΈΠ½ΡΡΡ Π½Π°Π·Π°Π΄" msgstr[2] "%lu ΠΌΠΈΠ½ΡΡ Π½Π°Π·Π°Π΄" msgstr[3] "%lu ΠΌΠΈΠ½ΡΡ Π½Π°Π·Π°Π΄" -#: date.c:115 +#: date.c:117 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" @@ -475,7 +1374,7 @@ msgstr[1] "%lu ΡΠ°ΡΠ° Π½Π°Π·Π°Π΄" msgstr[2] "%lu ΡΠ°ΡΠΎΠ² Π½Π°Π·Π°Π΄" msgstr[3] "%lu ΡΠ°ΡΠΎΠ² Π½Π°Π·Π°Π΄" -#: date.c:122 +#: date.c:124 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" @@ -484,7 +1383,7 @@ msgstr[1] "%lu Π΄Π½Ρ Π½Π°Π·Π°Π΄" msgstr[2] "%lu Π΄Π½Π΅ΠΉ Π½Π°Π·Π°Π΄" msgstr[3] "%lu Π΄Π½Π΅ΠΉ Π½Π°Π·Π°Π΄" -#: date.c:128 +#: date.c:130 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" @@ -493,7 +1392,7 @@ msgstr[1] "%lu Π½Π΅Π΄Π΅Π»ΠΈ Π½Π°Π·Π°Π΄" msgstr[2] "%lu Π½Π΅Π΄Π΅Π»Ρ Π½Π°Π·Π°Π΄" msgstr[3] "%lu Π½Π΅Π΄Π΅Π»Ρ Π½Π°Π·Π°Π΄" -#: date.c:135 +#: date.c:137 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" @@ -502,7 +1401,7 @@ msgstr[1] "%lu ΠΌΠ΅ΡΡΡΠ° Π½Π°Π·Π°Π΄" msgstr[2] "%lu ΠΌΠ΅ΡΡΡΠ΅Π² Π½Π°Π·Π°Π΄" msgstr[3] "%lu ΠΌΠ΅ΡΡΡΠ΅Π² Π½Π°Π·Π°Π΄" -#: date.c:146 +#: date.c:148 #, c-format msgid "%lu year" msgid_plural "%lu years" @@ -512,7 +1411,7 @@ msgstr[2] "%lu Π»Π΅Ρ" msgstr[3] "%lu Π»Π΅Ρ" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:149 +#: date.c:151 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" @@ -521,7 +1420,7 @@ msgstr[1] "%s ΠΈ %lu ΠΌΠ΅ΡΡΡΠ° Π½Π°Π·Π°Π΄" msgstr[2] "%s ΠΈ %lu ΠΌΠ΅ΡΡΡΠ΅Π² Π½Π°Π·Π°Π΄" msgstr[3] "%s ΠΈ %lu ΠΌΠ΅ΡΡΡΠ΅Π² Π½Π°Π·Π°Π΄" -#: date.c:154 date.c:159 +#: date.c:156 date.c:161 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" @@ -535,140 +1434,321 @@ msgstr[3] "%lu Π»Π΅Ρ Π½Π°Π·Π°Π΄" msgid "failed to read orderfile '%s'" msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ orderfile Β«%sΒ»" -#: diffcore-rename.c:538 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "ΠΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π΅ΡΠΎΡΠ½ΠΎΠ΅ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ" -#: diff.c:116 +#: diff.c:62 +#, c-format +msgid "option '%s' requires a value" +msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Β«%sΒ» ΡΡΠ΅Π±ΡΠ΅Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ Π·Π½Π°ΡΠ΅Π½ΠΈΡ" + +#: diff.c:124 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° Π²Π΅Π»ΠΈΡΠΈΠ½Ρ ΡΡΠ΅Π·Π° (cut-off) Ρ dirstat Β«%sΒ»\n" -#: diff.c:121 +#: diff.c:129 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ dirstat: Β«%sΒ»\n" -#: diff.c:225 +#: diff.c:283 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ Β«diff.submoduleΒ»: Β«%sΒ»" -#: diff.c:277 +#: diff.c:346 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "ΠΠ°ΠΉΠ΄Π΅Π½Ρ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ Β«diff.dirstatΒ»:\n%s" -#: diff.c:3007 +#: diff.c:3087 #, c-format msgid "external diff died, stopping at %s" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΡΠ°Π²Π½Π΅Π½ΠΈΠΈ, ΠΎΡΡΠ°Π½ΠΎΠ² Π½Π° %s" -#: diff.c:3405 +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-only, --name-status, --check ΠΈ -s Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" + +#: diff.c:3502 msgid "--follow requires exactly one pathspec" msgstr "--follow ΡΡΠ΅Π±ΡΠ΅Ρ ΡΠΎΠ²Π½ΠΎ ΠΎΠ΄Π½ΠΎΠΉ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΠΏΡΡΠΈ" -#: diff.c:3568 +#: diff.c:3665 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΎΠΏΡΠΈΠΈ --dirstat/-X :\n%s" -#: diff.c:3582 +#: diff.c:3679 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΎΠΏΡΠΈΠΈ --submodule: Β«%sΒ»" -#: dir.c:1823 +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." +msgstr "Π½Π΅ΡΠΎΡΠ½ΠΎΠ΅ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ Π±ΡΠ»ΠΎ ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ ΠΈΠ·-Π·Π° ΡΠ»ΠΈΡΠΊΠΎΠΌ Π±ΠΎΠ»ΡΡΠΎΠ³ΠΎ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Π° ΡΠ°ΠΉΠ»ΠΎΠ²." + +#: diff.c:4703 +msgid "only found copies from modified paths due to too many files." +msgstr "Π½Π°ΠΉΠ΄Π΅Π½Ρ ΡΠΎΠ»ΡΠΊΠΎ ΠΊΠΎΠΏΠΈΠΈ ΠΈΠ· ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ ΠΈΠ·-Π·Π° ΡΠ»ΠΈΡΠΊΠΎΠΌ Π±ΠΎΠ»ΡΡΠΎΠ³ΠΎ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Π° ΡΠ°ΠΉΠ»ΠΎΠ²." + +#: diff.c:4706 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²Ρ Π·Π°Ρ
ΠΎΡΠΈΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΡ %s Π² ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %d ΠΈ ΠΏΠΎΠ²ΡΠΎΡΠΈΡΡ Π²ΡΠ·ΠΎΠ² ΠΊΠΎΠΌΠ°Π½Π΄Ρ." + +#: dir.c:1866 msgid "failed to get kernel name and information" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠΌΡ ΡΠ΄ΡΠ° ΠΈ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ" -#: dir.c:1942 +#: dir.c:1985 msgid "Untracked cache is disabled on this system or location." msgstr "ΠΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠΊΠ»ΡΡΠ΅Π½ Π½Π° ΡΡΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΠ΅ ΠΈΠ»ΠΈ Π² ΡΡΠΎΠΌ ΠΌΠ΅ΡΡΠ΅." -#: gpg-interface.c:166 gpg-interface.c:235 -msgid "could not run gpg." -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ gpg." +#: fetch-pack.c:213 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ΠΏΠ΅ΡΠ΅Π΄Π°ΡΠ° ΡΠΏΠΈΡΠΊΠ° Π΄Π»Ρ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΡΡΠΈ" + +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "git fetch-pack: ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ACK/NAK, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ EOF" + +#: fetch-pack.c:243 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ACK/NAK, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ Β«%sΒ»" + +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc ΡΡΠ΅Π±ΡΠ΅Ρ multi_ack_detailed" + +#: fetch-pack.c:381 +#, c-format +msgid "invalid shallow line: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ: %s" + +#: fetch-pack.c:387 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° ΠΏΠΎΠ»Π½ΠΎΠ³ΠΎ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ: %s" + +#: fetch-pack.c:389 +#, c-format +msgid "object not found: %s" +msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½: %s" + +#: fetch-pack.c:392 +#, c-format +msgid "error in object: %s" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΎΠ±ΡΠ΅ΠΊΡΠ΅: %s" + +#: fetch-pack.c:394 +#, c-format +msgid "no shallow found: %s" +msgstr "ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½: %s" + +#: fetch-pack.c:397 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ shallow/unshallow, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s" + +#: fetch-pack.c:436 +#, c-format +msgid "got %s %d %s" +msgstr "ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s %d %s" + +#: fetch-pack.c:450 +#, c-format +msgid "invalid commit %s" +msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s" + +#: fetch-pack.c:483 +msgid "giving up" +msgstr "ΠΎΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Ρ Π΄Π°Π»ΡΠ½Π΅ΠΉΡΠΈΠ΅ ΠΏΠΎΠΏΡΡΠΊΠΈ" + +#: fetch-pack.c:493 progress.c:235 +msgid "done" +msgstr "Π³ΠΎΡΠΎΠ²ΠΎ" + +#: fetch-pack.c:505 +#, c-format +msgid "got %s (%d) %s" +msgstr "ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s (%d) %s" + +#: fetch-pack.c:551 +#, c-format +msgid "Marking %s as complete" +msgstr "ΠΠΎΠΌΠ΅ΡΠ°Ρ %s ΠΊΠ°ΠΊ Π·Π°Π²Π΅ΡΡΠ΅Π½Π½ΡΠΉ" + +#: fetch-pack.c:697 +#, c-format +msgid "already have %s (%s)" +msgstr "ΡΠΆΠ΅ Π΅ΡΡΡ %s (%s)" + +#: fetch-pack.c:735 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ°Π·Π±ΠΎΡΠ° Π΄Π°Π½Π½ΡΡ
" + +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΎΡΠΎΠΊΠΎΠ»Π°: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ ΠΏΠΎΡΠΎΠΊΠ°" + +#: fetch-pack.c:799 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ %s" + +#: fetch-pack.c:815 +#, c-format +msgid "%s failed" +msgstr "%s Π·Π°Π²Π΅ΡΡΠ΅Π½ Ρ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ" + +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»Π° ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ΅ ΡΠ°Π·Π±ΠΎΡΠ° Π΄Π°Π½Π½ΡΡ
" -#: gpg-interface.c:178 -msgid "gpg did not accept the data" -msgstr "gpg Π½Π΅ ΠΏΡΠΈΠ½ΡΠ» Π΄Π°Π½Π½ΡΠ΅" +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΊΠ»ΠΈΠ΅Π½ΡΠΎΠ² Ρ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ΠΌ" -#: gpg-interface.c:189 +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ multi_ack_detailed" + +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ no-done" + +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ multi_ack" + +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ side-band-64k" + +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ side-band" + +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ allow-tip-sha1-in-want" + +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ allow-reachable-sha1-in-want" + +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ofs-delta" + +#: fetch-pack.c:890 +#, c-format +msgid "Server version is %.*s" +msgstr "ΠΠ΅ΡΡΠΈΡ ΡΠ΅ΡΠ²Π΅ΡΠ° %.*s" + +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ --shallow-since" + +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ --shallow-exclude" + +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "Π‘Π΅ΡΠ²Π΅Ρ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ --deepen" + +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "Π½Π΅ ΠΎΠ±ΡΠΈΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" + +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠΈ Π΄Π°Π½Π½ΡΡ
." + +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "Π½Π΅Ρ ΡΠΎΠΎΡΠ²Π΅ΡΡΠ²ΡΡΡΠ΅Π³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π΅ΡΠΊΡ" + +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅" -#: gpg-interface.c:222 -#, c-format -msgid "could not create temporary file '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Β«%sΒ»" +#: gpg-interface.c:215 +msgid "could not create temporary file" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ»" -#: gpg-interface.c:224 +#: gpg-interface.c:217 #, c-format msgid "failed writing detached signature to '%s'" msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΠΎΠΉ ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ Π² Β«%sΒ»" -#: grep.c:1718 +#: grep.c:1782 #, c-format msgid "'%s': unable to read %s" msgstr "Β«%sΒ»: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠ΅ΡΡΡ %s" -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Β«%sΒ»" -#: grep.c:1746 +#: grep.c:1810 #, c-format msgid "'%s': short read" msgstr "Β«%sΒ»: ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ°Π»ΠΎ Π΄Π°Π½Π½ΡΡ
ΠΏΡΠΎΡΠΈΡΠ°Π½ΠΎ" -#: help.c:205 +#: help.c:203 #, c-format msgid "available git commands in '%s'" msgstr "Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ git Π² Β«%sΒ»" -#: help.c:212 +#: help.c:210 msgid "git commands available from elsewhere on your $PATH" msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Ρ git, Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ Π² Π΄ΡΡΠ³ΠΈΡ
ΠΌΠ΅ΡΡΠ°Ρ
Π²Π°ΡΠ΅Π³ΠΎ $PATH" -#: help.c:244 +#: help.c:241 msgid "These are common Git commands used in various situations:" msgstr "Π‘ΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Git ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΡΠ΅ Π² ΡΠ°Π·Π»ΠΈΡΠ½ΡΡ
ΡΠΈΡΡΠ°ΡΠΈΡΡ
:" -#: help.c:309 +#: help.c:306 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "Β«%sΒ» ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Ρ git, Π½ΠΎ Π½Π°ΠΌ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΅Π΅ Π·Π°ΠΏΡΡΡΠΈΡΡ. ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, git-%s Π½Π΅ ΡΠ°Π±ΠΎΡΠ°Π΅Ρ?" -#: help.c:366 +#: help.c:361 msgid "Uh oh. Your system reports no Git commands at all." msgstr "ΠΠΉ-ΡΠΉ! ΠΠ°ΡΠ° ΡΠΈΡΡΠ΅ΠΌΠ° Π½Π΅ ΡΠΎΠΎΠ±ΡΠ°Π΅Ρ Π½ΠΈ ΠΎ ΠΊΠ°ΠΊΠΈΡ
ΠΊΠΎΠΌΠ°Π½Π΄Π°Ρ
Git Π²ΠΎΠΎΠ±ΡΠ΅." -#: help.c:388 +#: help.c:383 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "ΠΠΠΠΠΠΠΠ: ΠΡ Π²ΡΠ·Π²Π°Π»ΠΈ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Git Β«%sΒ», Π½ΠΎ ΡΠ°ΠΊΠΎΠΉ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ.\nΠΡΠΎΠ΄ΠΎΠ»ΠΆΠ°Π΅ΠΌ Ρ ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ΠΌ, ΡΡΠΎ Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ Β«%sΒ»" -#: help.c:393 +#: help.c:388 #, c-format msgid "in %0.1f seconds automatically..." msgstr "ΡΠ΅ΡΠ΅Π· %0.1f ΡΠ΅ΠΊΡΠ½Π΄ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈβ¦" -#: help.c:400 +#: help.c:395 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ git. Π‘ΠΌΠΎΡΡΠΈΡΠ΅ Β«git --helpΒ»." -#: help.c:404 help.c:464 +#: help.c:399 help.c:465 msgid "" "\n" "Did you mean this?" @@ -680,11 +1760,26 @@ msgstr[1] "\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ ΡΡΠΎ-ΡΠΎ ΠΈΠ· ΡΡ msgstr[2] "\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ ΡΡΠΎ-ΡΠΎ ΠΈΠ· ΡΡΠΎΠ³ΠΎ?" msgstr[3] "\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ ΡΡΠΎ-ΡΠΎ ΠΈΠ· ΡΡΠΎΠ³ΠΎ?" -#: help.c:460 +#: help.c:461 #, c-format msgid "%s: %s - %s" msgstr "%s: %s β %s" +#: ident.c:334 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "\n*** ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΠΌΠ½Π΅ ΠΊΡΠΎ Π²Ρ Π΅ΡΡΡ.\n\nΠΠ°ΠΏΡΡΡΠΈΡΠ΅\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"ΠΠ°ΡΠ΅ ΠΠΌΡ\"\n\nΠ΄Π»Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΎΠ½Π½ΡΡ
Π΄Π°Π½Π½ΡΡ
Π°ΠΊΠΊΠ°ΡΠ½ΡΠ° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ.\nΠΡΠΎΠΏΡΡΡΠΈΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --global Π΄Π»Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ Π΄Π°Π½Π½ΡΡ
ΡΠΎΠ»ΡΠΊΠΎ Π΄Π»Ρ ΡΡΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ.\n\n" + #: lockfile.c:152 #, c-format msgid "" @@ -706,237 +1801,223 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Β«%s.lockΒ»: %s" msgid "failed to read the cache" msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΊΡΡΠ°" -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 -#: builtin/checkout.c:586 builtin/clone.c:732 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 +#: builtin/checkout.c:588 builtin/clone.c:731 msgid "unable to write new index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: merge-recursive.c:189 -#, c-format +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "(ΠΏΠ»ΠΎΡ
ΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ)\n" -#: merge-recursive.c:209 +#: merge-recursive.c:231 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "ΡΠ±ΠΎΠΉ addinfo_cache Π΄Π»Ρ ΠΏΡΡΠΈ Β«%sΒ»" -#: merge-recursive.c:270 +#: merge-recursive.c:301 msgid "error building trees" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΡΡΡΠΎΠ΅Π½ΠΈΠΈ Π΄Π΅ΡΠ΅Π²ΡΠ΅Π²" -#: merge-recursive.c:689 +#: merge-recursive.c:720 #, c-format msgid "failed to create path '%s'%s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΏΡΡΡ Β«%sΒ»%s" -#: merge-recursive.c:700 +#: merge-recursive.c:731 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ %s, ΡΡΠΎΠ±Ρ ΠΎΡΠ²ΠΎΠ±ΠΎΠ΄ΠΈΡΡ ΠΌΠ΅ΡΡΠΎ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²\n" -#: merge-recursive.c:714 merge-recursive.c:735 +#: merge-recursive.c:745 merge-recursive.c:764 msgid ": perhaps a D/F conflict?" msgstr ": Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/ΡΠ°ΠΉΠ»ΠΎΠ²?" -#: merge-recursive.c:725 +#: merge-recursive.c:754 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "ΠΎΡΠΊΠ°Π· ΠΏΠΎΡΠ΅ΡΠΈ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° Π² Β«%sΒ»" -#: merge-recursive.c:765 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ %s Β«%sΒ»" -#: merge-recursive.c:767 +#: merge-recursive.c:798 #, c-format msgid "blob expected for %s '%s'" msgstr "ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π»Ρ %s Β«%sΒ»" -#: merge-recursive.c:790 builtin/clone.c:376 +#: merge-recursive.c:822 #, c-format -msgid "failed to open '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" +msgid "failed to open '%s': %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»: %s" -#: merge-recursive.c:798 +#: merge-recursive.c:833 #, c-format -msgid "failed to symlink '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ Β«%sΒ»" +msgid "failed to symlink '%s': %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ Β«%sΒ»: %s" -#: merge-recursive.c:801 +#: merge-recursive.c:838 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "Π½Π΅ ΠΏΠΎΠ½ΡΡΠ½ΠΎ, ΡΡΠΎ Π΄Π΅Π»Π°ΡΡ Ρ %06o %s Β«%sΒ»" -#: merge-recursive.c:939 +#: merge-recursive.c:978 msgid "Failed to execute internal merge" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ Π²Π½ΡΡΡΠ΅Π½Π½Π΅Π΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅" -#: merge-recursive.c:943 +#: merge-recursive.c:982 #, c-format msgid "Unable to add %s to database" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ %s Π² Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
" -#: merge-recursive.c:959 -msgid "unsupported object type in the tree" -msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠΈΠΏΠ° Π² Π΄Π΅ΡΠ΅Π²Π΅" - -#: merge-recursive.c:1034 merge-recursive.c:1048 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "ΠΠΠΠ€ΠΠΠΠ’ (%s/ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅): %s ΡΠ΄Π°Π»Π΅Π½ΠΎ Π² %s ΠΈ %s Π² %s. ΠΠ΅ΡΡΠΈΡ %s ΠΈΠ· %s ΠΎΡΡΠ°Π²Π»Π΅Π½Π° Π² Π΄Π΅ΡΠ΅Π²Π΅." -#: merge-recursive.c:1040 merge-recursive.c:1053 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "ΠΠΠΠ€ΠΠΠΠ’ (%s/ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅): %s ΡΠ΄Π°Π»Π΅Π½ΠΎ Π² %s ΠΈ %s Π² %s. ΠΠ΅ΡΡΠΈΡ %s ΠΈΠ· %s ΠΎΡΡΠ°Π²Π»Π΅Π½Π° Π² Π΄Π΅ΡΠ΅Π²Π΅ Π½Π° %s." -#: merge-recursive.c:1094 +#: merge-recursive.c:1143 msgid "rename" msgstr "ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅" -#: merge-recursive.c:1094 +#: merge-recursive.c:1143 msgid "renamed" msgstr "ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΎ" -#: merge-recursive.c:1150 +#: merge-recursive.c:1200 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s β ΡΡΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π² %s, Π΄ΠΎΠ±Π°Π²Π»ΡΠ΅ΠΌ ΠΊΠ°ΠΊ %s Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ" -#: merge-recursive.c:1172 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "ΠΠΠΠ€ΠΠΠΠ’ (ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅): ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ Β«%sΒ»βΒ«%sΒ» Π² Π²Π΅ΡΠΊΠ΅ Β«%sΒ» ΠΈ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ Β«%sΒ»βΒ«%sΒ» Π² Π²Π΅ΡΠΊΠ΅ Β«%sΒ»%s" -#: merge-recursive.c:1177 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (ΠΎΡΡΠ°Π²Π»Π΅Π½ΠΎ Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠΌ)" -#: merge-recursive.c:1231 +#: merge-recursive.c:1292 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "ΠΠΠΠ€ΠΠΠΠ’ (ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅): ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ Β«%sΒ»βΒ«%sΒ» Π² Π²Π΅ΡΠΊΠ΅ Β«%sΒ» ΠΈ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ Β«%sΒ»βΒ«%sΒ» Π² Π²Π΅ΡΠΊΠ΅ Β«%sΒ»" -#: merge-recursive.c:1261 +#: merge-recursive.c:1325 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²ΡΠ²Π°Ρ %s Π² %s ΠΈ %s Π² %s Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ" -#: merge-recursive.c:1460 +#: merge-recursive.c:1531 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "ΠΠΠΠ€ΠΠΠΠ’ (ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅/Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅): ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ Β«%sΒ»βΒ«%sΒ» Π² Π²Π΅ΡΠΊΠ΅ Β«%sΒ» ΠΈ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Β«%sΒ» Π² Π²Π΅ΡΠΊΠ΅ Β«%sΒ»" -#: merge-recursive.c:1470 +#: merge-recursive.c:1546 #, c-format msgid "Adding merged %s" msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ»ΠΈΡΠΎΠ³ΠΎ %s" -#: merge-recursive.c:1475 merge-recursive.c:1677 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format msgid "Adding as %s instead" msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΊΠ°ΠΊ %s" -#: merge-recursive.c:1526 +#: merge-recursive.c:1610 #, c-format msgid "cannot read object %s" msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»" -#: merge-recursive.c:1529 +#: merge-recursive.c:1613 #, c-format msgid "object %s is not a blob" msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΌ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠΌ" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modify" msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modified" msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ" -#: merge-recursive.c:1591 +#: merge-recursive.c:1676 msgid "content" msgstr "ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅" -#: merge-recursive.c:1598 +#: merge-recursive.c:1683 msgid "add/add" msgstr "Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅/Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅" -#: merge-recursive.c:1632 +#: merge-recursive.c:1718 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "ΠΡΠΎΠΏΡΡΠΊ %s (ΡΠ»ΠΈΡΡ ΠΎΠ΄ΠΈΠ½Π°ΠΊΠΎΠ²ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠ°ΠΊ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1732 #, c-format msgid "Auto-merging %s" msgstr "ΠΠ²ΡΠΎΡΠ»ΠΈΡΠ½ΠΈΠ΅ %s" -#: merge-recursive.c:1650 git-submodule.sh:941 +#: merge-recursive.c:1736 git-submodule.sh:924 msgid "submodule" msgstr "ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: merge-recursive.c:1651 +#: merge-recursive.c:1737 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "ΠΠΠΠ€ΠΠΠΠ’ (%s): ΠΠΎΠ½ΡΠ»ΠΈΠΊΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π² %s" -#: merge-recursive.c:1737 +#: merge-recursive.c:1831 #, c-format msgid "Removing %s" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ %s" -#: merge-recursive.c:1762 +#: merge-recursive.c:1857 msgid "file/directory" msgstr "ΡΠ°ΠΉΠ»/ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: merge-recursive.c:1768 +#: merge-recursive.c:1863 msgid "directory/file" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³/ΡΠ°ΠΉΠ»" -#: merge-recursive.c:1773 +#: merge-recursive.c:1868 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "ΠΠΠΠ€ΠΠΠΠ’ (%s): Π£ΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Ρ ΠΈΠΌΠ΅Π½Π΅ΠΌ Β«%sΒ» Π² Β«%sΒ». ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Β«%sΒ» ΠΊΠ°ΠΊ Β«%sΒ»" -#: merge-recursive.c:1781 +#: merge-recursive.c:1877 #, c-format msgid "Adding %s" msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ %s" -#: merge-recursive.c:1798 -msgid "Fatal merge failure, shouldn't happen." -msgstr "ΠΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ, ΡΠ°ΠΊΠΎΠ³ΠΎ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ½ΠΎ ΡΠ»ΡΡΠ°ΡΡΡΡ." - -#: merge-recursive.c:1817 +#: merge-recursive.c:1914 msgid "Already up-to-date!" msgstr "Π£ΠΆΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ!" -#: merge-recursive.c:1826 +#: merge-recursive.c:1923 #, c-format msgid "merging of trees %s and %s failed" msgstr "ΡΠ±ΠΎΠΉ ΡΠ»ΠΈΡΠ½ΠΈΡ Π΄Π΅ΡΠ΅Π²ΡΠ΅Π² Β«%sΒ» ΠΈ Β«%sΒ»" -#: merge-recursive.c:1856 -#, c-format -msgid "Unprocessed path??? %s" -msgstr "ΠΠ΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΠΏΡΡΡ??? %s" - -#: merge-recursive.c:1904 +#: merge-recursive.c:2006 msgid "Merging:" msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅:" -#: merge-recursive.c:1917 +#: merge-recursive.c:2019 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -945,19 +2026,31 @@ msgstr[1] "Π½Π°ΠΉΠ΄Π΅Π½ΠΎ %u ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠ°:" msgstr[2] "Π½Π°ΠΉΠ΄Π΅Π½ΠΎ %u ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠΎΠ²:" msgstr[3] "Π½Π°ΠΉΠ΄Π΅Π½ΠΎ %u ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠΎΠ²:" -#: merge-recursive.c:1954 +#: merge-recursive.c:2058 msgid "merge returned no commit" msgstr "ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ Π²Π΅ΡΠ½ΡΠ»ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ" -#: merge-recursive.c:2011 +#: merge-recursive.c:2121 #, c-format msgid "Could not parse object '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»" -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 msgid "Unable to write index." msgstr "ΠΠ΅ ΡΠ΄Π°Π΅ΡΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ." +#: notes-merge.c:273 +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge." +msgstr "ΠΡ Π½Π΅ Π·Π°ΠΊΠΎΠ½ΡΠΈΠ»ΠΈ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ (%s ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ).\nΠΠ°ΠΏΡΡΡΠΈΡΠ΅ Β«git notes merge --commitΒ» ΠΈΠ»ΠΈ Β«git notes merge --abortΒ» Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΠΈΠ»ΠΈ ΠΎΡΠΌΠ΅Π½Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ ΠΈ Π·Π°ΠΏΡΡΠΊΠ° Π½ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ." + +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "ΠΡ Π½Π΅ Π·Π°ΠΊΠΎΠ½ΡΠΈΠ»ΠΈ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ (%s ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ)." + #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "ΠΠ΅Π»ΡΠ·Ρ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ Π½Π΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΠΈΠ»ΠΈ Π½Π΅ ΠΈΠΌΠ΅ΡΡΠ΅Π΅ ΡΡΡΠ»ΠΎΠΊ Π΄Π΅ΡΠ΅Π²ΠΎ Π·Π°ΠΌΠ΅ΡΠΎΠΊ" @@ -1014,7 +2107,7 @@ msgstr "-ΠΠΠΠΠ§ΠΠ‘Π’ΠΠ" msgid "malformed object name '%s'" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Β«%sΒ»" -#: path.c:796 +#: path.c:826 #, c-format msgid "Could not make %s writable by group" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠ΅Π΄ΠΎΡΡΠ°Π²ΠΈΡΡ Π΄ΠΎΡΡΡΠΏ ΠΊ %s Π½Π° Π·Π°ΠΏΠΈΡΡ" @@ -1068,12 +2161,18 @@ msgstr "Π‘ΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ Β«%sΒ» Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ Β«%.*sΒ»" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: ΠΌΠ°Π³ΠΈΡΠ΅ΡΠΊΠΈΠ΅ ΡΠ»ΠΎΠ²Π° Π² ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΠΏΡΡΠΈ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°ΡΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ: %s" -#: pathspec.c:433 +#: pathspec.c:408 +msgid "" +"empty strings as pathspecs will be made invalid in upcoming releases. please" +" use . instead if you meant to match all paths" +msgstr "ΠΏΡΡΡΡΠ΅ ΡΡΡΠΎΠΊΠΈ ΠΊΠ°ΠΊ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡΡ ΠΏΡΡΠΈ Π±ΡΠ΄ΡΡ ΡΠ΄Π΅Π»Π°Π½Ρ Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΌΠΈ Π² ΡΠ»Π΅Π΄ΡΡΡΠΈΡ
Π²Π΅ΡΡΠΈΡΡ
. ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π²ΠΌΠ΅ΡΡΠΎ Π½ΠΈΡ
Β«.Β», ΡΡΠΎ Π·Π½Π°ΡΠΈΡ ΡΠΎΠΎΡΠ²Π΅ΡΡΠ²ΠΈΠ΅ Π²ΡΠ΅ΠΌ ΠΏΡΡΡΠΌ" + +#: pathspec.c:440 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ Β«%sΒ» Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" -#: pathspec.c:442 +#: pathspec.c:449 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1083,41 +2182,36 @@ msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ ΡΠ°Π±Π»ΠΎΠ½ Π΄Π»Ρ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡ msgid "unable to parse --pretty format" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΡΠΌΠ°Ρ Π΄Π»Ρ --pretty" -#: progress.c:235 -msgid "done" -msgstr "Π³ΠΎΡΠΎΠ²ΠΎ" - -#: read-cache.c:1281 +#: read-cache.c:1315 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "index.version ΡΠΊΠ°Π·Π°Π½, Π½ΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΡ Π²Π΅ΡΡΠΈΡ %i" -#: read-cache.c:1291 +#: read-cache.c:1325 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "GIT_INDEX_VERSION ΡΠΊΠ°Π·Π°Π½, Π½ΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΡ Π²Π΅ΡΡΠΈΡ %i" -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 -#: builtin/merge.c:995 +#: refs.c:576 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ" -#: refs/files-backend.c:2243 +#: refs/files-backend.c:2481 #, c-format msgid "could not delete reference %s: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ %s: %s" -#: refs/files-backend.c:2246 +#: refs/files-backend.c:2484 #, c-format msgid "could not delete references: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΠΈ: %s" -#: refs/files-backend.c:2255 +#: refs/files-backend.c:2493 #, c-format msgid "could not remove reference %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΠΈ %s" @@ -1246,12 +2340,12 @@ msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΡΡ ΡΡΡΠ»ΠΊΡ Ρ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΌ ΠΈΠΌΠ΅Π½Π΅ΠΌ msgid "ignoring broken ref %s" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΡΡ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ %s" -#: ref-filter.c:1651 +#: ref-filter.c:1633 #, c-format msgid "format: %%(end) atom missing" msgstr "format: ΠΏΡΠΎΠΏΡΡΠ΅Π½Π° ΡΠ°ΡΡΠΈΡΠ° %%(end)" -#: ref-filter.c:1705 +#: ref-filter.c:1687 #, c-format msgid "malformed object name %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s" @@ -1275,63 +2369,63 @@ msgstr "%s ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅Ρ ΠΈ %s ΠΈ %s" msgid "Internal error" msgstr "ΠΠ½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ°" -#: remote.c:1678 remote.c:1721 +#: remote.c:1677 remote.c:1720 msgid "HEAD does not point to a branch" msgstr "HEAD Π½Π΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° Π²Π΅ΡΠΊΡ" -#: remote.c:1687 +#: remote.c:1686 #, c-format msgid "no such branch: '%s'" msgstr "Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΈ: Β«%sΒ»" -#: remote.c:1690 +#: remote.c:1689 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° Π½Π΅ Π½Π°ΡΡΡΠΎΠ΅Π½Π° Π΄Π»Ρ Π²Π΅ΡΠΊΠΈ Β«%sΒ»" -#: remote.c:1696 +#: remote.c:1695 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π° ΠΊΠ°ΠΊ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ°" -#: remote.c:1711 +#: remote.c:1710 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ Β«%sΒ» Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΡΠ²Π΅ΡΠ΅ Β«%sΒ» Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠΈ" -#: remote.c:1726 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Π²Π΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΡΠ²Π΅ΡΠ° Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: remote.c:1737 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΠΏΡΡΠΈ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ Β«%sΒ» Π½Π΅ Π²ΠΊΠ»ΡΡΠ°ΡΡ Π² ΡΠ΅Π±Ρ Β«%sΒ»" -#: remote.c:1750 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "ΠΎΡΠΏΡΠ°Π²ΠΊΠ° Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΡΠΊΠΈ Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ (push.default Π²ΡΡΡΠ°Π²Π»Π΅Π½ Π² Β«nothingΒ»)" -#: remote.c:1772 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Β«simpleΒ» ΠΎΡΠΏΡΠ°Π²ΠΊΡ Π² Π΅Π΄ΠΈΠ½ΡΡΠ²Π΅Π½Π½ΡΡ ΡΠΎΡΠΊΡ Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ" -#: remote.c:2074 +#: remote.c:2073 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° Π±Π°Π·ΠΈΡΡΠ΅ΡΡΡ Π½Π° Β«%sΒ», Π½ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΈΡΡΠ΅Π·.\n" -#: remote.c:2078 +#: remote.c:2077 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "(Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git branch --unset-upstreamΒ»)\n" -#: remote.c:2081 +#: remote.c:2080 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π° Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ Β«%sΒ».\n" -#: remote.c:2085 +#: remote.c:2084 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" @@ -1340,11 +2434,11 @@ msgstr[1] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠΏΠ΅ΡΠ΅ΠΆΠ°Π΅Ρ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠ°. msgstr[2] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠΏΠ΅ΡΠ΅ΠΆΠ°Π΅Ρ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ².\n" msgstr[3] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠΏΠ΅ΡΠ΅ΠΆΠ°Π΅Ρ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ².\n" -#: remote.c:2091 +#: remote.c:2090 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git pushΒ», ΡΡΠΎΠ±Ρ ΠΎΠΏΡΠ±Π»ΠΈΠΊΠΎΠ²Π°ΡΡ Π²Π°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ)\n" -#: remote.c:2094 +#: remote.c:2093 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1354,11 +2448,11 @@ msgstr[1] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΡΡΡΠ°Π΅Ρ ΠΎΡ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠ° msgstr[2] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΡΡΡΠ°Π΅Ρ ΠΎΡ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² ΠΈ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°Π½Π° Π²ΠΏΠ΅ΡΠ΅Π΄.\n" msgstr[3] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΡΡΡΠ°Π΅Ρ ΠΎΡ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² ΠΈ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°Π½Π° Π²ΠΏΠ΅ΡΠ΅Π΄.\n" -#: remote.c:2102 +#: remote.c:2101 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git pullΒ», ΡΡΠΎΠ±Ρ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π²Π°ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ)\n" -#: remote.c:2105 +#: remote.c:2104 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1371,284 +2465,336 @@ msgstr[1] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΈ Β«%sΒ» ΡΠ°Π·Π΄Π΅Π»ΠΈΠ»ΠΈΡΡ\nΠΈ ΡΠ΅ΠΏΠ΅ΡΡ msgstr[2] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΈ Β«%sΒ» ΡΠ°Π·Π΄Π΅Π»ΠΈΠ»ΠΈΡΡ\nΠΈ ΡΠ΅ΠΏΠ΅ΡΡ ΠΈΠΌΠ΅ΡΡ %d ΠΈ %d ΡΠ°Π·Π½ΡΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π² ΠΊΠ°ΠΆΠ΄ΠΎΠΉ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²Π΅Π½Π½ΠΎ.\n" msgstr[3] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΈ Β«%sΒ» ΡΠ°Π·Π΄Π΅Π»ΠΈΠ»ΠΈΡΡ\nΠΈ ΡΠ΅ΠΏΠ΅ΡΡ ΠΈΠΌΠ΅ΡΡ %d ΠΈ %d ΡΠ°Π·Π½ΡΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π² ΠΊΠ°ΠΆΠ΄ΠΎΠΉ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²Π΅Π½Π½ΠΎ.\n" -#: remote.c:2115 +#: remote.c:2114 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git pullΒ», ΡΡΠΎΠ±Ρ ΡΠ»ΠΈΡΡ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ Π² Π²Π°ΡΡ)\n" -#: revision.c:2142 +#: revision.c:2158 msgid "your current branch appears to be broken" msgstr "ΠΏΠΎΡ
ΠΎΠΆΠ΅, Π²Π°ΡΠ° ΡΠ΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π°" -#: revision.c:2145 +#: revision.c:2161 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Π²Π°ΡΠ° ΡΠ΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° Β«%sΒ» Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½ΠΈ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: revision.c:2339 +#: revision.c:2355 msgid "--first-parent is incompatible with --bisect" msgstr "ΠΎΠΏΡΠΈΡ --first-parent Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --bisect" -#: run-command.c:92 +#: run-command.c:106 msgid "open /dev/null failed" msgstr "ΡΠ±ΠΎΠΉ ΠΎΡΠΊΡΡΡΠΈΡ /dev/null" -#: run-command.c:94 +#: run-command.c:108 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) ΡΠ±ΠΎΠΉ" -#: send-pack.c:295 +#: send-pack.c:297 msgid "failed to sign the push certificate" msgstr "ΡΠ±ΠΎΠΉ ΠΏΠΎΠ΄ΠΏΠΈΡΠ°Π½ΠΈΡ ΡΠ΅ΡΡΠΈΡΠΈΠΊΠ°ΡΠ° ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: send-pack.c:404 +#: send-pack.c:410 msgid "the receiving end does not support --signed push" msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --signed" -#: send-pack.c:406 +#: send-pack.c:412 msgid "" "not sending a push certificate since the receiving end does not support " "--signed push" msgstr "Π½Π΅ ΠΎΡΠΏΡΠ°Π²Π»ΡΠ΅ΠΌ ΡΠ΅ΡΡΠΈΡΠΈΠΊΠ°Ρ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --signed" -#: send-pack.c:418 +#: send-pack.c:424 msgid "the receiving end does not support --atomic push" msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --atomic" -#: sequencer.c:174 +#: send-pack.c:429 +msgid "the receiving end does not support push options" +msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡΠ°Ρ ΡΡΠΎΡΠΎΠ½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ" + +#: sequencer.c:171 +msgid "revert" +msgstr "ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" + +#: sequencer.c:171 +msgid "cherry-pick" +msgstr "ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ" + +#: sequencer.c:228 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ², ΠΏΠΎΠΌΠ΅ΡΡΡΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΡΠΈ\nΡ ΠΏΠΎΠΌΠΎΡΡΡ Β«git add <ΠΏΡΡΠΈ>Β» ΠΈΠ»ΠΈ Β«git rm <ΠΏΡΡΠΈ>Β»" -#: sequencer.c:177 +#: sequencer.c:231 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ², ΠΏΠΎΠΌΠ΅ΡΡΡΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΡΠΈ\nΡ ΠΏΠΎΠΌΠΎΡΡΡ Β«git add <ΠΏΡΡΠΈ>Β» ΠΈΠ»ΠΈ Β«git rm <ΠΏΡΡΠΈ>Β»\nΠΈ ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git commitΒ»" -#: sequencer.c:190 sequencer.c:833 sequencer.c:912 +#: sequencer.c:244 sequencer.c:1209 +#, c-format +msgid "could not lock '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ Β«%sΒ»" + +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 #, c-format -msgid "Could not write to %s" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² %s" +msgid "could not write to '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² Β«%sΒ»" -#: sequencer.c:193 +#: sequencer.c:251 #, c-format -msgid "Error wrapping up %s" -msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΎΠ±ΠΎΡΠ°ΡΠΈΠ²Π°Π½ΠΈΡ %s" +msgid "could not write eol to '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ eol Π² Β«%sΒ»" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΎΡΠ±ΠΎΡΠΎΠΌ Π»ΡΡΡΠ΅Π³ΠΎ." +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#, c-format +msgid "failed to finalize '%s'." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π²Π΅ΡΡΠΈΡΡ Β«%sΒ»." + +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" + +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "Π²Π°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ %s." -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ Π²ΠΎΠ·Π²ΡΠ°ΡΠΎΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°." +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "Π΄Π»Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ ΠΈΡ
." -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "Π‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ." +#: sequencer.c:324 +#, c-format +msgid "%s: fast-forward" +msgstr "%s: ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:300 +#: sequencer.c:399 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: sequencer.c:318 -msgid "Could not resolve HEAD commit\n" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD ΠΊΠΎΠΌΠΌΠΈΡ\n" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°ΡΠΏΠΎΠ·Π½Π°ΡΡ HEAD ΠΊΠΎΠΌΠΌΠΈΡ\n" + +#: sequencer.c:438 +msgid "unable to update cache tree\n" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΠΊΡΡΠ°\n" -#: sequencer.c:338 -msgid "Unable to update cache tree\n" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΠΊΡΡΠ°\n" +#: sequencer.c:483 +#, c-format +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "Ρ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅. ΠΡΠ»ΠΈ ΡΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΎΠ±ΡΠ΅Π΄Π΅Π½Π΅Π½Ρ Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit --amend %s\n\nΠΡΠ»ΠΈ ΠΆΠ΅ ΠΎΠ½ΠΈ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΏΠΎΠΌΠ΅ΡΠ΅Π½Ρ Π² Π½ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit %s\n\nΠ Π»ΡΠ±ΠΎΠΌ ΡΠ»ΡΡΠ°Π΅, ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ³ΠΎ ΠΊΠ°ΠΊ Π²Ρ Π·Π°ΠΊΠΎΠ½ΡΠΈΡΠ΅, ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΠ²:\n\n git rebase --continue\n" -#: sequencer.c:390 +#: sequencer.c:567 #, c-format -msgid "Could not parse commit %s\n" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s\n" +msgid "could not parse commit %s\n" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s\n" -#: sequencer.c:395 +#: sequencer.c:572 #, c-format -msgid "Could not parse parent commit %s\n" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s\n" +msgid "could not parse parent commit %s\n" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s\n" -#: sequencer.c:460 -msgid "Your index file is unmerged." -msgstr "ΠΠ°Ρ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π΅ ΡΠ»ΠΈΡ." +#: sequencer.c:656 +msgid "your index file is unmerged." +msgstr "Π²Π°Ρ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΡΠ»ΠΈΡ." -#: sequencer.c:479 +#: sequencer.c:675 #, c-format -msgid "Commit %s is a merge but no -m option was given." -msgstr "ΠΠΎΠΌΠΌΠΈΡ %s β ΡΡΠΎ ΠΊΠΎΠΌΠΌΠΈΡ-ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π½ΠΎ ΠΎΠΏΡΠΈΡ -m Π½Π΅ ΡΠΊΠ°Π·Π°Π½Π°." +msgid "commit %s is a merge but no -m option was given." +msgstr "ΠΊΠΎΠΌΠΌΠΈΡ %s β ΡΡΠΎ ΠΊΠΎΠΌΠΌΠΈΡ-ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π½ΠΎ ΠΎΠΏΡΠΈΡ -m Π½Π΅ ΡΠΊΠ°Π·Π°Π½Π°." -#: sequencer.c:487 +#: sequencer.c:683 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "Π£ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s Π½Π΅Ρ ΠΏΡΠ΅Π΄ΠΊΠ° %d" +msgid "commit %s does not have parent %d" +msgstr "Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s Π½Π΅Ρ ΠΏΡΠ΅Π΄ΠΊΠ° %d" -#: sequencer.c:491 +#: sequencer.c:687 #, c-format -msgid "Mainline was specified but commit %s is not a merge." -msgstr "ΠΡΠ½ΠΎΠ²Π½Π°Ρ Π²Π΅ΡΠΊΠ° ΡΠΊΠ°Π·Π°Π½Π°, Π½ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ." +msgid "mainline was specified but commit %s is not a merge." +msgstr "ΠΎΡΠ½ΠΎΠ²Π½Π°Ρ Π²Π΅ΡΠΊΠ° ΡΠΊΠ°Π·Π°Π½Π°, Π½ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ." -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: sequencer.c:504 +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:700 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π΄Π»Ρ %s" -#: sequencer.c:508 +#: sequencer.c:705 #, c-format -msgid "Cannot get commit message for %s" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ %s" +msgid "cannot get commit message for %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ %s" -#: sequencer.c:594 +#: sequencer.c:797 #, c-format msgid "could not revert %s... %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %sβ¦ %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %sβ¦ %s" -#: sequencer.c:595 +#: sequencer.c:798 #, c-format msgid "could not apply %s... %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %sβ¦ %s" -#: sequencer.c:630 +#: sequencer.c:833 msgid "empty commit set passed" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ ΠΏΡΡΡΠΎΠΉ Π½Π°Π±ΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" -#: sequencer.c:638 +#: sequencer.c:843 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: sequencer.c:642 +#: sequencer.c:850 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: ΡΠ±ΠΎΠΉ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: sequencer.c:702 -#, c-format -msgid "Cannot %s during a %s" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ %s Π²ΠΎ Π²ΡΠ΅ΠΌΡ %s" - -#: sequencer.c:724 +#: sequencer.c:944 #, c-format -msgid "Could not parse line %d." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΡΡΠΎΠΊΡ %d." +msgid "invalid line %d: %.*s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° %d: %.*s" -#: sequencer.c:729 -msgid "No commits parsed." -msgstr "ΠΠΎΠΌΠΌΠΈΡΡ Π½Π΅ ΡΠ°Π·ΠΎΠ±ΡΠ°Π½Ρ." +#: sequencer.c:950 +msgid "no commits parsed." +msgstr "ΠΊΠΎΠΌΠΌΠΈΡΡ Π½Π΅ ΡΠ°Π·ΠΎΠ±ΡΠ°Π½Ρ." -#: sequencer.c:741 +#: sequencer.c:966 #, c-format -msgid "Could not open %s" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s" +msgid "could not read '%s'." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»." -#: sequencer.c:745 +#: sequencer.c:972 #, c-format -msgid "Could not read %s." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s." +msgid "unusable instruction sheet: '%s'" +msgstr "Π½Π΅ΠΏΡΠΈΠ³ΠΎΠ΄Π½Π°Ρ Π΄Π»Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠ°ΡΡΠ° Ρ ΠΈΠ½ΡΡΡΡΠΊΡΠΈΡΠΌΠΈ: Β«%sΒ»" -#: sequencer.c:752 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "ΠΠ΅ΠΏΡΠΈΠ³ΠΎΠ΄Π½Π°Ρ Π΄Π»Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠ°ΡΡΠ° Ρ ΠΈΠ½ΡΡΡΡΠΊΡΠΈΡΠΌΠΈ: %s" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΏΡΠΎΡΠ΅ΡΡΠ° ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°." -#: sequencer.c:782 +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°." + +#: sequencer.c:1028 #, c-format -msgid "Invalid key: %s" -msgstr "ΠΠ΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΊΠ»ΡΡ: %s" +msgid "invalid key: %s" +msgstr "Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΊΠ»ΡΡ: %s" -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:1031 #, c-format -msgid "Invalid value for %s: %s" -msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s: %s" +msgid "invalid value for %s: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s: %s" -#: sequencer.c:795 +#: sequencer.c:1063 #, c-format -msgid "Malformed options sheet: %s" -msgstr "ΠΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½Π½Π°Ρ ΠΊΠ°ΡΡΠ° Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ: %s" +msgid "malformed options sheet: '%s'" +msgstr "ΠΈΡΠΏΠΎΡΡΠ΅Π½Π½Π°Ρ ΠΊΠ°ΡΡΠ° Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ: Β«%sΒ»" -#: sequencer.c:814 +#: sequencer.c:1101 msgid "a cherry-pick or revert is already in progress" -msgstr "ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ ΠΈΠ»ΠΈ Π²ΠΎΠ·Π²ΡΠ°Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ" +msgstr "ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΈΠ»ΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΡΡΡΡ" -#: sequencer.c:815 +#: sequencer.c:1102 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Β«git cherry-pick (--continue | --quit | --abort)Β»" -#: sequencer.c:819 +#: sequencer.c:1106 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ ΡΠ»Π΅Π΄ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² %s" +msgid "could not create sequencer directory '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ ΡΠ»Π΅Π΄ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Β«%sΒ»" -#: sequencer.c:835 sequencer.c:916 -#, c-format -msgid "Error wrapping up %s." -msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΎΠ±ΠΎΡΠ°ΡΠΈΠ²Π°Π½ΠΈΡ %s." +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ HEAD" -#: sequencer.c:854 sequencer.c:986 +#: sequencer.c:1151 sequencer.c:1289 msgid "no cherry-pick or revert in progress" -msgstr "ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ ΠΈΠ»ΠΈ Π²ΠΎΠ·Π²ΡΠ°Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½Π΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ" +msgstr "ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΈΠ»ΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΡΡΡΡ" -#: sequencer.c:856 +#: sequencer.c:1153 msgid "cannot resolve HEAD" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD" -#: sequencer.c:858 +#: sequencer.c:1155 sequencer.c:1189 msgid "cannot abort from a branch yet to be born" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Ρ Π²Π΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΠ°Ρ Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½Π°" -#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 +#: sequencer.c:1175 builtin/grep.c:578 #, c-format -msgid "cannot open %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s" +msgid "cannot open '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" -#: sequencer.c:880 +#: sequencer.c:1177 #, c-format -msgid "cannot read %s: %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s: %s" +msgid "cannot read '%s': %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»: %s" -#: sequencer.c:881 +#: sequencer.c:1178 msgid "unexpected end of file" msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠ½Π΅Ρ ΡΠ°ΠΉΠ»Π°" -#: sequencer.c:887 +#: sequencer.c:1184 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Ρ HEAD ΠΏΠ΅ΡΠ΅Π΄ ΠΎΡΠ±ΠΎΡΠΎΠΌ Π»ΡΡΡΠ΅Π³ΠΎ Β«%sΒ» ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" +msgstr "ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Ρ HEAD ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ° Β«%sΒ» ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: sequencer.c:909 -#, c-format -msgid "Could not format %s." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°ΡΡ %s." - -#: sequencer.c:1054 +#: sequencer.c:1354 #, c-format msgid "%s: can't cherry-pick a %s" -msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΎΠ±ΡΠ°ΡΡ %s" +msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s" -#: sequencer.c:1057 +#: sequencer.c:1358 #, c-format msgid "%s: bad revision" msgstr "%s: ΠΏΠ»ΠΎΡ
Π°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ" -#: sequencer.c:1091 -msgid "Can't revert as initial commit" -msgstr "ΠΠ΅Π»ΡΠ·Ρ Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΡΡ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "Π½Π΅Π»ΡΠ·Ρ Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΡΡ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: sequencer.c:1092 -msgid "Can't cherry-pick into empty head" -msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΡΠΎΠ±ΡΠ°ΡΡ Π»ΡΡΡΠ΅Π΅ Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ" +#: setup.c:160 +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "%s: Π½Π΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ ΠΏΡΡΠΈ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git <ΠΊΠΎΠΌΠ°Π½Π΄Π°> -- <ΠΏΡΡΡ>β¦Β» Π΄Π»Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΏΡΡΠ΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎ." -#: setup.c:248 +#: setup.c:173 #, c-format -msgid "failed to read %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s" +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "Π½Π΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΡΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ Β«%sΒ»: Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ ΠΈΠ»ΠΈ Π½Π΅ ΠΏΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«--Β» Π΄Π»Ρ ΠΎΡΠ΄Π΅Π»Π΅Π½ΠΈΡ ΠΏΡΡΠ΅ΠΉ ΠΎΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ, Π²ΠΎΡ ΡΠ°ΠΊ:\nΒ«git <ΠΊΠΎΠΌΠ°Π½Π΄Π°> [<ΡΠ΅Π΄Π°ΠΊΡΠΈΡ>β¦] -- [<ΡΠ°ΠΉΠ»>β¦]Β»" + +#: setup.c:223 +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "Π½Π΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΡΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ Β«%sΒ»: ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΠ΅ΠΉ ΠΈ ΠΈΠΌΠ΅Π½Π΅ΠΌ ΡΠ°ΠΉΠ»Π°.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«--Β» Π΄Π»Ρ ΠΎΡΠ΄Π΅Π»Π΅Π½ΠΈΡ ΠΏΡΡΠ΅ΠΉ ΠΎΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ, Π²ΠΎΡ ΡΠ°ΠΊ:\nΒ«git <ΠΊΠΎΠΌΠ°Π½Π΄Π°> [<ΡΠ΅Π΄Π°ΠΊΡΠΈΡ>β¦] -- [<ΡΠ°ΠΉΠ»>β¦]Β»" #: setup.c:468 #, c-format @@ -1659,21 +2805,87 @@ msgstr "ΠΠΆΠΈΠ΄Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΡΠΈΡ git ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ <= %d, Π° ΠΎΠ msgid "unknown repository extensions found:" msgstr "ΠΎΠ±Π½Π°ΡΡΠΆΠ΅Π½Ρ Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠ΅ ΡΠ°ΡΡΠΈΡΠ΅Π½ΠΈΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ:" -#: sha1_file.c:1080 +#: setup.c:762 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" +msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½ git ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΠΈΠΉ (ΠΈΠ»ΠΈ ΠΎΠ΄ΠΈΠ½ ΠΈΠ· Π΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²): %s" + +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +msgid "Cannot come back to cwd" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²Π΅ΡΠ½ΡΡΡΡΡ Π² ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" + +#: setup.c:845 +msgid "Unable to read current working directory" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" + +#: setup.c:920 +#, c-format +msgid "" +"Not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½ git ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΠΈΠΉ (ΠΈΠ»ΠΈ ΠΎΠ΄ΠΈΠ½ ΠΈΠ· Π΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² Π²ΠΏΠ»ΠΎΡΡ Π΄ΠΎ ΡΠΎΡΠΊΠΈ ΠΌΠΎΠ½ΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ %s)\nΠΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Ρ ΠΏΠΎΠΈΡΠΊ Π½Π° Π³ΡΠ°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²ΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΡ (ΡΠ°ΠΊ ΠΊΠ°ΠΊ GIT_DISCOVERY_ACROSS_FILESYSTEM Π½Π΅ ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½)." + +#: setup.c:927 +#, c-format +msgid "Cannot change to '%s/..'" +msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ Π² Β«%s/..Β»" + +#: setup.c:989 +#, c-format +msgid "" +"Problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." +msgstr "ΠΡΠΎΠ±Π»Π΅ΠΌΠ° ΡΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ΠΌ ΡΠ΅ΠΆΠΈΠΌΠ° Π΄ΠΎΡΡΡΠΏΠ° ΠΊ ΡΠ°ΠΉΠ»Ρ core.sharedRepository (0%.3o).\nΠΠ»Π°Π΄Π΅Π»Π΅Ρ ΡΠ°ΠΉΠ»ΠΎΠ² Π΄ΠΎΠ»ΠΆΠ΅Π½ Π²ΡΠ΅Π³Π΄Π° ΠΈΠΌΠ΅ΡΡ ΠΏΡΠ°Π²Π° Π½Π° ΡΡΠ΅Π½ΠΈΠ΅ ΠΈ Π½Π° Π·Π°ΠΏΠΈΡΡ." + +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "ΠΏΡΡΡ Β«%sΒ» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" + +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΠΊΠ°ΠΊ ΡΠ²ΡΠ·Π°Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅, ΠΏΠΎΠΊΠ° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ." + +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌ." + +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ" + +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΡΠ°ΡΠ΅Π½Π½ΡΠΌ" + +#: sha1_file.c:1159 msgid "offset before end of packfile (broken .idx?)" msgstr "ΡΠ΄Π²ΠΈΠ³ Π΄ΠΎ ΠΊΠΎΠ½ΡΠ° ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ° (Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½ ΡΠ°ΠΉΠ» .idx?)" -#: sha1_file.c:2458 +#: sha1_file.c:2592 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "ΡΠ΄Π²ΠΈΠ³ Π΄ΠΎ Π½Π°ΡΠ°Π»Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π΄Π»Ρ %s (ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½ ΠΈΠ½Π΄Π΅ΠΊΡ?)" -#: sha1_file.c:2462 +#: sha1_file.c:2596 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "ΡΠ΄Π²ΠΈΠ³ Π·Π° ΠΏΡΠ΅Π΄Π΅Π»Π°ΠΌΠΈ ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π΄Π»Ρ %s (ΠΎΠ±ΡΠ΅Π·Π°Π½ ΠΈΠ½Π΄Π΅ΠΊΡ?)" -#: sha1_name.c:462 +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "ΡΠΎΠΊΡΠ°ΡΡΠ½Π½ΡΠΉ SHA1 ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ %s Π½Π΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ΅Π½" + +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ:" + +#: sha1_name.c:578 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1709,79 +2921,132 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Π·Π°ΠΏΠΈΡΡ Π² .gitmodules Π΄Π»Ρ %s msgid "staging updated .gitmodules failed" msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΠΎΠ³ΠΎ .gitmodules" -#: submodule.c:177 +#: submodule.c:158 msgid "negative values not allowed for submodule.fetchJobs" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΡΠΏΡΠΈΡΠ°ΡΠ΅Π»ΡΠ½ΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ submodule.fetchJobs" -#: submodule-config.c:355 +#: submodule-config.c:358 #, c-format msgid "invalid value for %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Π·Π°Π²Π΅ΡΡΠΈΡΠ΅Π»Ρ Β«%sΒ»" -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 -#: trailer.c:562 +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 +#: trailer.c:541 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ ΠΊΠ»ΡΡΠ° Β«%sΒ»" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: trailer.c:523 trailer.c:528 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "Π±ΠΎΠ»ΡΡΠ΅ ΠΎΠ΄Π½ΠΎΠ³ΠΎ %s" -#: trailer.c:582 +#: trailer.c:672 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ΠΏΡΡΡΠ°Ρ ΠΏΠΎΡΠ»Π΅Π΄Π½ΡΡ Π»Π΅ΠΊΡΠ΅ΠΌΠ° Π² Π·Π°Π²Π΅ΡΡΠΈΡΠ΅Π»Π΅ Β«%.*sΒ»" -#: trailer.c:702 +#: trailer.c:695 #, c-format msgid "could not read input file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π²Ρ
ΠΎΠ΄Π½ΠΎΠΉ ΡΠ°ΠΉΠ» Β«%sΒ»" -#: trailer.c:705 +#: trailer.c:698 msgid "could not read from stdin" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:929 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ %s" -#: trailer.c:859 +#: trailer.c:931 #, c-format msgid "file %s is not a regular file" msgstr "ΡΠ°ΠΉΠ» %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΠ±ΡΡΠ½ΡΠΌ ΡΠ°ΠΉΠ»ΠΎΠΌ" -#: trailer.c:861 +#: trailer.c:933 #, c-format msgid "file %s is not writable by user" msgstr "ΡΠ°ΠΉΠ» %s Π½Π΅ Π΄ΠΎΡΡΡΠΏΠ΅Π½ Π½Π° Π·Π°ΠΏΠΈΡΡ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ" -#: trailer.c:873 +#: trailer.c:945 msgid "could not open temporary file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ»" -#: trailer.c:912 +#: trailer.c:983 #, c-format msgid "could not rename temporary file to %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Π² %s" -#: transport-helper.c:1041 +#: transport.c:62 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "ΠΡΠ΄Π΅Ρ ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ Π²ΡΡΠ΅ΡΡΠΎΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ Β«%sΒ» Π½Π° Β«%sΒ» Ρ Β«%sΒ»\n" + +#: transport.c:151 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "ΡΡΠ°Π½ΡΠΏΠΎΡΡ: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Π³Π»ΡΠ±ΠΈΠ½Ρ Β«%sΒ»" + +#: transport.c:817 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΌ ΠΏΡΡΡΠΌ ΡΠΎΠ΄Π΅ΡΠΆΠ°Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΌ ΠΈΠ· Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²:\n" + +#: transport.c:821 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "\nΠΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ\n\n\tgit push --recurse-submodules=on-demand\n\nΠΈΠ»ΠΈ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π² ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ cd ΠΈ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ\n\n\tgit push\n\nΠ΄Π»Ρ ΠΈΡ
ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ Π½Π° Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ.\n" + +#: transport.c:829 +msgid "Aborting." +msgstr "ΠΡΠ΅ΡΡΠ²Π°Ρ." + +#: transport-helper.c:1075 #, c-format msgid "Could not read ref %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ %s" +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΊΠΎΡΠΎΡΠΊΠΈΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π΅ΡΠ΅Π²Π°" + +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π² Π·Π°ΠΏΠΈΡΠΈ Π΄Π΅ΡΠ΅Π²Π°" + +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "ΠΏΡΡΡΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π² Π·Π°ΠΏΠΈΡΠΈ Π΄Π΅ΡΠ΅Π²Π°" + +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΊΠΎΡΠΎΡΠΊΠΈΠΉ ΡΠ°ΠΉΠ» Π΄Π΅ΡΠ΅Π²Π°" + #: unpack-trees.c:64 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you can switch branches." +"%%sPlease commit your changes or stash them before you switch branches." msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%sΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." #: unpack-trees.c:66 @@ -1795,7 +3060,7 @@ msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you can merge." +"%%sPlease commit your changes or stash them before you merge." msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%sΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅Π΄ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." #: unpack-trees.c:71 @@ -1809,7 +3074,7 @@ msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" -"%%sPlease commit your changes or stash them before you can %s." +"%%sPlease commit your changes or stash them before you %s." msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ %s:\n%%sΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅Π΄ %s." #: unpack-trees.c:76 @@ -1830,7 +3095,7 @@ msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² ΠΏΡΠΈΠ²Π΅Π΄Π #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." #: unpack-trees.c:87 @@ -1844,7 +3109,7 @@ msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎ #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." #: unpack-trees.c:92 @@ -1858,7 +3123,7 @@ msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎ #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ %s:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ %s." #: unpack-trees.c:97 @@ -1872,7 +3137,7 @@ msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎ #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." #: unpack-trees.c:104 @@ -1886,7 +3151,7 @@ msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎ #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." #: unpack-trees.c:109 @@ -1900,7 +3165,7 @@ msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎ #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ %s:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ %s." #: unpack-trees.c:114 @@ -1925,14 +3190,14 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈ #: unpack-trees.c:126 #, c-format msgid "" -"The following Working tree files would be overwritten by sparse checkout update:\n" +"The following working tree files would be overwritten by sparse checkout update:\n" "%s" msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ:\n%s" #: unpack-trees.c:128 #, c-format msgid "" -"The following Working tree files would be removed by sparse checkout update:\n" +"The following working tree files would be removed by sparse checkout update:\n" "%s" msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ:\n%s" @@ -1974,240 +3239,234 @@ msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ Π½ΠΎΠΌΠ΅Ρ ΠΏΠΎΡΡΠ°" msgid "invalid '..' path segment" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΠ°ΡΡΡ ΠΏΡΡΠΈ Β«..Β»" -#: wrapper.c:222 wrapper.c:381 +#: worktree.c:282 +#, c-format +msgid "failed to read '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" + +#: wrapper.c:222 wrapper.c:392 #, c-format msgid "could not open '%s' for reading and writing" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ ΠΈ Π·Π°ΠΏΠΈΡΠΈ" -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 -#: builtin/pull.c:407 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ" -#: wrapper.c:594 wrapper.c:615 +#: wrapper.c:605 wrapper.c:626 #, c-format msgid "unable to access '%s'" msgstr "Β«%sΒ» Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΠΎ" -#: wrapper.c:623 +#: wrapper.c:634 msgid "unable to get current working directory" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: wrapper.c:650 -#, c-format -msgid "could not open %s for writing" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ" - -#: wrapper.c:661 builtin/am.c:410 +#: wrapper.c:658 #, c-format msgid "could not write to %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² %s" -#: wrapper.c:667 +#: wrapper.c:660 #, c-format msgid "could not close %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ %s" -#: wt-status.c:150 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "ΠΠ΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:178 wt-status.c:205 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git reset %s <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΡΠ±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rm --cached <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΡΠ±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)" -#: wt-status.c:183 +#: wt-status.c:184 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git add <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git add/rm <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠ΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)" -#: wt-status.c:187 +#: wt-status.c:188 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rm <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)" -#: wt-status.c:198 wt-status.c:881 +#: wt-status.c:199 wt-status.c:945 msgid "Changes to be committed:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ Π²ΠΊΠ»ΡΡΠ΅Π½Ρ Π² ΠΊΠΎΠΌΠΌΠΈΡ:" -#: wt-status.c:216 wt-status.c:890 +#: wt-status.c:217 wt-status.c:954 msgid "Changes not staged for commit:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" -#: wt-status.c:220 +#: wt-status.c:221 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git add <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠ°ΠΉΠ» Π² ΠΈΠ½Π΄Π΅ΠΊΡ)" -#: wt-status.c:222 +#: wt-status.c:223 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git add/rm <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)" -#: wt-status.c:223 +#: wt-status.c:224 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working " "directory)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git checkout -- <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ\n Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅)" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΠΎΡΠΌΠ΅Π½ΠΈΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΌ ΠΈΠ»ΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΠΎΠΌ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
)" -#: wt-status.c:237 +#: wt-status.c:238 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git %s <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π² ΡΠΎ, ΡΡΠΎ Π±ΡΠ΄Π΅Ρ Π²ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ)" -#: wt-status.c:252 +#: wt-status.c:253 msgid "both deleted:" msgstr "ΠΎΠ±Π° ΡΠ΄Π°Π»Π΅Π½Ρ:" -#: wt-status.c:254 +#: wt-status.c:255 msgid "added by us:" msgstr "Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π½Π°ΠΌΠΈ:" -#: wt-status.c:256 +#: wt-status.c:257 msgid "deleted by them:" msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ ΠΈΠΌΠΈ:" -#: wt-status.c:258 +#: wt-status.c:259 msgid "added by them:" msgstr "Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΈΠΌΠΈ:" -#: wt-status.c:260 +#: wt-status.c:261 msgid "deleted by us:" msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ Π½Π°ΠΌΠΈ:" -#: wt-status.c:262 +#: wt-status.c:263 msgid "both added:" msgstr "ΠΎΠ±Π° Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Ρ:" -#: wt-status.c:264 +#: wt-status.c:265 msgid "both modified:" msgstr "ΠΎΠ±Π° ΠΈΠ·ΠΌΠ΅Π½Ρ:" -#: wt-status.c:266 -#, c-format -msgid "bug: unhandled unmerged status %x" -msgstr "ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΡΡΠ°ΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %x" - -#: wt-status.c:274 +#: wt-status.c:275 msgid "new file:" msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ»:" -#: wt-status.c:276 +#: wt-status.c:277 msgid "copied:" msgstr "ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΎ:" -#: wt-status.c:278 +#: wt-status.c:279 msgid "deleted:" msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ:" -#: wt-status.c:280 +#: wt-status.c:281 msgid "modified:" msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ:" -#: wt-status.c:282 +#: wt-status.c:283 msgid "renamed:" msgstr "ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΎ:" -#: wt-status.c:284 +#: wt-status.c:285 msgid "typechange:" msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ ΡΠΈΠΏ:" -#: wt-status.c:286 +#: wt-status.c:287 msgid "unknown:" msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎ:" -#: wt-status.c:288 +#: wt-status.c:289 msgid "unmerged:" msgstr "Π½Π΅ ΡΠ»ΠΈΡΡΠ΅:" -#: wt-status.c:370 +#: wt-status.c:371 msgid "new commits, " msgstr "Π½ΠΎΠ²ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ, " -#: wt-status.c:372 +#: wt-status.c:373 msgid "modified content, " msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅, " -#: wt-status.c:374 +#: wt-status.c:375 msgid "untracked content, " msgstr "Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅, " -#: wt-status.c:391 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΡΡΠ°ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %c" - -#: wt-status.c:755 +#: wt-status.c:818 msgid "Submodules changed but not updated:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅, Π½ΠΎ Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ:" -#: wt-status.c:757 +#: wt-status.c:820 msgid "Submodule changes to be committed:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Ρ:" -#: wt-status.c:838 +#: wt-status.c:901 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "ΠΠ΅ ΡΡΠΎΠ³Π°ΠΉΡΠ΅ ΡΡΡΠΎΠΊΡ Π²ΡΡΠ΅ ΡΡΠΎΠΉ.\nΠΡΡ, ΡΡΠΎ Π½ΠΈΠΆΠ΅ β Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½ΠΎ." -#: wt-status.c:949 +#: wt-status.c:1013 msgid "You have unmerged paths." msgstr "Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ." -#: wt-status.c:952 +#: wt-status.c:1016 msgid " (fix conflicts and run \"git commit\")" msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git commitΒ»)" -#: wt-status.c:956 +#: wt-status.c:1018 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git merge --abortΒ», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ)" + +#: wt-status.c:1023 msgid "All conflicts fixed but you are still merging." msgstr "ΠΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Ρ, Π½ΠΎ Π²Ρ Π²ΡΠ΅ Π΅ΡΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ." -#: wt-status.c:959 +#: wt-status.c:1026 msgid " (use \"git commit\" to conclude merge)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git commitΒ», ΡΡΠΎΠ±Ρ Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅)" -#: wt-status.c:969 +#: wt-status.c:1036 msgid "You are in the middle of an am session." msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ΅ΡΡΠΈΠΈ am." -#: wt-status.c:972 +#: wt-status.c:1039 msgid "The current patch is empty." msgstr "Π’Π΅ΠΊΡΡΠΈΠΉ ΠΏΠ°ΡΡ ΠΏΡΡΡΠΎΠΉ." -#: wt-status.c:976 +#: wt-status.c:1043 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git am --continueΒ»)" -#: wt-status.c:978 +#: wt-status.c:1045 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git am --skipΒ», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ)" -#: wt-status.c:980 +#: wt-status.c:1047 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git am --abortΒ», ΡΡΠΎΠ±Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ)" -#: wt-status.c:1105 +#: wt-status.c:1172 msgid "No commands done." msgstr "ΠΠΎΠΌΠ°Π½Π΄Ρ Π½Π΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½Ρ." -#: wt-status.c:1108 +#: wt-status.c:1175 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" @@ -2216,16 +3475,16 @@ msgstr[1] "ΠΠΎΡΠ»Π΅Π΄Π½ΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½Π° (%d ΠΊΠΎΠΌΠ°Π½Π΄ msgstr[2] "ΠΠΎΡΠ»Π΅Π΄Π½ΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½Π° (%d ΠΊΠΎΠΌΠ°Π½Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΎ):" msgstr[3] "ΠΠΎΡΠ»Π΅Π΄Π½ΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½Π° (%d ΠΊΠΎΠΌΠ°Π½Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΎ):" -#: wt-status.c:1119 +#: wt-status.c:1186 #, c-format msgid " (see more in file %s)" msgstr " (ΡΠΌΠΎΡΡΠΈΡΠ΅ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π² ΡΠ°ΠΉΠ»Π΅ %s)" -#: wt-status.c:1124 +#: wt-status.c:1191 msgid "No commands remaining." msgstr "ΠΠΎΠΌΠ°Π½Π΄ Π±ΠΎΠ»ΡΡΠ΅ Π½Π΅ ΠΎΡΡΠ°Π»ΠΎΡΡ." -#: wt-status.c:1127 +#: wt-status.c:1194 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -2234,150 +3493,150 @@ msgstr[1] "Π‘Π»Π΅Π΄ΡΡΡΠ°Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π΄Π»Ρ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ (%d ΠΊΠ msgstr[2] "Π‘Π»Π΅Π΄ΡΡΡΠ°Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π΄Π»Ρ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ (%d ΠΊΠΎΠΌΠ°Π½Π΄ ΠΎΡΡΠ°Π»ΠΎΡΡ):" msgstr[3] "Π‘Π»Π΅Π΄ΡΡΡΠ°Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π΄Π»Ρ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ (%d ΠΊΠΎΠΌΠ°Π½Π΄ ΠΎΡΡΠ°Π»ΠΎΡΡ):" -#: wt-status.c:1135 +#: wt-status.c:1202 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rebase --edit-todoΒ», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ ΠΈ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ)" -#: wt-status.c:1148 +#: wt-status.c:1215 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ°Π΅ΡΠ΅ Π²Π΅ΡΠΊΡ Β«%sΒ» Π½Π°Π΄ Β«%sΒ»." -#: wt-status.c:1153 +#: wt-status.c:1220 msgid "You are currently rebasing." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ°Π΅ΡΠ΅ Π²Π΅ΡΠΊΡ." -#: wt-status.c:1167 +#: wt-status.c:1234 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git rebase --continueΒ»)" -#: wt-status.c:1169 +#: wt-status.c:1236 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rebase --skipΒ», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ)" -#: wt-status.c:1171 +#: wt-status.c:1238 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rebase --abortΒ», ΡΡΠΎΠ±Ρ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ)" -#: wt-status.c:1177 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (Π²ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Ρ: Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git rebase --continueΒ»)" -#: wt-status.c:1181 +#: wt-status.c:1248 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°Π·Π΄Π΅Π»ΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ Β«%sΒ» Π½Π°Π΄ Β«%sΒ»." -#: wt-status.c:1186 +#: wt-status.c:1253 msgid "You are currently splitting a commit during a rebase." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°Π·Π΄Π΅Π»ΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ." -#: wt-status.c:1189 +#: wt-status.c:1256 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "(ΠΠ°ΠΊ ΡΠΎΠ»ΡΠΊΠΎ Π²Π°Ρ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π±ΡΠ΄Π΅Ρ ΡΠΈΡΡΡΠΉ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git rebase --continueΒ»)" -#: wt-status.c:1193 +#: wt-status.c:1260 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ Β«%sΒ» Π½Π°Π΄ Β«%sΒ»." -#: wt-status.c:1198 +#: wt-status.c:1265 msgid "You are currently editing a commit during a rebase." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΊΠΈ." -#: wt-status.c:1201 +#: wt-status.c:1268 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git commit --amendΒ», ΡΡΠΎΠ±Ρ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ)" -#: wt-status.c:1203 +#: wt-status.c:1270 msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rebase --continueΒ», ΠΊΠΎΠ³Π΄Π° Π±ΡΠ΄Π΅ΡΠ΅ Π΄ΠΎΠ²ΠΎΠ»ΡΠ½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ)" -#: wt-status.c:1213 +#: wt-status.c:1280 #, c-format msgid "You are currently cherry-picking commit %s." -msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΠΎΡΠ±ΠΈΡΠ°Π΅ΡΠ΅ Π»ΡΡΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s." +msgstr "ΠΡ ΠΊΠΎΠΏΠΈΡΡΠ΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ %s." -#: wt-status.c:1218 +#: wt-status.c:1285 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git cherry-pick --continueΒ»)" -#: wt-status.c:1221 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (Π²ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Ρ: Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git cherry-pick --continueΒ»)" -#: wt-status.c:1223 +#: wt-status.c:1290 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" -msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git cherry-pick --abortΒ», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ)" +msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git cherry-pick --abortΒ», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°)" -#: wt-status.c:1232 +#: wt-status.c:1299 #, c-format msgid "You are currently reverting commit %s." -msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°Π΅ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ %s." +msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΠΎΠ±ΡΠ°ΡΠ°Π΅ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s." -#: wt-status.c:1237 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git revert --continueΒ»)" -#: wt-status.c:1240 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (Π²ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Ρ: Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git revert --continueΒ»)" -#: wt-status.c:1242 +#: wt-status.c:1309 msgid " (use \"git revert --abort\" to cancel the revert operation)" -msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git revert --abortΒ», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°)" +msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git revert --abortΒ», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ°)" -#: wt-status.c:1253 +#: wt-status.c:1320 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ°, Π½Π°ΡΠ°ΡΠΎΠ³ΠΎ Ρ Π²Π΅ΡΠΊΠΈ Β«%sΒ»." -#: wt-status.c:1257 +#: wt-status.c:1324 msgid "You are currently bisecting." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ°." -#: wt-status.c:1260 +#: wt-status.c:1327 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git bisect resetΒ», ΡΡΠΎΠ±Ρ Π²Π΅ΡΠ½ΡΡΡΡΡ Π½Π° ΠΈΡΡ
ΠΎΠ΄Π½ΡΡ Π²Π΅ΡΠΊΡ)" -#: wt-status.c:1460 +#: wt-status.c:1524 msgid "On branch " msgstr "ΠΠ° Π²Π΅ΡΠΊΠ΅ " -#: wt-status.c:1466 +#: wt-status.c:1530 msgid "interactive rebase in progress; onto " msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅; Π½Π°Π΄ " -#: wt-status.c:1468 +#: wt-status.c:1532 msgid "rebase in progress; onto " msgstr "ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅; Π½Π°Π΄ " -#: wt-status.c:1473 +#: wt-status.c:1537 msgid "HEAD detached at " msgstr "HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π° " -#: wt-status.c:1475 +#: wt-status.c:1539 msgid "HEAD detached from " msgstr "HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π°ΡΠΈΠ½Π°Ρ Ρ " -#: wt-status.c:1478 +#: wt-status.c:1542 msgid "Not currently on any branch." msgstr "Π‘Π΅ΠΉΡΠ°Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΠΎΠΊ" -#: wt-status.c:1496 +#: wt-status.c:1560 msgid "Initial commit" msgstr "ΠΠ°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: wt-status.c:1510 +#: wt-status.c:1574 msgid "Untracked files" msgstr "ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: wt-status.c:1512 +#: wt-status.c:1576 msgid "Ignored files" msgstr "ΠΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: wt-status.c:1516 +#: wt-status.c:1580 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2385,82 +3644,97 @@ msgid "" "new files yourself (see 'git help status')." msgstr "%.2f ΡΠ΅ΠΊΡΠ½Π΄Ρ Π·Π°Π½ΡΠ» Π²ΡΠ²ΠΎΠ΄ ΡΠΏΠΈΡΠΊΠ° Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ². Β«status -unoΒ» Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΌΠΎΠΆΠ΅Ρ ΡΡΠΊΠΎΡΠΈΡΡ ΡΡΠΎ, Π½ΠΎ Π±ΡΠ΄ΡΡΠ΅ Π²Π½ΠΈΠΌΠ°ΡΠ΅Π»ΡΠ½Ρ, ΠΈ Π½Π΅ Π·Π°Π±ΡΠ΄ΡΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π½ΠΎΠ²ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π²ΡΡΡΠ½ΡΡ (ΡΠΌΠΎΡΡΠΈΡΠ΅ Β«git help statusΒ» Π΄Π»Ρ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠ΅ΠΉ)." -#: wt-status.c:1522 +#: wt-status.c:1586 #, c-format msgid "Untracked files not listed%s" msgstr "ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π½Π΅ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ%s" -#: wt-status.c:1524 +#: wt-status.c:1588 msgid " (use -u option to show untracked files)" msgstr "(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ Β«-uΒ», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ)" -#: wt-status.c:1530 +#: wt-status.c:1594 msgid "No changes" msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: wt-status.c:1535 +#: wt-status.c:1599 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git addΒ» ΠΈ/ΠΈΠ»ΠΈ Β«git commit -aΒ»)\n" -#: wt-status.c:1538 +#: wt-status.c:1602 #, c-format msgid "no changes added to commit\n" msgstr "Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n" -#: wt-status.c:1541 +#: wt-status.c:1605 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ Π΅ΡΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git addΒ», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡ ΠΈΡ
)\n" -#: wt-status.c:1544 +#: wt-status.c:1608 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ Π΅ΡΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ\n" -#: wt-status.c:1547 +#: wt-status.c:1611 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ (ΡΠΎΠ·Π΄Π°ΠΉΡΠ΅/ΡΠΊΠΎΠΏΠΈΡΡΠΉΡΠ΅ ΡΠ°ΠΉΠ»Ρ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git addΒ», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡ ΠΈΡ
)\n" -#: wt-status.c:1550 wt-status.c:1555 +#: wt-status.c:1614 wt-status.c:1619 #, c-format msgid "nothing to commit\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ\n" -#: wt-status.c:1553 +#: wt-status.c:1617 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ Β«-uΒ», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ)\n" -#: wt-status.c:1557 +#: wt-status.c:1621 #, c-format -msgid "nothing to commit, working directory clean\n" +msgid "nothing to commit, working tree clean\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ, Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅\n" -#: wt-status.c:1664 +#: wt-status.c:1728 msgid "Initial commit on " msgstr "ΠΠ°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π½Π° " -#: wt-status.c:1668 +#: wt-status.c:1732 msgid "HEAD (no branch)" msgstr "HEAD (Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ)" -#: wt-status.c:1697 +#: wt-status.c:1761 msgid "gone" msgstr "ΠΈΡΡΠ΅Π·" -#: wt-status.c:1699 wt-status.c:1707 +#: wt-status.c:1763 wt-status.c:1771 msgid "behind " msgstr "ΠΏΠΎΠ·Π°Π΄ΠΈ" -#: wt-status.c:1702 wt-status.c:1705 +#: wt-status.c:1766 wt-status.c:1769 msgid "ahead " msgstr "Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ " -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2270 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ %s: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "ΠΊ ΡΠΎΠΌΡ ΠΆΠ΅, Π² Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ %s: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format msgid "failed to unlink '%s'" msgstr "ΡΠ±ΠΎΠΉ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ Β«%sΒ»" @@ -2469,1014 +3743,510 @@ msgstr "ΡΠ±ΠΎΠΉ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ Β«%sΒ»" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<ΠΎΠΏΡΠΈΠΈ>] [--] <ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ-ΠΏΡΡΠΈ>β¦" -#: builtin/add.c:65 +#: builtin/add.c:80 #, c-format msgid "unexpected diff status %c" msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΡΡΠ°ΡΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΠΉ %c" -#: builtin/add.c:70 builtin/commit.c:280 +#: builtin/add.c:85 builtin/commit.c:291 msgid "updating files failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/add.c:80 +#: builtin/add.c:95 #, c-format msgid "remove '%s'\n" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ Β«%sΒ»\n" -#: builtin/add.c:134 +#: builtin/add.c:149 msgid "Unstaged changes after refreshing the index:" msgstr "ΠΠ΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎΡΠ»Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°:" -#: builtin/add.c:194 builtin/rev-parse.c:811 +#: builtin/add.c:209 builtin/rev-parse.c:840 msgid "Could not read the index" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/add.c:205 +#: builtin/add.c:220 #, c-format msgid "Could not open '%s' for writing." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ." -#: builtin/add.c:209 +#: builtin/add.c:224 msgid "Could not write patch" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΏΠ°ΡΡ" -#: builtin/add.c:212 +#: builtin/add.c:227 msgid "editing patch failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ ΠΏΠ°ΡΡΠ°" -#: builtin/add.c:215 +#: builtin/add.c:230 #, c-format msgid "Could not stat '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ Β«%sΒ»" -#: builtin/add.c:217 +#: builtin/add.c:232 msgid "Empty patch. Aborted." msgstr "ΠΡΡΡΠΎΠΉ ΠΏΠ°ΡΡ. ΠΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΏΡΠ΅ΡΠ²Π°Π½Π°." -#: builtin/add.c:222 +#: builtin/add.c:237 #, c-format msgid "Could not apply '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Β«%sΒ»" -#: builtin/add.c:232 +#: builtin/add.c:247 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ ΠΏΡΡΠΈ ΠΈΠ³Π½ΠΎΡΠΈΡΡΡΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ· Π²Π°ΡΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ² .gitignore:\n" -#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 +#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "ΠΏΡΠΎΠ±Π½ΡΠΉ Π·Π°ΠΏΡΡΠΊ" -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅" - -#: builtin/add.c:252 +#: builtin/add.c:269 msgid "interactive picking" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ Π²ΡΠ±ΠΎΡ" -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 msgid "select hunks interactively" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ Π²ΡΠ±ΠΎΡ Π±Π»ΠΎΠΊΠΎΠ²" -#: builtin/add.c:254 +#: builtin/add.c:271 msgid "edit current diff and apply" msgstr "ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°ΠΉΠ» ΡΠ°Π·Π»ΠΈΡΠΈΠΉ ΠΈ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΅Π³ΠΎ" -#: builtin/add.c:255 +#: builtin/add.c:272 msgid "allow adding otherwise ignored files" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΡ
ΠΈΠ½Π°ΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/add.c:256 +#: builtin/add.c:273 msgid "update tracked files" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/add.c:257 +#: builtin/add.c:274 msgid "record only the fact that the path will be added later" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°ΠΊΡ, ΡΡΠΎ ΠΏΡΡΡ Π±ΡΠ΄Π΅Ρ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ ΠΏΠΎΠ·ΠΆΠ΅" -#: builtin/add.c:258 +#: builtin/add.c:275 msgid "add changes from all tracked and untracked files" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ· Π²ΡΠ΅Ρ
ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΠΈ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/add.c:261 +#: builtin/add.c:278 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΡΡΠΈ ΡΠ΄Π°Π»Π΅Π½Π½ΡΠ΅ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° (ΡΠΎΠΆΠ΅, ΡΡΠΎ ΠΈ --no-all)" -#: builtin/add.c:263 +#: builtin/add.c:280 msgid "don't add, only refresh the index" msgstr "Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ, ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/add.c:264 +#: builtin/add.c:281 msgid "just skip files which cannot be added because of errors" msgstr "ΠΏΡΠΎΠΏΡΡΠΊΠ°ΡΡ ΡΠ°ΠΉΠ»Ρ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Ρ ΠΈΠ·-Π·Π° ΠΎΡΠΈΠ±ΠΎΠΊ" -#: builtin/add.c:265 +#: builtin/add.c:282 msgid "check if - even missing - files are ignored in dry run" msgstr "ΡΠ΄ΠΎΡΡΠΎΠ²Π΅ΡΠΈΡΡΡΡ, ΡΡΠΎ Π΄Π°ΠΆΠ΅ Π½Π΅Π΄ΠΎΡΡΠ°ΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ ΠΏΡΠΈ ΠΏΡΠΎΠ±Π½ΠΎΠΌ Π·Π°ΠΏΡΡΠΊΠ΅" -#: builtin/add.c:287 +#: builtin/add.c:283 builtin/update-index.c:947 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/add.c:283 builtin/update-index.c:948 +msgid "override the executable bit of the listed files" +msgstr "ΠΏΠ΅ΡΠ΅ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π±ΠΈΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" + +#: builtin/add.c:305 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ -f, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΡ
.\n" -#: builtin/add.c:294 +#: builtin/add.c:312 msgid "adding files failed" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/add.c:330 +#: builtin/add.c:348 msgid "-A and -u are mutually incompatible" msgstr "-A ΠΈ -u Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/add.c:337 +#: builtin/add.c:355 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "ΠΠΏΡΠΈΡ --ignore-missing ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π²ΠΌΠ΅ΡΡΠ΅ Ρ --dry-run" -#: builtin/add.c:352 +#: builtin/add.c:359 +#, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --chmod Β«%sΒ» Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ -x ΠΈΠ»ΠΈ +x" + +#: builtin/add.c:374 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "ΠΠΈΡΠ΅Π³ΠΎ Π½Π΅ ΡΠΊΠ°Π·Π°Π½ΠΎ, Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ.\n" -#: builtin/add.c:353 +#: builtin/add.c:375 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ Β«git add .Β»?\n" -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 -msgid "Unable to write new index file" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" - -#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 -#, c-format -msgid "could not read '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" - -#: builtin/am.c:430 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΡΠ΅Π½Π°ΡΠΈΠΉ Π°Π²ΡΠΎΡΡΡΠ²Π°" -#: builtin/am.c:507 +#: builtin/am.c:491 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "Β«%sΒ» Π±ΡΠ» ΡΠ΄Π°Π»Π΅Π½ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠΎΠΌ applypatch-msg" -#: builtin/am.c:548 builtin/notes.c:300 +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° Π²Π²ΠΎΠ΄Π°: Β«%sΒ»." -#: builtin/am.c:585 builtin/notes.c:315 +#: builtin/am.c:569 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· Β«%sΒ» Π² Β«%sΒ»" -#: builtin/am.c:611 +#: builtin/am.c:595 msgid "fseek failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ fseek" -#: builtin/am.c:788 +#: builtin/am.c:775 #, c-format msgid "could not parse patch '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΏΠ°ΡΡ Β«%sΒ»" -#: builtin/am.c:853 +#: builtin/am.c:840 msgid "Only one StGIT patch series can be applied at once" msgstr "Π’ΠΎΠ»ΡΠΊΠΎ ΡΠ΅ΡΠΈΡ ΠΏΠ°ΡΡΠ΅ΠΉ StGIT ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π·Π° ΡΠ°Π·" -#: builtin/am.c:900 +#: builtin/am.c:887 msgid "invalid timestamp" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΠΌΠ΅ΡΠΊΠ° Π΄Π°ΡΡ/Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ" -#: builtin/am.c:903 builtin/am.c:911 +#: builtin/am.c:890 builtin/am.c:898 msgid "invalid Date line" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ° Π΄Π°ΡΡ" -#: builtin/am.c:908 +#: builtin/am.c:895 msgid "invalid timezone offset" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΡΠΎΠ²ΠΎΠ³ΠΎ ΠΏΠΎΡΡΠ°" -#: builtin/am.c:995 +#: builtin/am.c:984 msgid "Patch format detection failed." msgstr "Π‘Π±ΠΎΠΉ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΡ ΡΠΎΡΠΌΠ°ΡΠ° ΠΏΠ°ΡΡΠ°." -#: builtin/am.c:1000 builtin/clone.c:380 +#: builtin/am.c:989 builtin/clone.c:379 #, c-format msgid "failed to create directory '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/am.c:1004 +#: builtin/am.c:993 msgid "Failed to split patches." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·Π΄Π΅Π»ΠΈΡΡ ΠΏΠ°ΡΡΠΈ Π½Π° ΡΠ°ΡΡΠΈ." -#: builtin/am.c:1136 builtin/commit.c:365 +#: builtin/am.c:1125 builtin/commit.c:376 msgid "unable to write index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/am.c:1187 +#: builtin/am.c:1176 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "ΠΠΎΠ³Π΄Π° Π²Ρ ΡΡΡΡΠ°Π½ΠΈΡΠ΅ ΡΡΡ ΠΏΡΠΎΠ±Π»Π΅ΠΌΡ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«%s --continueΒ»." -#: builtin/am.c:1188 +#: builtin/am.c:1177 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«%s --skipΒ»." -#: builtin/am.c:1189 +#: builtin/am.c:1178 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Π§ΡΠΎΠ±Ρ Π²Π΅ΡΠ½ΡΡΡΡΡ Π½Π° ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«%s --abortΒ»." -#: builtin/am.c:1327 +#: builtin/am.c:1316 msgid "Patch is empty. Was it split wrong?" msgstr "ΠΠ°ΡΡ ΠΏΡΡΡ. ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, ΠΎΠ½ Π±ΡΠ» Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎ ΡΠ°Π·Π΄Π΅Π»ΡΠ½?" -#: builtin/am.c:1401 builtin/log.c:1516 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format msgid "invalid ident line: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ: %s" -#: builtin/am.c:1428 +#: builtin/am.c:1417 #, c-format msgid "unable to parse commit %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s" -#: builtin/am.c:1630 +#: builtin/am.c:1610 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Π ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ Π΄Π»Ρ ΠΎΡΠΊΠ°ΡΠ° ΠΊ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ." -#: builtin/am.c:1632 +#: builtin/am.c:1612 msgid "Using index info to reconstruct a base tree..." msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π΄Π»Ρ ΡΠ΅ΠΊΠΎΠ½ΡΡΡΡΠΊΡΠΈΠΈ Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ Π΄Π΅ΡΠ΅Π²Π°β¦" -#: builtin/am.c:1651 +#: builtin/am.c:1631 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "ΠΡ Π²ΡΡΡΠ½ΡΡ ΠΈΠ·ΠΌΠ΅Π½ΡΠ»ΠΈ ΠΏΠ°ΡΡ?\nΠΠ½ Π½Π΅ Π½Π°ΠΊΠ»Π°Π΄ΡΠ²Π°Π΅ΡΡΡ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ Π½Π° Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠ΅ Π² Π΅Π³ΠΎ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅." -#: builtin/am.c:1657 +#: builtin/am.c:1637 msgid "Falling back to patching base and 3-way merge..." msgstr "ΠΡΠΊΠ°Ρ ΠΊ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊ Π±Π°Π·ΠΎΠ²ΠΎΠΌΡ ΠΊΠΎΠΌΠΌΠΈΡΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡβ¦" -#: builtin/am.c:1672 +#: builtin/am.c:1662 msgid "Failed to merge in the changes." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/am.c:1696 builtin/merge.c:636 +#: builtin/am.c:1686 builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ" -#: builtin/am.c:1703 +#: builtin/am.c:1693 msgid "applying to an empty history" msgstr "ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΊ ΠΏΡΡΡΠΎΠΉ ΠΈΡΡΠΎΡΠΈΠΈ" -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 -#: builtin/merge.c:866 +#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 +#: builtin/merge.c:823 msgid "failed to write commit object" msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/am.c:1748 builtin/am.c:1752 +#: builtin/am.c:1739 builtin/am.c:1743 #, c-format msgid "cannot resume: %s does not exist." msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ½ΠΈΡΡ: %s Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ " -#: builtin/am.c:1768 +#: builtin/am.c:1759 msgid "cannot be interactive without stdin connected to a terminal." msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ ΠΏΠΎΠ²Π΅Π΄Π΅Π½ΠΈΠ΅, Π±Π΅Π· stdin ΠΏΠΎΠ΄ΠΊΠ»ΡΡΠ΅Π½Π½ΠΎΠ³ΠΎ ΠΊ ΡΠ΅ΡΠΌΠΈΠ½Π°Π»Ρ." -#: builtin/am.c:1773 +#: builtin/am.c:1764 msgid "Commit Body is:" msgstr "Π’Π΅Π»ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1783 +#: builtin/am.c:1774 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "ΠΡΠΈΠΌΠ΅Π½ΠΈΡΡ? [y] - Π΄Π°/[n] - Π½Π΅Ρ/[e] - ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ/[v] - ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ ΠΏΠ°ΡΡ/[a] - ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π²ΡΡ: " -#: builtin/am.c:1833 +#: builtin/am.c:1824 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "ΠΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΏΡΡΡΠΎΠΉ: Π½Π΅Π»ΡΠ·Ρ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΏΠ°ΡΡΠΈ (Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅: %s)" -#: builtin/am.c:1868 builtin/am.c:1940 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format msgid "Applying: %.*s" msgstr "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅: %.*s" -#: builtin/am.c:1884 +#: builtin/am.c:1877 msgid "No changes -- Patch already applied." msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ β ΠΠ°ΡΡ ΡΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½." -#: builtin/am.c:1892 +#: builtin/am.c:1885 #, c-format msgid "Patch failed at %s %.*s" msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π½Π° %s %.*s" -#: builtin/am.c:1898 +#: builtin/am.c:1891 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "ΠΠΎΠΏΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ, Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π½Π°ΠΉΡΠΈ Π²: %s" -#: builtin/am.c:1943 +#: builtin/am.c:1936 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ β Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ Π²ΡΠ·Π²Π°ΡΡ Β«git addΒ»?\nΠΡΠ»ΠΈ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ ΠΎΡΡΠ°Π»ΠΎΡΡ Π΄Π»Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠ°ΡΠΈΠΈ, ΡΠΎ, ΡΠΊΠΎΡΠ΅Π΅ Π²ΡΠ΅Π³ΠΎ, ΡΡΠΎ-ΡΠΎ Π΄ΡΡΠ³ΠΎΠ΅ ΡΠΆΠ΅ ΡΠ΄Π΅Π»Π°Π»ΠΎ ΡΠ΅ ΠΆΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ; Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Π°ΠΌ ΡΠ»Π΅Π΄ΡΠ΅Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ." -#: builtin/am.c:1950 +#: builtin/am.c:1943 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "Π£ Π²Π°Ρ Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ Π²ΡΠ·Π²Π°ΡΡ Β«git addΒ»?" -#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." -#: builtin/am.c:2110 +#: builtin/am.c:2103 msgid "failed to clean index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΈΡΡΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/am.c:2144 +#: builtin/am.c:2137 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΠ»ΠΈ HEAD Ρ ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅ΠΉ ΠΎΡΠΈΠ±ΠΊΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Β«amΒ».\nΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π½Π° ORIG_HEAD Π½Π΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ" -#: builtin/am.c:2205 +#: builtin/am.c:2200 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ --patch-format: %s" -#: builtin/am.c:2238 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] [(<mbox>|<Maildir>)β¦]" +#: builtin/am.c:2233 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] [(<mbox> | <Maildir>)β¦]" -#: builtin/am.c:2239 +#: builtin/am.c:2234 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] (--continue | --skip | --abort)" -#: builtin/am.c:2245 +#: builtin/am.c:2240 msgid "run interactively" msgstr "Π·Π°ΠΏΡΡΡΠΈΡΡ Π² ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠΌ ΡΠ΅ΠΆΠΈΠΌΠ΅" -#: builtin/am.c:2247 +#: builtin/am.c:2242 msgid "historical option -- no-op" msgstr "ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΠΏΡΠΈΡ β Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ" -#: builtin/am.c:2249 +#: builtin/am.c:2244 msgid "allow fall back on 3way merging if needed" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΎΡΠΊΠ°ΡΠΈΡΡΡΡ ΠΊ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΅ΡΠ»ΠΈ Π½ΡΠΆΠ½ΠΎ" -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 -#: builtin/repack.c:171 +#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/repack.c:172 msgid "be quiet" msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ" -#: builtin/am.c:2252 +#: builtin/am.c:2247 msgid "add a Signed-off-by line to the commit message" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΡΡΠΎΠΊΡ Signed-off-by ΠΊ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/am.c:2255 +#: builtin/am.c:2250 msgid "recode into utf8 (default)" msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠΎΠ΄ΠΈΡΠΎΠ²Π°ΡΡ Π² utf8 (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/am.c:2257 +#: builtin/am.c:2252 msgid "pass -k flag to git-mailinfo" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -k Π² git-mailinfo" -#: builtin/am.c:2259 +#: builtin/am.c:2254 msgid "pass -b flag to git-mailinfo" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -b Π² git-mailinfo" -#: builtin/am.c:2261 +#: builtin/am.c:2256 msgid "pass -m flag to git-mailinfo" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -m Π² git-mailinfo" -#: builtin/am.c:2263 +#: builtin/am.c:2258 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ --keep-cr Π² git-mailsplit Π΄Π»Ρ ΡΠΎΡΠΌΠ°ΡΠ° mbox" -#: builtin/am.c:2266 +#: builtin/am.c:2261 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "Π½Π΅ ΠΏΠ΅ΡΠ΅Π΄Π°Π²Π°ΡΡ --keep-cr ΡΠ»Π°Π³ Π² git-mailsplit Π²Π½Π΅ Π·Π°Π²ΠΈΡΠΈΠΌΠΎΡΡΠΈ ΠΎΡ am.keepcr" -#: builtin/am.c:2269 +#: builtin/am.c:2264 msgid "strip everything before a scissors line" msgstr "ΠΎΠ±ΡΠ΅Π·Π°ΡΡ Π²ΡΠ΅ Π΄ΠΎ ΡΡΡΠΎΠΊΠΈ ΠΎΠ±ΡΠ΅Π·ΠΊΠΈ" -#: builtin/am.c:2270 builtin/apply.c:4546 -msgid "action" -msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅" - -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 -#: builtin/am.c:2298 +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 +#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 +#: builtin/am.c:2293 msgid "pass it through git-apply" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ Π΅Π³ΠΎ Π² git-apply" -#: builtin/am.c:2279 builtin/apply.c:4570 -msgid "root" -msgstr "ΠΊΠΎΡΠ΅Π½Ρ" - -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 -#: builtin/submodule--helper.c:770 -msgid "path" -msgstr "ΠΏΡΡΡ" - -#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 -#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 -#: parse-options.h:132 parse-options.h:134 parse-options.h:244 +#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 +#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2291 builtin/apply.c:4514 -msgid "num" -msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ" - -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "ΡΠΎΡΠΌΠ°Ρ" -#: builtin/am.c:2295 +#: builtin/am.c:2290 msgid "format the patch(es) are in" msgstr "ΡΠΎΡΠΌΠ°Ρ, Π² ΠΊΠΎΡΠΎΡΠΎΠΌ Π½Π°Ρ
ΠΎΠ΄ΡΡΡΡ ΠΏΠ°ΡΡΠΈ" -#: builtin/am.c:2301 +#: builtin/am.c:2296 msgid "override error message when patch failure occurs" msgstr "ΠΏΠ΅ΡΠ΅ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΠ± ΠΎΡΠΈΠ±ΠΊΠ΅, Π΅ΡΠ»ΠΈ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°Π»ΠΎΠΆΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" -#: builtin/am.c:2303 +#: builtin/am.c:2298 msgid "continue applying patches after resolving a conflict" msgstr "ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ»ΠΈΠΊΡΠ°" -#: builtin/am.c:2306 +#: builtin/am.c:2301 msgid "synonyms for --continue" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --continue" -#: builtin/am.c:2309 +#: builtin/am.c:2304 msgid "skip the current patch" msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΠΏΠ°ΡΡ" -#: builtin/am.c:2312 +#: builtin/am.c:2307 msgid "restore the original branch and abort the patching operation." msgstr "Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." -#: builtin/am.c:2316 +#: builtin/am.c:2311 msgid "lie about committer date" msgstr "ΡΠΎΠ²ΡΠ°ΡΡ ΠΎ Π΄Π°ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ΅ΡΠ°" -#: builtin/am.c:2318 +#: builtin/am.c:2313 msgid "use current timestamp for author date" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ Π²ΡΠ΅ΠΌΡ ΠΊΠ°ΠΊ Π²ΡΠ΅ΠΌΡ Π°Π²ΡΠΎΡΡΡΠ²Π°" -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2321 +#: builtin/am.c:2316 msgid "GPG-sign commits" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ GPG" -#: builtin/am.c:2324 +#: builtin/am.c:2319 msgid "(internal use for git-rebase)" msgstr "(Π²Π½ΡΡΡΠ΅Π½Π½Π΅Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ Π΄Π»Ρ git-rebase)" -#: builtin/am.c:2339 +#: builtin/am.c:2334 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "ΠΠΏΡΠΈΡ -b/--binary ΡΠΆΠ΅ Π΄ΠΎΠ»Π³ΠΎΠ΅ Π²ΡΠ΅ΠΌΡ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ ΠΈ Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½Π° Ρ ΡΠ»Π΅Π΄ΡΡΡΠΈΡ
Π²Π΅ΡΡΠΈΡΡ
Git. ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π΅Π΅." -#: builtin/am.c:2346 +#: builtin/am.c:2341 msgid "failed to read the index" msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/am.c:2361 +#: builtin/am.c:2356 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ %s Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ, Π½ΠΎ ΠΏΠ΅ΡΠ΅Π΄Π°Π½ mbox." -#: builtin/am.c:2385 +#: builtin/am.c:2380 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "ΠΠ°ΠΉΠ΄Π΅Π½ Π·Π°Π±ΡΡΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ %s.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git am --abortΒ», ΡΡΠΎΠ±Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π΅Π³ΠΎ." -#: builtin/am.c:2391 +#: builtin/am.c:2386 msgid "Resolve operation not in progress, we are not resuming." msgstr "ΠΠΏΠ΅ΡΠ°ΡΠΈΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² Π½Π΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ, Π½Π΅ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ°Π΅ΠΌ." -#: builtin/apply.c:59 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<ΠΎΠΏΡΠΈΠΈ>] [<ΠΏΠ°ΡΡ>β¦]" -#: builtin/apply.c:111 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² Β«%sΒ»" - -#: builtin/apply.c:126 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΏΡΠΎΠ±Π΅Π»ΠΎΠ² Β«%sΒ»" - -#: builtin/apply.c:818 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΈΡΡ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΎΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΌΠ΅ΡΠΊΠΈ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ %s" - -#: builtin/apply.c:827 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΠ» %d Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°: %s" - -#: builtin/apply.c:908 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π² ΡΡΡΠΎΠΊΠ΅ ΠΏΠ°ΡΡΠ° %d" - -#: builtin/apply.c:937 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" - -#: builtin/apply.c:942 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ Π½ΠΎΠ²ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" - -#: builtin/apply.c:943 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ ΡΡΠ°ΡΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" - -#: builtin/apply.c:949 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" - -#: builtin/apply.c:1406 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: Π½Π΅ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ°: %.*s" - -#: builtin/apply.c:1463 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "ΡΡΠ°Π³ΠΌΠ΅Π½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π±Π΅Π· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s" - -#: builtin/apply.c:1480 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname" -" component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname" -" components (line %d)" -msgstr[0] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½ΡΠ° ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" -msgstr[1] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" -msgstr[2] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" -msgstr[3] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" - -#: builtin/apply.c:1646 -msgid "new file depends on old contents" -msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ" - -#: builtin/apply.c:1648 -msgid "deleted file still has contents" -msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅" - -#: builtin/apply.c:1674 -#, c-format -msgid "corrupt patch at line %d" -msgstr "ΠΏΠ°ΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" - -#: builtin/apply.c:1710 -#, c-format -msgid "new file %s depends on old contents" -msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» %s Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ" - -#: builtin/apply.c:1712 -#, c-format -msgid "deleted file %s still has contents" -msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» %s Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅" - -#: builtin/apply.c:1715 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠ°ΠΉΠ» %s ΡΡΠ°Π½ΠΎΠ²ΠΈΡΡΡ ΠΏΡΡΡΡΠΌ, Π½ΠΎ Π½Π΅ ΡΠ΄Π°Π»ΡΠ΅ΡΡΡ" - -#: builtin/apply.c:1861 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s" - -#: builtin/apply.c:1895 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" - -#: builtin/apply.c:2048 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "ΠΏΠ°ΡΡ Ρ ΠΌΡΡΠΎΡΠΎΠΌ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" - -#: builtin/apply.c:2138 -#, c-format -msgid "unable to read symlink %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ %s" - -#: builtin/apply.c:2142 -#, c-format -msgid "unable to open or read %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠ΅ΡΡΡ %s" - -#: builtin/apply.c:2775 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π½Π°ΡΠ°Π»ΠΎ ΡΡΡΠΎΠΊΠΈ: Β«%cΒ»" - -#: builtin/apply.c:2894 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΡ)." -msgstr[1] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊΠΈ)." -msgstr[2] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)." -msgstr[3] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)." - -#: builtin/apply.c:2906 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "ΠΠΎΠ½ΡΠ΅ΠΊΡΡ ΡΡΠΆΠ΅Π½ Π΄ΠΎ (%ld/%ld), ΡΡΠΎΠ±Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΡΠ°Π³ΠΌΠ΅Π½Ρ Π½Π° %d ΡΡΡΠΎΠΊΠ΅" - -#: builtin/apply.c:2912 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅:\n%.*s" - -#: builtin/apply.c:2932 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "ΠΏΡΠΎΠΏΡΡΠ΅Π½Ρ Π΄Π°Π½Π½ΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ Β«%sΒ»" - -#: builtin/apply.c:3033 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ ΠΊ Β«%sΒ»" - -#: builtin/apply.c:3039 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "ΠΏΠΎΡΠ»Π΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ Β«%sΒ» Π±ΡΠ» ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ (ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ %s, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s)" - -#: builtin/apply.c:3060 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: %s:%ld" - -#: builtin/apply.c:3184 -#, c-format -msgid "cannot checkout %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Π½Π° %s" - -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 -#, c-format -msgid "read of %s failed" -msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΡΡΠ΅Π½ΠΈΡ %s" - -#: builtin/apply.c:3237 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "ΡΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· Β«%sΒ» Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" - -#: builtin/apply.c:3265 builtin/apply.c:3487 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "ΠΏΡΡΡ %s Π±ΡΠ» ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½/ΡΠ΄Π°Π»Π΅Π½" - -#: builtin/apply.c:3346 builtin/apply.c:3501 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: Π½Π΅Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" - -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 -#, c-format -msgid "%s: %s" -msgstr "%s: %s" - -#: builtin/apply.c:3355 builtin/apply.c:3509 -#, c-format -msgid "%s: does not match index" -msgstr "%s: Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ" - -#: builtin/apply.c:3457 -msgid "removal patch leaves file contents" -msgstr "ΠΏΠ°ΡΡ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ ΡΠ΄Π°Π»ΠΈΠ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π°" - -#: builtin/apply.c:3526 -#, c-format -msgid "%s: wrong type" -msgstr "%s: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠΈΠΏ" - -#: builtin/apply.c:3528 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s ΠΈΠΌΠ΅Π΅Ρ ΡΠΈΠΏ %o, Π° ΠΎΠΆΠΈΠ΄Π°Π»ΡΡ %o" - -#: builtin/apply.c:3687 builtin/apply.c:3689 -#, c-format -msgid "invalid path '%s'" -msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΡΡΡ Β«%sΒ»" - -#: builtin/apply.c:3744 -#, c-format -msgid "%s: already exists in index" -msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" - -#: builtin/apply.c:3747 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" - -#: builtin/apply.c:3767 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o)" - -#: builtin/apply.c:3772 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s" - -#: builtin/apply.c:3792 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "Π·Π°ΡΡΠΎΠ½ΡΡΡΠΉ ΡΠ°ΠΉΠ» Β«%sΒ» Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" - -#: builtin/apply.c:3796 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ" - -#: builtin/apply.c:3810 -#, c-format -msgid "Checking patch %s..." -msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΠ°ΡΡΠ° %sβ¦" - -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "ΡΠ±ΠΎΠΉ make_cache_entry Π΄Π»Ρ ΠΏΡΡΠΈ Β«%sΒ»" - -#: builtin/apply.c:4046 -#, c-format -msgid "unable to remove %s from index" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" - -#: builtin/apply.c:4075 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ ΠΏΠ°ΡΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s" - -#: builtin/apply.c:4079 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° Β«%sΒ»" - -#: builtin/apply.c:4084 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° %s" - -#: builtin/apply.c:4087 builtin/apply.c:4195 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π·Π°ΠΏΠΈΡΡ Π² ΠΊΡΡΠ΅ Π΄Π»Ρ %s" - -#: builtin/apply.c:4120 -#, c-format -msgid "closing file '%s'" -msgstr "Π·Π°ΠΊΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Π° Β«%sΒ»" - -#: builtin/apply.c:4169 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ» Ρ ΡΠ΅ΠΆΠΈΠΌΠΎΠΌ Π΄ΠΎΡΡΡΠΏΠ° %o" - -#: builtin/apply.c:4256 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "ΠΠ°ΡΡ %s ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ." - -#: builtin/apply.c:4264 -msgid "internal error" -msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ°" - -#: builtin/apply.c:4267 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·ΠΎΠΌβ¦" -msgstr[1] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" -msgstr[2] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" -msgstr[3] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" - -#: builtin/apply.c:4277 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "ΡΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠΌΠ΅Π½ΠΈ .rej ΡΠ°ΠΉΠ»Π° Π΄ΠΎ %.*s.rej" - -#: builtin/apply.c:4285 -#, c-format -msgid "cannot open %s: %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s: %s" - -#: builtin/apply.c:4298 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "ΠΠ»ΠΎΠΊ β%d ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ." - -#: builtin/apply.c:4301 -#, c-format -msgid "Rejected hunk #%d." -msgstr "ΠΠ»ΠΎΠΊ β%d ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½." - -#: builtin/apply.c:4387 -#, c-format -msgid "Skipped patch '%s'." -msgstr "ΠΠ°ΡΡ Β«%sΒ» ΠΏΡΠΎΠΏΡΡΠ΅Π½." - -#: builtin/apply.c:4395 -msgid "unrecognized input" -msgstr "Π½Π΅ ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π²Π²ΠΎΠ΄" - -#: builtin/apply.c:4406 -msgid "unable to read index file" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" - -#: builtin/apply.c:4509 -msgid "don't apply changes matching the given path" -msgstr "Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ" - -#: builtin/apply.c:4512 -msgid "apply changes matching the given path" -msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ" - -#: builtin/apply.c:4515 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "ΡΠ΄Π°Π»ΠΈΡΡ <ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ> Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΡΡΡ
ΡΠ΅ΡΡ ΠΈΠ· ΡΡΠ°Π΄ΠΈΡΠΈΠΎΠ½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ ΡΠΏΠΈΡΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" - -#: builtin/apply.c:4518 -msgid "ignore additions made by the patch" -msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ, ΡΠ΄Π΅Π»Π°Π½Π½ΡΠ΅ ΡΡΠΈΠΌ ΠΏΠ°ΡΡΠ΅ΠΌ" - -#: builtin/apply.c:4520 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠΉ ΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°" - -#: builtin/apply.c:4524 -msgid "show number of added and deleted lines in decimal notation" -msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
ΠΈ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
ΡΡΡΠΎΠΊ Π² Π΄Π΅ΡΡΡΠΈΡΠ½ΠΎΠΌ ΠΏΡΠ΅Π΄ΡΡΠ°Π²Π»Π΅Π½ΠΈΠΈ" - -#: builtin/apply.c:4526 -msgid "instead of applying the patch, output a summary for the input" -msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°" - -#: builtin/apply.c:4528 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΠΈΡ Π»ΠΈ ΠΎΠ½" - -#: builtin/apply.c:4530 -msgid "make sure the patch is applicable to the current index" -msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ ΠΊ ΡΠ΅ΠΊΡΡΠ΅ΠΌΡ ΠΈΠ½Π΄Π΅ΠΊΡΡ" - -#: builtin/apply.c:4532 -msgid "apply a patch without touching the working tree" -msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ, Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" - -#: builtin/apply.c:4534 -msgid "accept a patch that touches outside the working area" -msgstr "ΠΏΡΠΈΠ½ΡΡΡ ΠΏΠ°ΡΡ, ΠΊΠΎΡΠΎΡΡΠΉ Π·Π°ΡΡΠ°Π³ΠΈΠ²Π°Π΅Ρ ΡΠ°ΠΉΠ»Ρ Π·Π° ΡΠ°Π±ΠΎΡΠΈΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" - -#: builtin/apply.c:4536 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "Π° ΡΠ°ΠΊΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Ρ --stat/--summary/--check)" - -#: builtin/apply.c:4538 -msgid "attempt three-way merge if a patch does not apply" -msgstr "ΠΏΠΎΠΏΡΡΠ°ΡΡΡΡ ΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π΅ΡΠ»ΠΈ ΠΏΠ°ΡΡ Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ" - -#: builtin/apply.c:4540 -msgid "build a temporary index based on embedded index information" -msgstr "ΠΏΠΎΡΡΡΠΎΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΠΉ Π½Π° Π²ΡΡΡΠΎΠ΅Π½Π½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" - -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 -msgid "paths are separated with NUL character" -msgstr "ΠΏΡΡΠΈ, ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠ΅ ΠΠ£ΠΠΠΠ«Π ΡΠΈΠΌΠ²ΠΎΠ»ΠΎΠΌ" - -#: builtin/apply.c:4545 -msgid "ensure at least <n> lines of context match" -msgstr "ΡΠ΄ΠΎΡΡΠΎΠ²Π΅ΡΠΈΡΡΡΡ, ΡΡΠΎ ΠΏΠΎ ΠΊΡΠ°ΠΉΠ½Π΅ΠΉ ΠΌΠ΅ΡΠ΅ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ" - -#: builtin/apply.c:4547 -msgid "detect new or modified lines that have whitespace errors" -msgstr "ΠΎΠΏΡΠ΅Π΄Π΅Π»ΡΡΡ Π½ΠΎΠ²ΡΠ΅ ΠΈΠ»ΠΈ ΠΌΠΎΠ΄ΠΈΡΠΈΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ, Ρ ΠΊΠΎΡΠΎΡΡΡ
Π΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" - -#: builtin/apply.c:4550 builtin/apply.c:4553 -msgid "ignore changes in whitespace when finding context" -msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" - -#: builtin/apply.c:4556 -msgid "apply the patch in reverse" -msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ Ρ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" - -#: builtin/apply.c:4558 -msgid "don't expect at least one line of context" -msgstr "Π½Π΅ ΠΎΠΆΠΈΠ΄Π°ΡΡ ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ ΠΎΠ΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" - -#: builtin/apply.c:4560 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½Π½ΡΠ΅ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΡ
*.rej ΡΠ°ΠΉΠ»Π°Ρ
" - -#: builtin/apply.c:4562 -msgid "allow overlapping hunks" -msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΊΡΡΠ²Π°ΡΡΠΈΠ΅ΡΡ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" - -#: builtin/apply.c:4565 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π½Π΅ΠΊΠΎΡΡΠ΅ΠΊΡΠ½ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΠΎΠΏΡΡΠ΅Π½Π½ΡΠ΅ ΠΏΡΡΡΡΠ΅ ΡΡΡΠΎΠΊΠΈ Π² ΠΊΠΎΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Π°" - -#: builtin/apply.c:4568 -msgid "do not trust the line counts in the hunk headers" -msgstr "Π½Π΅ Π΄ΠΎΠ²Π΅ΡΡΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΡΡΡΠΎΠΊ ΠΈΠ· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π±Π»ΠΎΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" - -#: builtin/apply.c:4571 -msgid "prepend <root> to all filenames" -msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ <ΠΊΠΎΡΠ΅Π½Ρ> ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊΠΎ Π²ΡΠ΅ΠΌ ΠΈΠΌΠ΅Π½Π°ΠΌ ΡΠ°ΠΉΠ»ΠΎΠ²" - -#: builtin/apply.c:4593 -msgid "--3way outside a repository" -msgstr "--3way Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" - -#: builtin/apply.c:4601 -msgid "--index outside a repository" -msgstr "--index Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" - -#: builtin/apply.c:4604 -msgid "--cached outside a repository" -msgstr "--cached Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" - -#: builtin/apply.c:4623 -#, c-format -msgid "can't open patch '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΏΠ°ΡΡ Β«%sΒ»" - -#: builtin/apply.c:4637 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "ΠΏΡΠΎΠΏΡΡΠ΅Π½Π° %d ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" -msgstr[1] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" -msgstr[2] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" -msgstr[3] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" - -#: builtin/apply.c:4643 builtin/apply.c:4653 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d ΡΡΡΠΎΠΊΠ° Π΄ΠΎΠ±Π°Π²ΠΈΠ»Π° ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." -msgstr[1] "%d ΡΡΡΠΎΠΊΠΈ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." -msgstr[2] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." -msgstr[3] "%d ΡΡΡΠΎΠΊ Π΄ΠΎΠ±Π°Π²ΠΈΠ»ΠΈ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
." - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -3532,116 +4302,164 @@ msgstr "git blame [<ΠΎΠΏΡΠΈΠΈ>] [<ΠΎΠΏΡΠΈΠΈ-ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ>] [<ΡΠ΅Π΄Π°ΠΊΡΠ msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<ΠΎΠΏΡΠΈΠΈ-rev-list> Π΄ΠΎΠΊΡΠΌΠ΅Π½ΡΠΈΡΠΎΠ²Π°Π½Ρ Π² git-rev-list(1)" -#: builtin/blame.c:1782 +#: builtin/blame.c:1781 msgid "Blaming lines" msgstr "ΠΡΠΎΡΠΌΠΎΡΡ Π°Π²ΡΠΎΡΠΎΠ² ΡΡΡΠΎΠΊ" -#: builtin/blame.c:2531 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π·Π°ΠΏΠΈΡΠΈ Π°Π²ΡΠΎΡΡΡΠ²Π° ΠΏΠΎΡΡΠ΅ΠΏΠ΅Π½Π½ΠΎ, Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π½Π°Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΡ" -#: builtin/blame.c:2532 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ SHA-1 Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ², Π½Π΅ Π²Ρ
ΠΎΠ΄ΡΡΠΈΡ
Π² Π³ΡΠ°Π½ΠΈΡΡ Π·Π°ΠΏΡΠΎΡΠ° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ΠΠ΅ Π²ΠΎΡΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΠΊΠΎΡΠ½Π΅Π²ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ ΠΊΠ°ΠΊ Π³ΡΠ°Π½ΠΈΡΠ½ΡΠ΅ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2534 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΡΠ°ΡΡ
ΠΎΠ΄ΠΎΠ² Π½Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ Π·Π°ΠΏΡΠΎΡΠ°" -#: builtin/blame.c:2535 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "ΠΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/blame.c:2536 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠ΅Π½ΠΊΡ Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠ΅ΠΉ Π°Π²ΡΠΎΡΡΡΠ²Π°" -#: builtin/blame.c:2537 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΠ΅ Π½ΠΎΠΌΠ΅ΡΠ° ΡΡΡΠΎΠΊ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ Π΄Π»Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ½ΠΎΠ³ΠΎ ΡΠ°Π·Π±ΠΎΡΠ°" -#: builtin/blame.c:2540 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π² ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅, Ρ ΠΏΠΎΡΡΡΠΎΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠ΅ΠΉ ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ΅" -#: builtin/blame.c:2541 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΠΊΠΎΠΉ ΠΆΠ΅ ΡΠΎΡΠΌΠ°Ρ Π²ΡΠ²ΠΎΠ΄Π°, ΠΊΠ°ΠΊ ΠΈ git-annotate (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠ΅ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π΄Π»ΠΈΠ½Π½ΡΠΉ SHA1 ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠΌΡ Π°Π²ΡΠΎΡΠ° ΠΈ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΠΎΡΡΡ Π°Π²ΡΠΎΡΠ° Π²ΠΌΠ΅ΡΡΠΎ ΠΈΠΌΠ΅Π½ΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2546 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "ΠΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
" -#: builtin/blame.c:2547 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΡΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½ΡΠ°Π»ΡΠ½ΡΡ ΡΠ²ΡΠΈΡΡΠΈΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΡ Π½Π° ΠΎΡΡΡΡΠΏΠ°Ρ
, ΡΡΠΎΠ±Ρ ΡΠ»ΡΡΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠ°Π·Π»ΠΈΡΠΈΠΉ" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΡΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½ΡΠ°Π»ΡΠ½ΡΡ ΡΠ²ΡΠΈΡΡΠΈΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΡ Π½Π° ΠΏΡΡΡΡΡ
ΡΡΡΠΎΠΊΠ°Ρ
, ΡΡΠΎΠ±Ρ ΡΠ»ΡΡΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠ°Π·Π»ΠΈΡΠΈΠΉ" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "ΠΠΎΡΡΠ°ΡΠΈΡΡ Π±ΠΎΠ»ΡΡΠ΅ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ, Π΄Π»Ρ Π½Π°Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΡ Π»ΡΡΡΠΈΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ" -#: builtin/blame.c:2548 +#: builtin/blame.c:2603 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ ΠΈΠ· <ΡΠ°ΠΉΠ»Π°> Π²ΠΌΠ΅ΡΡΠΎ Π²ΡΠ·ΠΎΠ²Π° git-rev-list" -#: builtin/blame.c:2549 +#: builtin/blame.c:2604 msgid "Use <file>'s contents as the final image" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ <ΡΠ°ΠΉΠ»Π°> ΠΊΠ°ΠΊ ΡΠΈΠ½Π°Π»ΡΠ½ΡΠΉ ΡΠ½ΠΈΠΌΠΎΠΊ" -#: builtin/blame.c:2550 builtin/blame.c:2551 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "ΠΌΠΈΠ½-Π΄Π»ΠΈΠ½Π°" -#: builtin/blame.c:2550 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "ΠΠ°ΠΉΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΡΡΡΠΎΠΊ Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
ΠΈ ΠΌΠ΅ΠΆΠ΄Ρ ΡΠ°ΠΉΠ»Π°ΠΌΠΈ" -#: builtin/blame.c:2551 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "ΠΠ°ΠΉΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΡΡΡΠΎΠΊ Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
ΠΈ ΠΌΠ΅ΠΆΠ΄Ρ ΡΠ°ΠΉΠ»Π°ΠΌΠΈ" -#: builtin/blame.c:2552 +#: builtin/blame.c:2607 msgid "n,m" msgstr "Π½Π°ΡΠ°Π»ΠΎ,ΠΊΠΎΠ½Π΅Ρ" -#: builtin/blame.c:2552 +#: builtin/blame.c:2607 msgid "Process only line range n,m, counting from 1" msgstr "ΠΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΡΠΎΠΊΠΈ Π² Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½Π΅ Π½Π°ΡΠ°Π»ΠΎ,ΠΊΠΎΠ½Π΅Ρ, Π½Π°ΡΠΈΠ½Π°Ρ Ρ 1" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "--progress Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --incremental ΠΈΠ»ΠΈ ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΡΠΌ (porcelain) ΡΠΎΡΠΌΠ°ΡΠΎΠΌ" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2641 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "4 Π³ΠΎΠ΄Π° ΠΈ 11 ΠΌΠ΅ΡΡΡΠ΅Π² Π½Π°Π·Π°Π΄" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "--contents ΠΈ --reverse Π½Π΅ ΠΎΡΠ΅Π½Ρ ΡΠΎΡΠ΅ΡΠ°ΡΡΡΡ." + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ --contents Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΡΠΈΠ½Π°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΈΠΌΠ΅Π½ΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "ΠΏΡΠΈ --reverse ΠΈ --first-parent Π²ΠΌΠ΅ΡΡΠ΅ Π½ΡΠΆΠ½ΠΎ ΡΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΊΠΎΠ½ΠΊΡΠ΅ΡΠ½ΡΠΉ ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ --reverse ΠΈ --first-parent Π²ΠΌΠ΅ΡΡΠ΅, ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ°ΠΊΠΆΠ΅ ΡΠΊΠ°Π·Π°ΡΡ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ ΠΏΠΎ ΡΠ΅ΠΏΠΎΡΠΊΠ΅ ΠΏΠ΅ΡΠ²ΠΎΠ³ΠΎ ΡΠΎΠ΄ΠΈΡΠ΅Π»Ρ" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "Π½Π΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ ΠΏΡΡΠΈ %s Π² %s" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ %s Π΄Π»Ρ ΠΏΡΡΠΈ %s" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊΡ" +msgstr[1] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊΠΈ" +msgstr[2] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊ" +msgstr[3] "ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΎΠ»ΡΠΊΠΎ %lu ΡΡΡΠΎΠΊΠΈ" + #: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<ΠΎΠΏΡΠΈΠΈ>] [-r | -a] [--merged | --no-merged]" @@ -3735,118 +4553,122 @@ msgstr "ΠΠ½Π΅ΡΠ½ΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ° %s ΡΠ΄Π°Π»Π΅Π½Π° ( msgid "Deleted branch %s (was %s).\n" msgstr "ΠΠ΅ΡΠΊΠ° %s ΡΠ΄Π°Π»Π΅Π½Π° (Π±ΡΠ»Π° %s).\n" -#: builtin/branch.c:309 +#: builtin/branch.c:312 #, c-format msgid "[%s: gone]" msgstr "[%s: ΠΏΡΠΎΠΏΠ°Π»]" -#: builtin/branch.c:314 +#: builtin/branch.c:317 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:319 +#: builtin/branch.c:322 #, c-format msgid "[%s: behind %d]" msgstr "[%s: ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:324 #, c-format msgid "[behind %d]" msgstr "[ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:325 +#: builtin/branch.c:328 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:330 #, c-format msgid "[ahead %d]" msgstr "[Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d]" -#: builtin/branch.c:330 +#: builtin/branch.c:333 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d, ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:333 +#: builtin/branch.c:336 #, c-format msgid "[ahead %d, behind %d]" msgstr "[Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d, ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:346 +#: builtin/branch.c:349 msgid " **** invalid ref ****" msgstr " **** Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ° ****" -#: builtin/branch.c:372 +#: builtin/branch.c:375 #, c-format msgid "(no branch, rebasing %s)" msgstr "(Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ, ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ %s)" -#: builtin/branch.c:375 +#: builtin/branch.c:378 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ, Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ Π½Π°ΡΠ°Ρ Π½Π° %s)" #. TRANSLATORS: make sure this matches #. "HEAD detached at " in wt-status.c -#: builtin/branch.c:381 +#: builtin/branch.c:384 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π° %s)" #. TRANSLATORS: make sure this matches #. "HEAD detached from " in wt-status.c -#: builtin/branch.c:386 +#: builtin/branch.c:389 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π°ΡΠΈΠ½Π°Ρ Ρ %s)" -#: builtin/branch.c:390 +#: builtin/branch.c:393 msgid "(no branch)" msgstr "(Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ)" -#: builtin/branch.c:541 +#: builtin/branch.c:544 #, c-format msgid "Branch %s is being rebased at %s" msgstr "ΠΡΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ %s Π½Π° %s" -#: builtin/branch.c:545 +#: builtin/branch.c:548 #, c-format msgid "Branch %s is being bisected at %s" msgstr "ΠΡΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ Π² Π²Π΅ΡΠΊΠ΅ %s Π½Π° %s" -#: builtin/branch.c:560 +#: builtin/branch.c:563 msgid "cannot rename the current branch while not on any." msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ, Π΅ΡΠ»ΠΈ Π²Ρ Π½Π΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π½ΠΈΡ
." -#: builtin/branch.c:570 +#: builtin/branch.c:573 #, c-format msgid "Invalid branch name: '%s'" msgstr "ΠΠ΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ: Β«%sΒ»" -#: builtin/branch.c:587 +#: builtin/branch.c:590 msgid "Branch rename failed" msgstr "Π‘Π±ΠΎΠΉ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:591 +#: builtin/branch.c:594 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π° Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎ Π½Π°Π·Π²Π°Π½Π½Π°Ρ Π²Π΅ΡΠΊΠ° Β«%sΒ»" -#: builtin/branch.c:594 +#: builtin/branch.c:597 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "ΠΠ΅ΡΠΊΠ° ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π° Π² %s, Π½ΠΎ HEAD Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½!" -#: builtin/branch.c:601 +#: builtin/branch.c:604 msgid "Branch is renamed, but update of config-file failed" msgstr "ΠΠ΅ΡΠΊΠ° ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π°, Π½ΠΎ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ΅Π» ΡΠ±ΠΎΠΉ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/branch.c:623 -msgid "could not write branch description template" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½ ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π²Π΅ΡΠΊΠΈ" +#: builtin/branch.c:620 +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "ΠΠ·ΠΌΠ΅Π½ΠΈΡΠ΅ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π΄Π»Ρ Π²Π΅ΡΠΊΠΈ:\n %s\nΠ‘ΡΡΠΎΠΊΠΈ, Π½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ Β«%cΒ» Π±ΡΠ΄ΡΡ Π²ΡΡΠ΅Π·Π°Π½Ρ.\n" #: builtin/branch.c:651 msgid "Generic options" @@ -3876,6 +4698,10 @@ msgstr "Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ" msgid "change the upstream info" msgstr "ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "Π£Π±ΡΠ°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅" + #: builtin/branch.c:661 msgid "use colored output" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ²Π΅ΡΠ½ΠΎΠΉ Π²ΡΠ²ΠΎΠ΄" @@ -3948,8 +4774,8 @@ msgstr "ΠΊΠ»ΡΡ" msgid "field name to sort on" msgstr "ΠΈΠΌΡ ΠΏΠΎΠ»Ρ, ΠΏΠΎ ΠΊΠΎΡΠΎΡΠΎΠΌΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠΎΡΡΠΈΡΠΎΠ²ΠΊΡ" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 #: builtin/tag.c:369 msgid "object" msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ" @@ -3962,7 +4788,7 @@ msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ, ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅Π msgid "Failed to resolve HEAD as a valid ref." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD ΠΊΠ°ΠΊ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ." -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² refs/heads!" @@ -4065,61 +4891,75 @@ msgstr "Π’ΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΠΏΠ°ΠΊ msgid "Need a repository to unbundle." msgstr "Π’ΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ." -#: builtin/cat-file.c:428 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-" -"type]|-e|-p|<type>|--textconv) <object>" -msgstr "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<ΡΠΈΠΏ>|--textconv) <ΠΎΠ±ΡΠ΅ΠΊΡ>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | " +"-p | <type> | --textconv | --filters) [--path=<path>] <object>" +msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <ΡΠΈΠΏ> | --textconv | --filters) [--path=<ΠΏΡΡΡ>] <ΠΎΠ±ΡΠ΅ΠΊΡ>" -#: builtin/cat-file.c:429 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:514 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | " +"--filters]" +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:466 +#: builtin/cat-file.c:551 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<ΡΠΈΠΏ> ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ·: blob, tree, commit, tag" -#: builtin/cat-file.c:467 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ°" -#: builtin/cat-file.c:468 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠ°Π·ΠΌΠ΅Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ°" -#: builtin/cat-file.c:470 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "Π²ΡΠΉΡΠΈ Ρ Π½ΡΠ»Π΅Π²ΡΠΌ ΠΊΠΎΠ΄ΠΎΠΌ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°, Π΅ΡΠ»ΠΈ Π½Π΅Ρ ΠΎΡΠΈΠ±ΠΊΠΈ" -#: builtin/cat-file.c:471 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "ΡΡΡΡΠΊΡΡΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠΉ Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ°" -#: builtin/cat-file.c:473 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" msgstr "Π·Π°ΠΏΡΡΡΠΈΡΡ texconv Π½Π° ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² " -#: builtin/cat-file.c:475 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "Π·Π°ΠΏΡΡΠΊ ΡΠΈΠ»ΡΡΡΠΎΠ² Π½Π° ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² " + +#: builtin/cat-file.c:561 git-submodule.sh:923 +msgid "blob" +msgstr "Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ" + +#: builtin/cat-file.c:562 +msgid "use a specific path for --textconv/--filters" +msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΡΠΉ ΠΏΡΡΡ Π΄Π»Ρ --textconv/--filters" + +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ -s ΠΈ -t ΡΠ°Π±ΠΎΡΠ°ΡΡ Ρ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½Π½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" -#: builtin/cat-file.c:476 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "Π±ΡΡΡΠ΅ΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ²ΠΎΠ΄ --batch" -#: builtin/cat-file.c:478 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΈ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ², ΠΏΠ΅ΡΠ΅Π΄Π°Π½Π½ΡΡ
ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΎΠ±ΡΠ΅ΠΊΡΠ°Ρ
, ΠΏΠ΅ΡΠ΅Π΄Π°Π½Π½ΡΡ
ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/cat-file.c:484 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ΠΈΡΡ ΠΏΠΎ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΠΌ ΡΡΡΠ»ΠΊΠ°ΠΌ Π²Π½ΡΡΡΠΈ Π΄Π΅ΡΠ΅Π²Π° (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΡΡΡ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ --batch ΠΈ --batch-check)" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π²ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ --batch ΠΈΠ»ΠΈ --batch-check" @@ -4139,7 +4979,7 @@ msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π²ΡΠ΅ Π°ΡΡΠΈΠ±ΡΡΡ ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½Π½ΡΠ΅ Π΄Π»Ρ msgid "use .gitattributes only from the index" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ .gitattributes ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" @@ -4147,7 +4987,7 @@ msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ msgid "terminate input and output records by a NUL character" msgstr "ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ Π²Π²ΠΎΠ΄Π° ΠΈ Π²ΡΠ²ΠΎΠ΄Π° Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΏΠΎ ΠΠ£ΠΠΠΠΠΠ£ ΡΠΈΠΌΠ²ΠΎΠ»Ρ" -#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" @@ -4237,9 +5077,9 @@ msgid "write the content to temporary files" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π²ΠΎ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 -#: builtin/submodule--helper.c:774 +#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 +#: builtin/worktree.c:469 msgid "string" msgstr "ΡΡΡΠΎΠΊΠ°" @@ -4305,63 +5145,59 @@ msgstr "Β«%sΒ» Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ ΠΏΡΡΠΈ ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ°ΡΡΡΡ Π½Π° Π²Π΅ΡΠΊΡ Β«%sΒ» ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/checkout.c:279 builtin/checkout.c:473 -msgid "corrupt index file" -msgstr "ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" - #: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "ΠΏΡΡΡ Β«%sΒ» Π½Π΅ ΡΠ»ΠΈΡ" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "ΡΠ½Π°ΡΠ°Π»Π° Π½ΡΠΆΠ½ΠΎ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π² Π²Π°ΡΠ΅ΠΌ ΡΠ΅ΠΊΡΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: builtin/checkout.c:622 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ Π΄Π»Ρ Β«%sΒ»: %s\n" -#: builtin/checkout.c:660 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "HEAD ΡΠ΅ΠΉΡΠ°Ρ Π½Π°" -#: builtin/checkout.c:664 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ HEAD" -#: builtin/checkout.c:668 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "Π‘Π±ΡΠΎΡ Π²Π΅ΡΠΊΠΈ Β«%sΒ»\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "Π£ΠΆΠ΅ Π½Π° Β«%sΒ»\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΠΈ ΡΠ±ΡΠΎΡ Π²Π΅ΡΠΊΠΈ Β«%sΒ»\n" -#: builtin/checkout.c:677 builtin/checkout.c:1067 +#: builtin/checkout.c:680 builtin/checkout.c:1069 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ Β«%sΒ»\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π½Π° Π²Π΅ΡΠΊΡ Β«%sΒ»\n" -#: builtin/checkout.c:731 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr " β¦ ΠΈ Π΅ΡΠ΅ %d.\n" -#: builtin/checkout.c:737 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4378,7 +5214,7 @@ msgstr[1] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ msgstr[2] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π½Π΅ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠ΅ Π½ΠΈ Ρ ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π°ΡΠΈΡ
Π²Π΅ΡΠΎΠΊ:\n\n%s\n" msgstr[3] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π½Π΅ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠ΅ Π½ΠΈ Ρ ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π°ΡΠΈΡ
Π²Π΅ΡΠΎΠΊ:\n\n%s\n" -#: builtin/checkout.c:756 +#: builtin/checkout.c:758 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4397,162 +5233,162 @@ msgstr[1] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ msgstr[2] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ, ΡΠΎ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°ΠΌΠΎΠ΅ Π²ΡΠ΅ΠΌΡ\nΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ:\n\n git branch <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ> %s\n" msgstr[3] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ, ΡΠΎ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°ΠΌΠΎΠ΅ Π²ΡΠ΅ΠΌΡ\nΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ:\n\n git branch <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ> %s\n" -#: builtin/checkout.c:792 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΠΈ ΠΏΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΌ" -#: builtin/checkout.c:796 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "ΠΡΠ΅Π΄ΡΠ΄ΡΡΠ°Ρ ΠΏΠΎΠ·ΠΈΡΠΈΡ HEAD Π±ΡΠ»Π°" -#: builtin/checkout.c:823 builtin/checkout.c:1062 +#: builtin/checkout.c:825 builtin/checkout.c:1064 msgid "You are on a branch yet to be born" msgstr "ΠΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ Π½Π° Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠΉ Π²Π΅ΡΠΊΠ΅" -#: builtin/checkout.c:968 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." msgstr "ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΡΡΡΠ»ΠΊΠ°, Π° ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ %d." -#: builtin/checkout.c:1008 builtin/worktree.c:212 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ°: %s" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "Π² Π΄Π΅ΡΠ΅Π²Π΅ Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ: %s" -#: builtin/checkout.c:1076 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΡΡΠΈ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΎΠΊ" -#: builtin/checkout.c:1079 builtin/checkout.c:1083 +#: builtin/checkout.c:1081 builtin/checkout.c:1085 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Β«%sΒ» ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΎΠΊ" -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 +#: builtin/checkout.c:1100 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "Β«%sΒ» Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ Β«%sΒ»" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1105 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ Π²Π΅ΡΠΊΡ Π½Π° Π½Π΅ ΠΊΠΎΠΌΠΌΠΈΡ Β«%sΒ»" -#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 -#: builtin/worktree.c:325 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 +#: builtin/worktree.c:326 msgid "branch" msgstr "Π²Π΅ΡΠΊΠ°" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ/ΡΠ±ΡΠΎΡΠΈΡΡ ΠΈ ΠΏΠ΅ΡΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ Π΄Π»Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" -#: builtin/checkout.c:1141 -msgid "detach the HEAD at named commit" +#: builtin/checkout.c:1143 builtin/worktree.c:328 +msgid "detach HEAD at named commit" msgstr "ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ HEAD Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ΅" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅ Π΄Π»Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "Π½ΠΎΠ²Π°Ρ-Π²Π΅ΡΠΊΠ°" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "Π½ΠΎΠ²Π°Ρ Π²Π΅ΡΠΊΠ° Π±Π΅Π· ΡΠΎΠ΄ΠΈΡΠ΅Π»Π΅ΠΉ" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½Π°ΡΡ Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΠΈΡ
Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ (ΠΎΡΠ±ΡΠ°ΡΡΠ²Π°Π΅Ρ Π²ΡΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ)" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΎΠΉ" -#: builtin/checkout.c:1151 builtin/merge.c:230 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 +#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "ΡΡΠΈΠ»Ρ" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "ΡΡΠΈΠ»Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² ΡΠ»ΠΈΡΠ½ΠΈΡ (merge ΠΈΠ»ΠΈ diff3)" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "Π½Π΅ ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΠ²Π°ΡΡ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡΡ ΠΏΡΡΠΈ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌΠΈ Π·Π°ΠΏΠΈΡΡΠΌΠΈ" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout <no-such-branch>'" msgstr "ΠΏΠ΅ΡΠ΅ΡΠΌΠΎΡΡ Β«git checkout <Π½Π΅Ρ-ΡΠ°ΠΊΠΎΠΉ-Π²Π΅ΡΠΊΠΈ>Β»" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1162 msgid "do not check if another worktree is holding the given ref" msgstr "Π½Π΅ ΠΏΡΠΎΠ²Π΅ΡΡΡΡ, ΡΡΠΎ Π΄ΡΡΠ³ΠΎΠ΅ Π΄Π΅ΡΠ΅Π²ΠΎ ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ ΡΡΡΠ»ΠΊΡ" -#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 +#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ" -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B ΠΈ --orphan Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "--track ΡΡΠ΅Π±ΡΠ΅Ρ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "ΠΡΠΎΠΏΡΡΠ΅Π½ΠΎ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ; ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ -b" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ" -#: builtin/checkout.c:1257 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΏΡΡΠΈ ΠΈ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π²Π΅ΡΠΊΡ Β«%sΒ».\nΠΡ Ρ
ΠΎΡΠ΅Π»ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Β«%sΒ», ΡΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΎ ΠΊΠ°ΠΊ ΠΊΠΎΠΌΠΌΠΈΡ?" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1264 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach Π½Π΅ ΠΏΡΠΈΠ½ΠΈΠΌΠ°Π΅Ρ ΠΏΡΡΡ Β«%sΒ» ΠΊΠ°ΠΊ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ" -#: builtin/checkout.c:1266 +#: builtin/checkout.c:1268 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4684,8 +5520,8 @@ msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½Π°Ρ ΠΎΡΠΈΡΡΠΊΠ°" msgid "remove whole directories" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 msgid "pattern" msgstr "ΡΠ°Π±Π»ΠΎΠ½" @@ -4721,290 +5557,306 @@ msgstr "clean.requireForce ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ ΠΊΠ°ΠΊ t msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<ΠΎΠΏΡΠΈΠΈ>] [--] <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>]" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "Π½Π΅ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ°ΡΡ ΡΠ°Π±ΠΎΡΡΡ ΠΊΠΎΠΏΠΈΡ Π½Π° HEAD" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 +#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 msgid "create a bare repository" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π³ΠΎΠ»ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π·Π΅ΡΠΊΠ°Π»ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ (Π²ΠΊΠ»ΡΡΠ°Π΅Ρ Π² ΡΠ΅Π±Ρ ΠΈ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ bare)" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ· Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "Π½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΆΠ΅ΡΡΠΊΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π²ΡΠ΅Π³Π΄Π° ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "Π½Π°ΡΡΡΠΎΠΈΡΡ ΠΊΠ°ΠΊ ΠΎΠ±ΡΠ΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ Π² ΠΊΠ»ΠΎΠ½Π΅" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ" -#: builtin/clone.c:80 builtin/init-db.c:470 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³-ΡΠ°Π±Π»ΠΎΠ½ΠΎΠ²" -#: builtin/clone.c:81 builtin/init-db.c:471 +#: builtin/clone.c:84 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³, ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΎΠ³ΠΎ Π±ΡΠ΄ΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½Ρ" -#: builtin/clone.c:83 builtin/submodule--helper.c:498 -#: builtin/submodule--helper.c:777 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 +#: builtin/submodule--helper.c:954 msgid "reference repository" msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ --reference ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ΠΈΠΌΡ" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use <name> instead of 'origin' to track upstream" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΠΈΠΌΡ> Π²ΠΌΠ΅ΡΡΠΎ Β«originΒ» Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout <branch> instead of the remote's HEAD" msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° <Π²Π΅ΡΠΊΡ>, Π²ΠΌΠ΅ΡΡΠΎ HEAD Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "ΠΏΡΡΡ ΠΊ git-upload-pack Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 -#: builtin/pull.c:201 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 +#: builtin/pull.c:202 msgid "depth" msgstr "Π³Π»ΡΠ±ΠΈΠ½Π°" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ Π³Π»ΡΠ±ΠΈΠ½Ρ" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "Π²ΡΠ΅ΠΌΡ" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ Π΄ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠ³ΠΎ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "ΡΠ΅Π΄Π°ΠΊΡΠΈΡ" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "ΡΠ³Π»ΡΠ±ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π° ΠΈΡΠΊΠ»ΡΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Ρ Π²Π΅ΡΠΊΡ, HEAD ΠΈΠ»ΠΈ --branch" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "Π²ΡΠ΅ ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ Π±ΡΠ΄ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌΠΈ ΠΊΠ»ΠΎΠ½Π°ΠΌΠΈ" -#: builtin/clone.c:98 builtin/init-db.c:479 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³-git" -#: builtin/clone.c:99 builtin/init-db.c:480 +#: builtin/clone.c:108 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "ΡΠ°Π·ΠΌΠ΅ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git ΠΎΡΠ΄Π΅Π»ΡΠ½ΠΎ ΠΎΡ ΡΠ°Π±ΠΎΡΠ΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "ΠΊΠ»ΡΡ=Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ Π²Π½ΡΡΡΠΈ Π½ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ IPv4 Π°Π΄ΡΠ΅ΡΠ°" -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ IPv6 Π°Π΄ΡΠ΅ΡΠ°" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "ΠΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΡΠ³Π°Π΄Π°Π½ΠΎ.\nΠ£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΈΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ" -#: builtin/clone.c:307 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΠΊΠ°ΠΊ ΡΠ²ΡΠ·Π°Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅, ΠΏΠΎΠΊΠ° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ." +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ: ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Ρ Π΄Π»Ρ Β«%sΒ»: %s\n" -#: builtin/clone.c:309 +#: builtin/clone.c:375 #, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌ." - -#: builtin/clone.c:314 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ" - -#: builtin/clone.c:317 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΡΠ°ΡΠ΅Π½Π½ΡΠΌ" +msgid "failed to open '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat %s\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΡΡΠ»ΠΊΡ Β«%sΒ»" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» Π² Β«%sΒ»" -#: builtin/clone.c:449 builtin/clone.c:633 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "Π³ΠΎΡΠΎΠ²ΠΎ.\n" -#: builtin/clone.c:461 +#: builtin/clone.c:460 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ, Π½ΠΎ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»Π° ΠΎΡΠΈΠ±ΠΊΠ°.\nΠ‘ ΠΏΠΎΠΌΠΎΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Β«git statusΒ» Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ, ΠΊΠ°ΠΊΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π±ΡΠ»ΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Ρ, Π° ΠΏΠΎΠ²ΡΠΎΡΠΈΡΡ ΠΏΠΎΠΏΡΡΠΊΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ Π½Π° Π²Π΅ΡΠΊΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git checkout -f HEADΒ»\n" -#: builtin/clone.c:538 +#: builtin/clone.c:537 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ %s Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ." -#: builtin/clone.c:628 -#, c-format -msgid "Checking connectivity... " -msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡβ¦ " - -#: builtin/clone.c:631 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΏΡΠΈΡΠ»Π°Π» Π½Π΅ Π²ΡΠ΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ %s" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ HEAD ΡΡΡΠ»Π°Π΅ΡΡΡ Π½Π° Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΡΡ ΡΡΡΠ»ΠΊΡ, Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠ°ΠΊΡΡ Π²Π΅ΡΡΠΈΡ.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/clone.c:767 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ Π² ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/clone.c:830 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΏΠ°ΠΊΠΎΠ²ΠΊΡ Π΄Π»Ρ ΠΎΡΠΈΡΡΠΊΠΈ" -#: builtin/clone.c:832 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/clone.c:864 builtin/receive-pack.c:1731 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "Π‘Π»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΎΠ²." -#: builtin/clone.c:868 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ." -#: builtin/clone.c:879 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare ΠΈ --origin %s Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/clone.c:882 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare ΠΈ --separate-git-dir Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/clone.c:895 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/clone.c:901 builtin/fetch.c:1174 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "Π³Π»ΡΠ±ΠΈΠ½Π° %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠΈΡΠ»ΠΎΠΌ" -#: builtin/clone.c:911 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ΡΠ΅Π»Π΅Π²ΠΎΠΉ ΠΏΡΡΡ Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΡΡΡΡΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ." -#: builtin/clone.c:921 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 -#: builtin/worktree.c:220 builtin/worktree.c:247 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 +#: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΈΠ΅ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ Π΄Π»Ρ Β«%sΒ»" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/clone.c:957 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² Π³ΠΎΠ»ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ»β¦\n" -#: builtin/clone.c:959 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² Β«%sΒ»β¦\n" -#: builtin/clone.c:998 +#: builtin/clone.c:963 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-" +"if-able" +msgstr "ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠΌ --recursive Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Π½ΠΈ Ρ --reference, Π½ΠΈ Ρ --reference-if-able" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΊΠ»ΠΎΠ½Π°Ρ
; Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ file://." -#: builtin/clone.c:1001 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "--shallow-since ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΊΠ»ΠΎΠ½Π°Ρ
; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ file:// Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ." + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "--shallow-exclude ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΊΠ»ΠΎΠ½Π°Ρ
; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ file:// Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ." + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "ΠΈΡΡ
ΠΎΠ΄Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ, --local ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ" -#: builtin/clone.c:1006 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ" -#: builtin/clone.c:1010 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "ΠΠ΅ Π·Π½Π°Ρ ΠΊΠ°ΠΊ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ %s" -#: builtin/clone.c:1059 builtin/clone.c:1067 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "ΠΠ½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΠ° %s Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π° Π² Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ %s" -#: builtin/clone.c:1070 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π»ΠΈ ΠΏΡΡΡΠΎΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ." @@ -5091,7 +5943,7 @@ msgid "" "\n" " git commit --allow-empty\n" "\n" -msgstr "ΠΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΉ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ ΡΠ΅ΠΏΠ΅ΡΡ ΠΏΡΡΡ, Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ².\nΠΡΠ»ΠΈ Π²Ρ Π²ΡΠ΅ ΡΠ°Π²Π½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π΅Π»Π°ΡΡ ΠΏΡΡΡΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅:\n\n git commit --allow-empty\n\n" +msgstr "ΠΠΎΠΏΠΈΡΡΠ΅ΠΌΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ΅ΠΏΠ΅ΡΡ ΠΏΡΡΡ, Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ².\nΠΡΠ»ΠΈ Π²Ρ Π²ΡΠ΅ ΡΠ°Π²Π½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π΅Π»Π°ΡΡ ΠΏΡΡΡΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅:\n\n git commit --allow-empty\n\n" #: builtin/commit.c:85 msgid "Otherwise, please use 'git reset'\n" @@ -5105,45 +5957,45 @@ msgid "" "\n" "Then \"git cherry-pick --continue\" will resume cherry-picking\n" "the remaining commits.\n" -msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡ ΡΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ:\n\n git reset\n\nΠΠΎΡΠ»Π΅ ΡΡΠΎΠ³ΠΎ Β«git cherry-pick --continueΒ» ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ\nΠ² ΠΎΡΡΠ°Π²ΡΠΈΡ
ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°Ρ
.\n" +msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡ ΡΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ:\n\n git reset\n\nΠΠΎΡΠ»Π΅ ΡΡΠΎΠ³ΠΎ Β«git cherry-pick --continueΒ» ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΎΡΡΠ°Π²ΡΠΈΡ
ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ².\n" -#: builtin/commit.c:307 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "ΡΠ±ΠΎΠΉ ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π΄Π΅ΡΠ΅Π²Π° HEAD" -#: builtin/commit.c:348 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:354 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ³ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ" -#: builtin/commit.c:367 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:369 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΠΎΡΠ½ΠΎΠ²Π½ΠΎΠ³ΠΎ ΠΊΡΡΠ° Π΄Π΅ΡΠ΅Π²Π°" -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» new_index" -#: builtin/commit.c:447 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ." -#: builtin/commit.c:449 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." -msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°." +msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°." -#: builtin/commit.c:458 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:477 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" @@ -5172,12 +6024,12 @@ msgid "" "in the current commit message" msgstr "Π½Π΅Π»ΡΠ·Ρ Π²ΡΠ±ΡΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ» ΠΊΠΎΠΌΠΌΠ΅Π½ΡΠ°ΡΠΈΡ, ΠΊΠΎΡΠΎΡΡΠΉ\nΠ½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΡΡΡ Π² ΡΠ΅ΠΊΡΡΠ΅ΠΌ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΠΎΡΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s" -#: builtin/commit.c:704 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "(ΡΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΆΡΡΠ½Π°Π»Π° ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°)\n" @@ -5221,7 +6073,7 @@ msgid "" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" -msgstr "\nΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΡΡΠ°Π΅ΡΠ΅ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ.\nΠΡΠ»ΠΈ ΡΡΠΎ ΠΎΡΠΈΠ±ΠΊΠ°, ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ° ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΠ°ΠΉΠ»\n\t%s\nΠΈ ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ ΡΠ½ΠΎΠ²Π°.\n" +msgstr "\nΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΡΡΠ°Π΅ΡΠ΅ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΏΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\nΠΡΠ»ΠΈ ΡΡΠΎ Π½Π΅ ΡΠ°ΠΊ, ΡΠΎ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΠ°ΠΉΠ»\n\t%s\nΠΈ ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ ΡΠ½ΠΎΠ²Π°.\n" #: builtin/commit.c:832 #, c-format @@ -5257,322 +6109,326 @@ msgstr "%sΠΠΎΠΌΠΌΠΈΡΠ΅Ρ: %.*s <%.*s>" msgid "Cannot read index" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:949 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΡΡΡΠΎΠ΅Π½ΠΈΠΈ Π΄Π΅ΡΠ΅Π²ΡΠ΅Π²" -#: builtin/commit.c:964 builtin/tag.c:266 +#: builtin/commit.c:969 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅, ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ ΠΎΠΏΡΠΈΠΉ -m ΠΈΠ»ΠΈ -F.\n" -#: builtin/commit.c:1066 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author Β«%sΒ» Π½Π΅ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ Β«ΠΠΌΡ <ΠΏΠΎΡΡΠ°>Β» ΠΈ Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΌ Π°Π²ΡΠΎΡΠΎΠΌ" -#: builtin/commit.c:1081 builtin/commit.c:1321 +#: builtin/commit.c:1086 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Β«%sΒ»" -#: builtin/commit.c:1118 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "--long ΠΈ -z Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/commit.c:1148 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΎΠΏΡΠΈΠΉ --reset-author ΠΈ --author Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/commit.c:1157 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "ΠΠ΅ΡΠ΅Π³ΠΎ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ." -#: builtin/commit.c:1160 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ β ΡΠ΅ΠΉΡΠ°Ρ Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ." -#: builtin/commit.c:1162 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ β ΡΠ΅ΠΉΡΠ°Ρ Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ." +msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° β ΡΠ΅ΠΉΡΠ°Ρ Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ." -#: builtin/commit.c:1165 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "ΠΠΏΡΠΈΠΈ --squash ΠΈ --fixup Π½Π΅ ΠΌΠΎΠ³ΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/commit.c:1175 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "ΠΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΠΈΠ· ΠΎΠΏΡΠΈΠΉ -c/-C/-F/--fixup." -#: builtin/commit.c:1177 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "ΠΠΏΡΠΈΡ -m Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Ρ -c/-C/-F/--fixup." -#: builtin/commit.c:1185 +#: builtin/commit.c:1191 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ -C, -c ΠΈΠ»ΠΈ --amend." -#: builtin/commit.c:1202 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "ΠΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΠΈΠ· ΠΎΠΏΡΠΈΠΉ --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1204 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΏΡΡΠ΅ΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ --include/--only Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°." -#: builtin/commit.c:1206 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "Π£ΠΌΠ½ΠΎβ¦ ΠΎΡΠΌΠ΅Π½Π° ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅Π³ΠΎ Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ." -#: builtin/commit.c:1208 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "ΠΡΡΠΈ ΡΠ²Π½ΠΎ ΡΠΊΠ°Π·Π°Π½Ρ ΠΏΡΡΠΈ Π±Π΅Π· ΠΎΠΏΡΠΈΠΉ -i ΠΈΠ»ΠΈ -o; ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Ρ ΠΎΠΏΡΠΈΡ --onlyβ¦" -#: builtin/commit.c:1220 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ΅ΠΆΠΈΠΌΠ° ΠΎΡΠΈΡΡΠΊΠΈ %s" -#: builtin/commit.c:1225 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Π‘ ΠΎΠΏΡΠΈΠ΅ΠΉ -a ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΏΡΡΠΈ Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°." -#: builtin/commit.c:1335 builtin/commit.c:1621 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "ΠΊΡΠ°ΡΠΊΠΎ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΡΡ" -#: builtin/commit.c:1337 builtin/commit.c:1623 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²Π΅ΡΡΠΈΠΈ" -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 -#: builtin/worktree.c:437 +#: builtin/commit.c:1345 +msgid "version" +msgstr "Π²Π΅ΡΡΠΈΡ" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 +#: builtin/worktree.c:440 msgid "machine-readable output" msgstr "ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΡΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/commit.c:1342 builtin/commit.c:1627 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΡΡ Π² Π΄Π»ΠΈΠ½Π½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/commit.c:1345 builtin/commit.c:1630 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "Π·Π°Π²Π΅ΡΡΠ°ΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΠ£ΠΠΠΠ«Π Π±Π°ΠΉΡΠΎΠΌ" -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 +#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "ΡΠ΅ΠΆΠΈΠΌ" -#: builtin/commit.c:1348 builtin/commit.c:1633 +#: builtin/commit.c:1354 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ, ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΡΠ΅ ΡΠ΅ΠΆΠΈΠΌΡ: all (Π²ΡΠ΅), normal (ΠΊΠ°ΠΊ ΠΎΠ±ΡΡΠ½ΠΎ), no (Π½Π΅Ρ). (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: all)" -#: builtin/commit.c:1351 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/commit.c:1352 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "ΠΊΠΎΠ³Π΄Π°" -#: builtin/commit.c:1353 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
, ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΠΎ ΠΊΠΎΠ³Π΄Π°: all (Π²ΡΠ΅Π³Π΄Π°), dirty (ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅), untracked (Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅). (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΠΎ ΡΡΠΎΠ»Π±ΡΠ°ΠΌ" -#: builtin/commit.c:1441 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "Π½Π΅Π»ΡΠ·Ρ Π·Π°ΠΏΡΠΎΡΠΈΡΡ Π½ΠΎΠ²ΠΎΡΠΎΠ·Π΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1443 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ Π½ΠΎΠ²ΠΎΡΠΎΠ·Π΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1488 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠΉ HEAD" -#: builtin/commit.c:1491 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (ΠΊΠΎΡΠ½Π΅Π²ΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ)" -#: builtin/commit.c:1591 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠ²ΠΎΠ΄ΠΊΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΏΠ΅ΡΠ½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1592 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠ°Π±Π»ΠΎΠ½ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1594 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "ΠΠΏΡΠΈΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1595 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· ΡΠ°ΠΉΠ»Π°" -#: builtin/commit.c:1596 +#: builtin/commit.c:1592 msgid "author" msgstr "Π°Π²ΡΠΎΡ" -#: builtin/commit.c:1596 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "ΠΏΠΎΠ΄ΠΌΠ΅Π½ΠΈΡΡ Π°Π²ΡΠΎΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1597 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "Π΄Π°ΡΠ°" -#: builtin/commit.c:1597 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "ΠΏΠΎΠ΄ΠΌΠ΅Π½ΠΈΡΡ Π΄Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 -#: builtin/notes.c:558 builtin/tag.c:349 +#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:349 msgid "message" msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅" -#: builtin/commit.c:1598 +#: builtin/commit.c:1594 msgid "commit message" msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 -#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 msgid "commit" msgstr "ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1599 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈ ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1600 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1601 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π°Π²ΡΠΎΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1602 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π°Π²ΡΠΎΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ Π΄Π»Ρ ΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1603 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ΅ΠΏΠ΅ΡΡ Π·Π° ΠΌΠΎΠΈΠΌ Π°Π²ΡΠΎΡΡΡΠ²ΠΎΠΌ (Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ΠΌ -C/-c/--amend)" -#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Signed-off-by:" -#: builtin/commit.c:1605 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΡΠ°Π±Π»ΠΎΠ½Π°" -#: builtin/commit.c:1606 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1607 +#: builtin/commit.c:1603 msgid "default" msgstr "ΠΏΠΎ-ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" -#: builtin/commit.c:1607 builtin/tag.c:354 +#: builtin/commit.c:1603 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "ΠΊΠ°ΠΊ ΡΠ΄Π°Π»ΡΡΡ ΠΏΡΠΎΠ±Π΅Π»Ρ ΠΈ #ΠΊΠΎΠΌΠΌΠ΅Π½ΡΠ°ΡΠΈΠΈ ΠΈΠ· ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1608 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΡΡΠ°ΡΡΡ ΡΠ°ΠΉΠ»ΠΎΠ² Π² ΡΠ°Π±Π»ΠΎΠ½ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ GPG" -#: builtin/commit.c:1613 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "ΠΠΏΡΠΈΠΈ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1614 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ Π²ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/commit.c:1615 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1616 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/commit.c:1617 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/commit.c:1618 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/commit.c:1619 -msgid "bypass pre-commit hook" -msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ ΠΏΠ΅ΡΠ΅Π΄-ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ" +#: builtin/commit.c:1615 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ pre-commit ΠΈ commit-msg" -#: builtin/commit.c:1620 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ, ΡΡΠΎ Π±ΡΠ΄Π΅Ρ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½ΠΎ" -#: builtin/commit.c:1631 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1632 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" -msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ ΠΏΠΎΡΠ»Π΅-ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ" +msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ post-rewrite" -#: builtin/commit.c:1637 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΏΡΡΡΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1639 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Ρ ΠΏΡΡΡΡΠΌ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΠΌ" -#: builtin/commit.c:1668 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ HEAD ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1718 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Π€Π°ΠΉΠ» MERGE_HEAD ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ (%s)" -#: builtin/commit.c:1725 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ MERGE_MODE" -#: builtin/commit.c:1744 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°: %s" -#: builtin/commit.c:1755 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "ΠΡΠΌΠ΅Π½Π° ΠΊΠΎΠΌΠΌΠΈΡΠ°; Π²Ρ Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΠΈΠ»ΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅.\n" -#: builtin/commit.c:1760 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "ΠΡΠΌΠ΅Π½Π° ΠΊΠΎΠΌΠΌΠΈΡΠ° ΠΈΠ·-Π·Π° ΠΏΡΡΡΠΎΠ³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: builtin/commit.c:1808 +#: builtin/commit.c:1802 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5583,139 +6439,139 @@ msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π±ΡΠ» ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½, Π½ΠΎ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ msgid "git config [<options>]" msgstr "git config [<ΠΎΠΏΡΠΈΠΈ>]" -#: builtin/config.c:56 +#: builtin/config.c:55 msgid "Config file location" msgstr "Π Π°Π·ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/config.c:57 +#: builtin/config.c:56 msgid "use global config file" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π³Π»ΠΎΠ±Π°Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "use system config file" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΈΡΡΠ΅ΠΌΠ½ΡΠΉ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "use repository config file" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "use given config file" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "blob-id" msgstr "ΠΈΠ΄Π΅Π½Ρ-Π΄Π²ΠΎΠΈΡΠ½-ΠΎΠ±ΡΠ΅ΠΊΡΠ°" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "read config from given blob object" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ ΠΈΠ· ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ°" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "Action" msgstr "ΠΠ΅ΠΉΡΡΠ²ΠΈΠ΅" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "get value: name [value-regex]" msgstr "ΠΏΠΎΠ»ΡΡΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅: ΠΈΠΌΡ [ΡΠ°Π±Π»ΠΎΠ½-Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ]" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "get all values: key [value-regex]" msgstr "ΠΏΠΎΠ»ΡΡΠΈΡΡ Π²ΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ: ΠΊΠ»ΡΡ [ΡΠ°Π±Π»ΠΎΠ½-Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ]" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "get values for regexp: name-regex [value-regex]" msgstr "ΠΏΠΎΠ»ΡΡΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΡ ΠΏΠΎ ΡΠ°Π±Π»ΠΎΠ½Ρ: ΡΠ°Π±Π»ΠΎΠ½-ΠΈΠΌΠ΅Π½ [ΡΠ°Π±Π»ΠΎΠ½-Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ]" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "get value specific for the URL: section[.var] URL" msgstr "ΠΏΠΎΠ»ΡΡΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅, ΡΠΏΠ΅ΡΠΈΡΠΈΡΠ½ΠΎΠ΅ Π΄Π»Ρ URL: ΡΠ°Π·Π΄Π΅Π»[.ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½Π°Ρ] URL" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "replace all matching variables: name value [value_regex]" msgstr "Π·Π°ΠΌΠ΅Π½ΠΈΡΡ Π²ΡΠ΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅: ΠΈΠΌΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ [ΡΠ°Π±Π»ΠΎΠ½-Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ]" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "add a new variable: name value" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π½ΠΎΠ²ΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΡ: ΠΈΠΌΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "remove a variable: name [value-regex]" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΡ: ΠΈΠΌΡ [ΡΠ°Π±Π»ΠΎΠ½-Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ]" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "remove all matches: name [value-regex]" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅: ΠΈΠΌΡ [ΡΠ°Π±Π»ΠΎΠ½-Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ]" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "rename section: old-name new-name" msgstr "ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ ΡΠ°Π·Π΄Π΅Π»: ΡΡΠ°ΡΠΎΠ΅-ΠΈΠΌΡ Π½ΠΎΠ²ΠΎΠ΅-ΠΈΠΌΡ" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "remove a section: name" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°Π·Π΄Π΅Π»: ΠΈΠΌΡ" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "list all" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π²Π΅ΡΡ ΡΠΏΠΈΡΠΎΠΊ" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "open an editor" msgstr "ΠΎΡΠΊΡΡΡΡ Π² ΡΠ΅Π΄Π°ΠΊΡΠΎΡΠ΅" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "find the color configured: slot [default]" msgstr "Π½Π°ΠΉΡΠΈ Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠΉ ΡΠ²Π΅Ρ: ΡΠ°Π·Π΄Π΅Π» [ΠΏΠΎ-ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ]" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "find the color setting: slot [stdout-is-tty]" msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ Π»ΠΈ Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠΉ ΡΠ²Π΅Ρ: ΡΠ°Π·Π΄Π΅Π» [stdout-Π΅ΡΡΡ-tty]" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "Type" msgstr "Π’ΠΈΠΏ" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "value is \"true\" or \"false\"" msgstr "Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ β ΡΡΠΎ Β«trueΒ» (ΠΏΡΠ°Π²Π΄Π°) ΠΈΠ»ΠΈ Β«falseΒ» (Π»ΠΎΠΆΡ)" -#: builtin/config.c:79 +#: builtin/config.c:78 msgid "value is decimal number" msgstr "Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ β ΡΡΠΎ Π΄Π΅ΡΡΡΠΈΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎ" -#: builtin/config.c:80 +#: builtin/config.c:79 msgid "value is --bool or --int" msgstr "Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ β ΡΡΠΎ --bool ΠΈΠ»ΠΈ --int" -#: builtin/config.c:81 +#: builtin/config.c:80 msgid "value is a path (file or directory name)" msgstr "Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ β ΡΡΠΎ ΠΏΡΡΡ (ΠΊ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Ρ)" -#: builtin/config.c:82 +#: builtin/config.c:81 msgid "Other" msgstr "ΠΡΡΠ³ΠΎΠ΅" -#: builtin/config.c:83 +#: builtin/config.c:82 msgid "terminate values with NUL byte" msgstr "Π·Π°Π²Π΅ΡΡΠ°ΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΡ ΠΠ£ΠΠΠΠ«Π Π±Π°ΠΉΡΠΎΠΌ" -#: builtin/config.c:84 +#: builtin/config.c:83 msgid "show variable names only" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΡ
" -#: builtin/config.c:85 +#: builtin/config.c:84 msgid "respect include directives on lookup" msgstr "ΡΡΠΈΡΡΠ²Π°ΡΡ Π΄ΠΈΡΠ΅ΠΊΡΠΈΠ²Ρ include (Π²ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΡΠ°ΠΉΠ»ΠΎΠ²) ΠΏΡΠΈ Π·Π°ΠΏΡΠΎΡΠ΅" -#: builtin/config.c:86 +#: builtin/config.c:85 msgid "show origin of config (file, standard input, blob, command line)" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠ½ΠΈΠΊ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ (ΡΠ°ΠΉΠ», ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²Π²ΠΎΠ΄, Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ, ΠΊΠΎΠΌΠ°Π½Π΄Π½Π°Ρ ΡΡΡΠΎΠΊΠ°)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ²Π΅ΡΠ° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5725,16 +6581,23 @@ msgid "" "#\temail = %s\n" msgstr "# ΠΡΠΎ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ Git.\n[user]\n# ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π°Π΄Π°ΠΏΡΠΈΡΡΠΉΡΠ΅ ΠΈ ΡΠ°ΡΠΊΠΎΠΌΠΌΠ΅Π½ΡΠΈΡΡΠΉΡΠ΅ ΡΠ»Π΅Π΄ΡΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ:\n#\tuser = %s\n#\temail = %s\n" -#: builtin/config.c:614 +#: builtin/config.c:613 #, c-format msgid "cannot create configuration file %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ %s" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ ΠΎΠ΄Π½ΠΈΠΌ\n ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ, ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ --add ΠΈΠ»ΠΈ --replace-all, ΡΡΠΎΠ±Ρ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ %s." + +#: builtin/count-objects.c:86 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:96 msgid "print sizes in human readable format" msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠ°Π·ΠΌΠ΅ΡΠΎΠ² Π² ΡΠ΄ΠΎΠ±ΠΎΡΠΈΡΠ°Π΅ΠΌΠΎΠΌ Π΄Π»Ρ ΡΠ΅Π»ΠΎΠ²Π΅ΠΊΠ° Π²ΠΈΠ΄Π΅" @@ -5761,10 +6624,10 @@ msgstr "Π°Π½Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Π½Π°Ρ ΠΌΠ΅ΡΠΊΠ° %s Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π²ΡΡΡ msgid "tag '%s' is really '%s' here" msgstr "ΠΌΠ΅ΡΠΊΠ° Β«%sΒ» ΡΠΆΠ΅ Π·Π΄Π΅ΡΡ Β«%sΒ»" -#: builtin/describe.c:250 builtin/log.c:465 +#: builtin/describe.c:250 builtin/log.c:480 #, c-format msgid "Not a valid object name %s" -msgstr "ΠΠ΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s" +msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s" #: builtin/describe.c:253 #, c-format @@ -5848,7 +6711,7 @@ msgstr "ΡΠ°ΡΡΠΌΠ°ΡΡΠΈΠ²Π°ΡΡ ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΠ΅ <n> ΠΌΠ΅ΡΠΎΠΊ (ΠΏΠΎ ΡΠΌΠ msgid "only consider tags matching <pattern>" msgstr "ΡΠ°ΡΡΠΌΠ°ΡΡΠΈΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΌΠ΅ΡΠΊΠΈ ΠΏΠΎ <ΡΠ°Π±Π»ΠΎΠ½Ρ>" -#: builtin/describe.c:410 builtin/name-rev.c:321 +#: builtin/describe.c:410 builtin/name-rev.c:320 msgid "show abbreviated commit object as fallback" msgstr "Π΅ΡΠ»ΠΈ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ, ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠΊΡΠ°ΡΠ΅Π½Π½ΡΠΉ Π½ΠΎΠΌΠ΅Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°" @@ -5882,21 +6745,21 @@ msgstr "Β«%sΒ»: Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΠ±ΡΡΠ½ΡΠΌ ΡΠ°ΠΉΠ»ΠΎΠΌ ΠΈΠ»ΠΈ ΡΠΈΠΌΠ msgid "invalid option: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ: %s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" -msgstr "ΠΠ΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ git" +msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½ git ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΠΈΠΉ" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ Π±ΠΎΠ»ΡΡΠ΅ Π΄Π²ΡΡ
Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²: Β«%sΒ»" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." @@ -5953,262 +6816,275 @@ msgstr "ΠΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΡΡΡΠ»ΠΊΠΈ ΠΊ ΡΠΊΡΠΏΠΎΡ msgid "anonymize output" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ Π²ΡΠ²ΠΎΠ΄ Π°Π½ΠΎΠ½ΠΈΠΌΠ½ΡΠΌ" -#: builtin/fetch.c:20 +#: builtin/fetch.c:21 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<ΠΎΠΏΡΠΈΠΈ>] [<ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [<ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ-ΡΡΡΠ»ΠΊΠΈ>β¦]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] <group>" msgstr "git fetch [<ΠΎΠΏΡΠΈΠΈ>] <Π³ΡΡΠΏΠΏΠ°>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<ΠΎΠΏΡΠΈΠΈ>] [(<ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> | <Π³ΡΡΠΏΠΏΠ°>)β¦]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<ΠΎΠΏΡΠΈΠΈ>]" -#: builtin/fetch.c:92 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ ΡΠΎ Π²ΡΠ΅Ρ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: builtin/fetch.c:94 builtin/pull.c:177 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "Π΄ΠΎΠΏΠΈΡΠ°ΡΡ ΠΊ .git/FETCH_HEAD Π²ΠΌΠ΅ΡΡΠΎ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ" -#: builtin/fetch.c:96 builtin/pull.c:180 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "ΠΏΡΡΡ ΠΊ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ΅ ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ ΠΏΠ°ΠΊΠ΅ΡΠ° Π½Π° ΠΌΠ°ΡΠΈΠ½Π΅ Ρ Π²Π½Π΅ΡΠ½ΠΈΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ" -#: builtin/fetch.c:97 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" -#: builtin/fetch.c:99 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ Ρ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: builtin/fetch.c:101 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ Π²ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ ΠΈ ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/fetch.c:103 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "Π½Π΅ ΠΈΠ·Π²Π»Π΅ΠΊΠ°ΡΡ Π²ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (--no-tags)" -#: builtin/fetch.c:105 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΡΠΊΠ°ΡΠ°Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ" -#: builtin/fetch.c:107 builtin/pull.c:187 +#: builtin/fetch.c:110 builtin/pull.c:188 msgid "prune remote-tracking branches no longer on remote" msgstr "ΠΏΠΎΡΠΈΡΡΠΈΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ Π²Π½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΡ
ΡΠΆΠ΅ Π½Π΅Ρ Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/fetch.c:108 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "ΠΏΠΎ ΡΡΠ΅Π±ΠΎΠ²Π°Π½ΠΈΡ" -#: builtin/fetch.c:109 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΡΠΌ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ" -#: builtin/fetch.c:113 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ Π·Π°Π³ΡΡΠΆΠ΅Π½Π½ΡΠΉ ΠΏΠ°ΠΊΠ΅Ρ Π΄Π°Π½Π½ΡΡ
" -#: builtin/fetch.c:115 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ HEAD" -#: builtin/fetch.c:118 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" -msgstr "Π³Π»ΡΠ±ΠΎΠΊΠ°Ρ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°" +msgstr "ΡΠ»ΡΠ³ΡΠ±ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°" + +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "ΡΠ³Π»ΡΠ±ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π° ΠΎΡΠ½ΠΎΠ²ΡΠ²Π°ΡΡΡ Π½Π° Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ" -#: builtin/fetch.c:120 builtin/pull.c:205 +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "ΠΏΡΠ΅ΠΎΠ±ΡΠ°Π·ΠΎΠ²Π°ΡΡ Π² ΠΏΠΎΠ»Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/fetch.c:122 builtin/log.c:1399 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: builtin/fetch.c:123 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "ΠΏΡΠΈΡΠΎΠ΅Π΄ΠΈΠ½ΡΡΡ ΡΡΠΎ ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊ Π²ΡΠ²ΠΎΠ΄Ρ ΠΏΡΡΠ΅ΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/fetch.c:126 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "ΡΠ΅ΠΆΠΈΠΌ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ Π΄Π»Ρ ΡΠ΅ΠΊΡΡΡΠΈΠΈ" -#: builtin/fetch.c:128 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΡΡΡΠ»ΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅-ΡΡΡΠ»ΠΎΠΊ" -#: builtin/fetch.c:130 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "ΡΠΊΠ°Π·Π°ΡΡ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΡΡΡΠ»ΠΎΠΊ ΠΏΡΠΈ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΈ" -#: builtin/fetch.c:386 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΡΡΠ»ΠΊΡ HEAD Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/fetch.c:466 +#: builtin/fetch.c:514 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "ΠΎΠΏΡΠΈΡ fetch.output ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ %s" + +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ %s Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½" -#: builtin/fetch.c:471 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[Π°ΠΊΡΡΠ°Π»ΡΠ½ΠΎ]" -#: builtin/fetch.c:485 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s β %s (Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ·Π²Π»Π΅ΡΡ Π² ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ)" - -#: builtin/fetch.c:486 builtin/fetch.c:574 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½ΠΎ]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:625 +msgid "can't fetch in current branch" +msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΠ·Π²Π»Π΅ΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ" + +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΠΌΠ΅ΡΠΊΠΈ]" -#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 -msgid " (unable to update local ref)" -msgstr " (Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ)" +#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 +#: builtin/fetch.c:699 +msgid "unable to update local ref" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ" -#: builtin/fetch.c:517 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[Π½ΠΎΠ²Π°Ρ ΠΌΠ΅ΡΠΊΠ°]" -#: builtin/fetch.c:520 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[Π½ΠΎΠ²Π°Ρ Π²Π΅ΡΠΊΠ°]" -#: builtin/fetch.c:523 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[Π½ΠΎΠ²Π°Ρ ΡΡΡΠ»ΠΊΠ°]" -#: builtin/fetch.c:569 -msgid "unable to update local ref" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ" - -#: builtin/fetch.c:569 +#: builtin/fetch.c:699 msgid "forced update" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅" -#: builtin/fetch.c:576 -msgid "(non-fast-forward)" -msgstr "(Π±Π΅Π· ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΈ Π²ΠΏΠ΅ΡΠ΅Π΄)" +#: builtin/fetch.c:704 +msgid "non-fast-forward" +msgstr "Π±Π΅Π· ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΈ Π²ΠΏΠ΅ΡΠ΅Π΄" -#: builtin/fetch.c:619 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s Π½Π΅ ΠΎΡΠΏΡΠ°Π²ΠΈΠ» Π²ΡΠ΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ\n" -#: builtin/fetch.c:637 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½ΠΎ ΠΈΠ·-Π·Π° ΡΠΎΠ³ΠΎ, ΡΡΠΎ ΡΠ°ΡΡΠΈΡΠ½ΡΠ΅ ΠΊΠΎΡΠ½ΠΈ Π½Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΎ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ" -#: builtin/fetch.c:724 builtin/fetch.c:816 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "ΠΠ· %.*s\n" -#: builtin/fetch.c:735 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ; ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Π·Π°ΠΏΡΡΡΠΈΡΡ Β«git remote prune %sΒ», ΡΡΠΎΠ±Ρ ΠΏΠΎΡΠΈΡΡΠΈΡΡ ΡΡΠ°ΡΡΠ΅, ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡΡΡΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" -#: builtin/fetch.c:787 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (%s Π±ΡΠ΄Π΅Ρ Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ)" -#: builtin/fetch.c:788 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (%s ΡΡΠ°Π»Π° Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ)" -#: builtin/fetch.c:820 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[ΡΠ΄Π°Π»Π΅Π½ΠΎ]" -#: builtin/fetch.c:821 builtin/remote.c:1025 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(Π½Π΅Ρ)" -#: builtin/fetch.c:841 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "ΠΡΠΊΠ°Π· ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ Π² ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ %s Π½Π΅ Π³ΠΎΠ»ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/fetch.c:860 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%2$sΒ» Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° Β«%1$sΒ» Π΄Π»Ρ %3$s" -#: builtin/fetch.c:863 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "ΠΠ°ΡΠ°ΠΌΠ΅ΡΡ Β«%sΒ» ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π΄Π»Ρ %s\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "ΠΠ΅ Π·Π½Π°Ρ ΠΊΠ°ΠΊ ΠΈΠ·Π²Π»Π΅ΡΡ Ρ %s" -#: builtin/fetch.c:1080 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· %s\n" -#: builtin/fetch.c:1082 builtin/remote.c:96 +#: builtin/fetch.c:1239 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ·Π²Π»Π΅ΡΡ %s" -#: builtin/fetch.c:1100 +#: builtin/fetch.c:1257 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ. Π£ΠΊΠ°ΠΆΠΈΡΠ΅ URL ΠΈΠ»ΠΈ ΠΈΠΌΡ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΎΠ³ΠΎ Π΄ΠΎΠ»ΠΆΠ½Ρ ΠΈΠ·Π²Π»Π΅ΠΊΠ°ΡΡΡΡ Π½ΠΎΠ²ΡΠ΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ." -#: builtin/fetch.c:1123 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "ΠΠ°ΠΌ Π½ΡΠΆΠ½ΠΎ ΡΠΊΠ°Π·Π°ΡΡ ΠΈΠΌΡ ΠΌΠ΅ΡΠΊΠΈ." -#: builtin/fetch.c:1165 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "ΠΡΡΠΈΡΠ°ΡΠ΅Π»ΡΠ½Π°Ρ Π³ΡΡΠ±ΠΈΠ½Π° Π΄Π»Ρ --deepen Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen ΠΈ --depth Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --depth ΠΈ --unshallow" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π° Π½Π° ΠΏΠΎΠ»Π½ΠΎΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/fetch.c:1187 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "fetch --all Π½Π΅ ΠΏΡΠΈΠ½ΠΈΠΌΠ°Π΅Ρ ΠΈΠΌΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ ΠΊΠ°ΠΊ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π° ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΉ ΡΡΡΠ»ΠΎΠΊ" -#: builtin/fetch.c:1200 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ ΠΈΠ»ΠΈ Π³ΡΡΠΏΠΏΡ: %s" -#: builtin/fetch.c:1208 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "ΠΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π³ΡΡΠΏΠΏΡ ΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΉ ΡΡΡΠ»ΠΎΠΊ Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" @@ -6217,23 +7093,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅>] [--log[=<n>] | --no-log] [--file <ΡΠ°ΠΉΠ»>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most <n> entries from shortlog" msgstr "ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ Π² ΠΆΡΡΠ½Π°Π» <n> Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΊΠΎΠ³ΠΎ ΠΆΡΡΠ½Π°Π»Π°" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "ΡΠΎΠΊΡΠ°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ --log (ΡΡΡΠ°ΡΠ΅Π²ΡΠ΅Π΅)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "ΡΠ΅ΠΊΡΡ" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use <text> as start of message" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΡΠ΅ΠΊΡΡ> ΠΊΠ°ΠΊ Π½Π°ΡΠ°Π»ΡΠ½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "ΡΠ°ΠΉΠ» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ" @@ -6293,63 +7169,63 @@ msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ»ΡΠΊΠΎ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΡΡΠ»ΠΎΠΊ" msgid "print only refs which contain the commit" msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΡΠ»ΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠ°Ρ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/fsck.c:156 builtin/prune.c:140 -msgid "Checking connectivity" -msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ" - -#: builtin/fsck.c:486 +#: builtin/fsck.c:519 msgid "Checking object directories" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/fsck.c:552 +#: builtin/fsck.c:588 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<ΠΎΠΏΡΠΈΠΈ>] [<ΠΎΠ±ΡΠ΅ΠΊΡ>β¦]" -#: builtin/fsck.c:558 +#: builtin/fsck.c:594 msgid "show unreachable objects" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/fsck.c:559 +#: builtin/fsck.c:595 msgid "show dangling objects" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅Ρ ΡΡΡΠ»ΠΎΠΊ" -#: builtin/fsck.c:560 +#: builtin/fsck.c:596 msgid "report tags" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΎΡΡΠ΅Ρ ΠΏΠΎ ΠΌΠ΅ΡΠΊΠ°ΠΌ" -#: builtin/fsck.c:561 +#: builtin/fsck.c:597 msgid "report root nodes" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΎΡΡΠ΅Ρ ΠΏΠΎ ΠΊΠΎΡΠ½Π΅Π²ΡΠΌ ΡΠ·Π»Π°ΠΌ" -#: builtin/fsck.c:562 +#: builtin/fsck.c:598 msgid "make index objects head nodes" msgstr "Π²ΠΎΡΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΊΠ°ΠΊ ΠΊΠΎΡΠ½Π΅Π²ΡΠ΅ ΡΠ·Π»Ρ" -#: builtin/fsck.c:563 +#: builtin/fsck.c:599 msgid "make reflogs head nodes (default)" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠΎΡΠ½Π΅Π²ΡΠ΅ ΡΠ·Π»Ρ ΠΆΡΡΠ½Π°Π»ΠΎΠ² ΡΡΡΠ»ΠΎΠΊ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/fsck.c:564 +#: builtin/fsck.c:600 msgid "also consider packs and alternate objects" msgstr "ΡΠ°ΠΊΠΆΠ΅ ΠΏΡΠΎΠ²Π΅ΡΡΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ ΠΈ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/fsck.c:565 +#: builtin/fsck.c:601 msgid "check only connectivity" msgstr "ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅" -#: builtin/fsck.c:566 +#: builtin/fsck.c:602 msgid "enable more strict checking" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±ΠΎΠ»Π΅Π΅ ΡΡΡΠΎΠ³ΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΡ" -#: builtin/fsck.c:568 +#: builtin/fsck.c:604 msgid "write dangling objects in .git/lost-found" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅Ρ ΡΡΡΠ»ΠΎΠΊ Π² .git/lost-found" -#: builtin/fsck.c:569 builtin/prune.c:107 +#: builtin/fsck.c:605 builtin/prune.c:107 msgid "show progress" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/fsck.c:630 +#: builtin/fsck.c:606 +msgid "show verbose names for reachable objects" +msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΡΠ΅ ΠΈΠΌΠ΅Π½Π° Π΄Π»Ρ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" + +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" @@ -6434,224 +7310,219 @@ msgstr "grep: ΡΠ±ΠΎΠΉ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΠΏΠΎΡΠΎΠΊΠ°: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΡΠΎΠΊΠΎΠ² (%d) Π΄Π»Ρ %s" -#: builtin/grep.c:452 builtin/grep.c:487 +#: builtin/grep.c:453 builtin/grep.c:488 #, c-format msgid "unable to read tree (%s)" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ grep ΠΈΠ· ΠΎΠ±ΡΠ΅ΠΊΡΠ° ΡΠΈΠΏΠ° %s" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Β«%cΒ» ΠΎΠΆΠΈΠ΄Π°Π΅Ρ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "ΠΈΡΠΊΠ°ΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅, Π° Π½Π΅ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "ΠΈΡΠΊΠ°ΡΡ Π² ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π½Π΅ ΡΠΏΡΠ°Π²Π»ΡΠ΅ΠΌΡΠΌ git" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "ΠΈΡΠΊΠ°ΡΡ ΠΈ Π² ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
, ΠΈ Π² Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π² Β«.gitignoreΒ»" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "ΠΈΡΠΊΠ°ΡΡ Π² Π½Π΅ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΡ
ΡΡΡΠΎΠΊΠ°Ρ
" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "Π±Π΅Π· ΡΡΠ΅ΡΠ° ΡΠ΅Π³ΠΈΡΡΡΠ°" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "ΠΈΡΠΊΠ°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π° ΡΠΎΠ»ΡΠΊΠΎ Π½Π° Π³ΡΠ°Π½ΠΈΡΠ°Ρ
ΡΠ»ΠΎΠ²" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠ° Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΊΠ°ΠΊ ΡΠ΅ΠΊΡΡΠ°" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "Π½Π΅ ΠΈΡΠΊΠ°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π° Π² Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°ΡΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΈΠ»ΡΡΡΠΎΠ² textconv" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most <depth> levels" msgstr "Π½Π° Π³Π»ΡΠ±ΠΈΠ½Π΅ ΠΌΠ°ΠΊΡΠΈΠΌΡ <Π³Π»ΡΠ±ΠΈΠ½Π°> ΡΡΠΎΠ²Π½Π΅ΠΉ" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ΅Π½Π½ΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ POSIX" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ POSIX (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "ΠΈΠ½ΡΠ΅ΡΠΏΡΠ΅ΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΊΠ°ΠΊ ΡΠΈΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Perl-ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π½ΠΎΠΌΠ΅ΡΠ° ΡΡΡΠΎΠΊ" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ², Π° Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --files-with-matches" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π½Π΅ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΠΠΠ¬ ΠΏΠΎΡΠ»Π΅ ΡΠΏΠΈΡΠΊΠ° ΠΈΠΌΠ΅Π½ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ, Π° Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "ΠΏΠΎΠ΄ΡΠ²Π΅ΡΠΈΠ²Π°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΡΡΡΡ ΡΡΡΠΎΠΊΡ ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ ΠΈΠ· ΡΠ°Π·Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°Π· Π½Π° Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ Π² ΠΎΠ΄Π½ΠΎΠΌ ΡΠ°ΠΉΠ»Π΅" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show <n> context lines before and after matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠ΅ΡΠ΅Π΄ ΠΈ ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show <n> context lines before matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠ΅ΡΠ΅Π΄ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ΠΌ" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show <n> context lines after matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use <n> worker threads" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΠΊΠΎΠ»> ΡΠ°Π±ΠΎΡΠΈΡ
ΠΏΠΎΡΠΎΠΊΠΎΠ²" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "ΡΠΎΠΆΠ΅, ΡΡΠΎ ΠΈ -C ΠΠΠΠΠ§ΠΠ‘Π’ΠΠ" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΡΠΎΠΊΡ Ρ ΠΈΠΌΠ΅Π½Π΅ΠΌ ΡΡΠ½ΠΊΡΠΈΠΈ ΠΏΠ΅ΡΠ΅Π΄ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ΠΌ" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΠΊΡΡΠΆΠ°ΡΡΡΡ ΡΡΠ½ΠΊΡΠΈΡ" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· ΡΠ°ΠΉΠ»Π°" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match <pattern>" msgstr "ΠΏΠΎΠΈΡΠΊ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΉ Ρ <ΡΠ°Π±Π»ΠΎΠ½ΠΎΠΌ>" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½ΠΈΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ -e" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ, ΡΠΊΠ°Π·Π°ΡΡ Π½Π° ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠ΄Π° Π²ΡΡ
ΠΎΠ΄Π°" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΠΈΠ· ΡΠ°ΠΉΠ»ΠΎΠ² Π² ΠΊΠΎΡΠΎΡΡΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ Π²ΡΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΡΠ°Π·Π±ΠΎΡΠ° Π΄Π»Ρ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ ΠΏΠΎΠΈΡΠΊΠ°" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "ΠΏΠ΅ΠΉΠ΄ΠΆΠ΅Ρ" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ-ΠΏΠ΅ΠΉΠ΄ΠΆΠ΅ΡΠ°" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π²ΡΠ·ΠΎΠ² grep(1) (ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π² ΡΡΠΎΠΉ ΡΠ±ΠΎΡΠΊΠ΅)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "Π½Π΅ Π·Π°Π΄Π°Π½ ΡΠ°Π±Π»ΠΎΠ½." -#: builtin/grep.c:845 builtin/index-pack.c:1477 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΡΠΎΠΊΠΎΠ² (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ΡΠ°Π±ΠΎΡΠ°Π΅Ρ ΡΠΎΠ»ΡΠΊΠΎ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ΠΈΠ»ΠΈ --untracked Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --no-index." -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index ΠΈΠ»ΠΈ --untracked Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ." -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ." -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --cached ΠΈ Π΄Π΅ΡΠ΅Π²ΠΎ." @@ -6665,176 +7536,180 @@ msgstr "git hash-object [-t <ΡΠΈΠΏ>] [-w] [--path=<ΡΠ°ΠΉΠ»> | --no-filters] [- msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "type" msgstr "ΡΠΈΠΏ" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ°" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "Π·Π°ΠΏΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π² Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» Π±Π΅Π· ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΡΠΈΠ»ΡΡΡΠΎΠ²" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "Ρ
ΡΡΠΈΡΠΎΠ²Π°ΡΡ Π»ΡΠ±ΠΎΠΉ ΠΌΡΡΠΎΡ ΠΈ ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π΄Π»Ρ ΠΎΡΠ»Π°Π΄ΠΊΠΈ Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠ°ΠΊ, Π±ΡΠ΄ΡΠΎ ΠΎΠ½ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ Π²ΡΠ΅Ρ
Π΄ΠΎΡΡΡΠΏΠ½ΡΡ
ΠΊΠΎΠΌΠ°Π½Π΄" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "ΠΈΡΠΊΠ»ΡΡΠΈΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π°" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΠΏΠΎΠ»Π΅Π·Π½ΡΡ
ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "ΠΎΡΠΊΡΡΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ man" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "ΠΎΡΠΊΡΡΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎ Π² Π²Π΅Π±-Π±ΡΠ°ΡΠ·Π΅ΡΠ΅" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "ΠΎΡΠΊΡΡΡΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ info" -#: builtin/help.c:52 +#: builtin/help.c:54 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<ΠΊΠΎΠΌΠ°Π½Π΄Π°>]" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ ΡΠΎΡΠΌΠ°Ρ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π° Β«%sΒ»" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ emacsclient." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠΈ Π²Π΅ΡΡΠΈΠΈ emacsclient." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Π²Π΅ΡΡΠΈΡ emacsclient Β«%dΒ» ΡΠ»ΠΈΡΠΊΠΎΠΌ ΡΡΠ°ΡΠ°Ρ (< 22)." -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ Β«%sΒ»" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "Β«%sΒ»: ΠΏΡΡΡ Π΄Π»Ρ Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man.\nΠΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«man.<ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ°>.cmdΒ»." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "Β«%sΒ»: ΠΊΠΎΠΌΠ°Π½Π΄Π° Π΄Π»Ρ Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man.\nΠΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«man.<ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ°>.pathΒ»." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "Β«%sΒ»: Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man." -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΡΠΌΠΎΡΡΠ° man Π½Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π»Π° Π·Π°ΠΏΡΠΎΡ" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΡΠΌΠΎΡΡΠ° info Π½Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π»Π° Π·Π°ΠΏΡΠΎΡ" -#: builtin/help.c:408 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "ΠΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ Π°ΡΡΠΈΠ±ΡΡΠΎΠ² Π΄Π»Ρ ΠΏΡΡΠ΅ΠΉ ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ»ΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²" -#: builtin/help.c:409 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "ΠΠΎΠ²ΡΠ΅Π΄Π½Π΅Π²Π½ΡΠΉ Git Ρ 20 ΠΊΠΎΠΌΠ°Π½Π΄Π°ΠΌΠΈ ΠΈΠ»ΠΈ ΠΎΠΊΠΎΠ»ΠΎ ΡΠΎΠ³ΠΎ" -#: builtin/help.c:410 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "ΠΠ»ΠΎΡΡΠ°ΡΠΈΠΉ Git" -#: builtin/help.c:411 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΡΠΏΠ΅ΡΠΈΠ°Π»ΡΠ½ΠΎ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/help.c:412 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "ΠΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΡΠ²ΠΎΠΉΡΡΠ² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ" -#: builtin/help.c:413 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ ΠΈ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ΠΎΠ² Π΄Π»Ρ Git" -#: builtin/help.c:414 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Π£ΡΠ΅Π±Π½ΠΎΠ΅ Π²Π²Π΅Π΄Π΅Π½ΠΈΠ΅ Π² Git (Π΄Π»Ρ Π²Π΅ΡΡΠΈΠΈ 1.5.1 ΠΈΠ»ΠΈ Π½ΠΎΠ²Π΅Π΅)" -#: builtin/help.c:415 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "ΠΠ±Π·ΠΎΡ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡΠ΅ΠΌΡΡ
ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΠ΅ΠΉ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΠΌΡΡ
Π΄Π΅ΠΉΡΡΠ²ΠΈΠΉ Ρ Git" -#: builtin/help.c:427 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "ΠΡΠ½ΠΎΠ²Π½ΡΠ΅ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π° Git:\n" -#: builtin/help.c:448 builtin/help.c:465 -#, c-format -msgid "usage: %s%s" -msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅: %s%s" - -#: builtin/help.c:481 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "Β«git %sΒ» β ΡΡΠΎ ΡΠΎΠΊΡΠ°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ Β«%sΒ»" -#: builtin/index-pack.c:152 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅: %s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΡΠΈΠΏΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π½Π° %s" -#: builtin/index-pack.c:222 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π½Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π° %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ %s: ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΡΠΉ ΡΠΈΠΏ %s, ΠΏΠΎΠ»ΡΡΠ΅Π½ %s" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:269 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" @@ -6843,159 +7718,163 @@ msgstr[1] "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΎΠ»Π½ΠΈΡΡ %d Π±Π°ΠΉΡΠ°" msgstr[2] "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΎΠ»Π½ΠΈΡΡ %d Π±Π°ΠΉΡΠΎΠ²" msgstr[3] "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΎΠ»Π½ΠΈΡΡ %d Π±Π°ΠΉΡΠΎΠ²" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠ½Π΅Ρ ΡΠ°ΠΉΠ»Π°" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΡΡΠ΅Π½ΠΈΡ Π²Π²ΠΎΠ΄Π°" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΎ Π±ΠΎΠ»ΡΡΠ΅ Π±Π°ΠΉΡ, ΡΠ΅ΠΌ Π±ΡΠ»ΠΎ Π΄ΠΎΡΡΡΠΏΠ½ΠΎ" -#: builtin/index-pack.c:297 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "ΠΏΠ°ΠΊΠ΅Ρ ΡΠ»ΠΈΡΠΊΠΎΠΌ Π±ΠΎΠ»ΡΡΠΎΠΉ Π΄Π»Ρ ΡΠ΅ΠΊΡΡΠ΅Π³ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΡ off_t" -#: builtin/index-pack.c:313 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "ΡΠ°Π·ΠΌΠ΅Ρ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΡΠ΅Π²ΡΡΠ°Π΅Ρ ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½ΡΠΉ Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Β«%sΒ»" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° Β«%sΒ»" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/index-pack.c:334 +#: builtin/index-pack.c:338 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Π²Π΅ΡΡΠΈΡ ΠΏΠ°ΠΊΠ΅ΡΠ° %<PRIu32> Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ" -#: builtin/index-pack.c:352 +#: builtin/index-pack.c:356 #, c-format -msgid "pack has bad object at offset %lu: %s" -msgstr "Π² ΠΏΠ°ΠΊΠ΅ΡΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ ΠΏΠΎ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΡ %lu: %s" +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΏΠ»ΠΎΡ
ΠΎΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ ΠΏΠΎ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΡ %<PRIuMAX>: %s" -#: builtin/index-pack.c:473 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠΆΠ°ΡΠΈΡ Π²Π΅ΡΠ½ΡΠ»Π° %d" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "ΠΏΠ΅ΡΠ΅ΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΡ Ρ Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π΄Π΅Π»ΡΡΡ" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π±Π°Π·ΠΎΠ²ΠΎΠΉ Π΄Π΅Π»ΡΡΡ Π²ΡΡΠ»ΠΎ Π·Π° Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠ΅ ΠΏΡΠ΅Π΄Π΅Π»Ρ" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %d" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ pread Π΄Π»Ρ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:576 #, c-format -msgid "premature end of pack file, %lu byte missing" -msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %lu Π±Π°ΠΉΡ ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" -msgstr[1] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %lu Π±Π°ΠΉΡΠ° ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" -msgstr[2] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %lu Π±Π°ΠΉΡΠΎΠ² ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" -msgstr[3] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %lu Π±Π°ΠΉΡΠΎΠ² ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" +msgid "premature end of pack file, %<PRIuMAX> byte missing" +msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" +msgstr[0] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %<PRIuMAX> Π±Π°ΠΉΡ ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" +msgstr[1] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %<PRIuMAX> Π±Π°ΠΉΡΠ° ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" +msgstr[2] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %<PRIuMAX> Π±Π°ΠΉΡΠΎΠ² ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" +msgstr[3] "ΠΏΡΠ΅ΠΆΠ΄Π΅Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠ΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°, %<PRIuMAX> Π±Π°ΠΉΡΠΎΠ² ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" -#: builtin/index-pack.c:597 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "ΡΠ΅ΡΡΠ΅Π·Π½ΠΎΠ΅ Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΠΏΡΠΈ ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠ΅" -#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 -#: builtin/index-pack.c:806 builtin/index-pack.c:815 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "ΠΠΠΠΠΠΠ ΠΠΠΠΠΠΠΠ― SHA1 Π‘ %s !" -#: builtin/index-pack.c:746 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:751 builtin/pack-objects.c:166 +#: builtin/pack-objects.c:258 #, c-format msgid "unable to read %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s" -#: builtin/index-pack.c:812 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ %s" -#: builtin/index-pack.c:826 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s" -#: builtin/index-pack.c:840 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ %s" -#: builtin/index-pack.c:843 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "ΠΡΠΈΠ±ΠΊΠ° Π² ΠΎΠ±ΡΠ΅ΠΊΡΠ΅" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "ΠΠ΅ Π²ΡΠ΅ Π΄ΠΎΡΠ΅ΡΠ½ΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ %s Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ" -#: builtin/index-pack.c:917 builtin/index-pack.c:948 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠΈ Π΄Π΅Π»ΡΡΡ" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "ΠΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "ΠΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "ΠΏΠ°ΠΊΠ΅Ρ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ (Π½Π΅ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ SHA1)" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ fstat Π΄Π»Ρ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/index-pack.c:1158 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΌΡΡΠΎΡ Π² ΠΊΠΎΠ½ΡΠ΅" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Π±Π΅Π·ΡΠΌΠ½Π°Ρ ΠΏΡΡΠ°Π½ΠΈΡΠ° Π² parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "ΠΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/index-pack.c:1205 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΏΠΎΡΠΎΠΊ: %s" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "Π±Π΅Π·ΡΠΌΠ½Π°Ρ ΠΏΡΡΠ°Π½ΠΈΡΠ°" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1256 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -7004,12 +7883,12 @@ msgstr[1] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" msgstr[2] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" msgstr[3] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "ΠΠ΅ΠΎΠΆΠΈΠ΄Π°Π½Π½Π°Ρ ΠΊΠΎΠ½ΡΡΠΎΠ»ΡΠ½Π°Ρ ΡΡΠΌΠΌΠ° Π² ΠΊΠΎΠ½ΡΠ΅ %s (Π΄ΠΈΡΠΊ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½?)" -#: builtin/index-pack.c:1269 +#: builtin/index-pack.c:1272 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -7018,59 +7897,59 @@ msgstr[1] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠ΅ Π΄Π΅Π»ΡΡΡ msgstr[2] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΡ
Π΄Π΅Π»ΡΡ" msgstr[3] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΡ
Π΄Π΅Π»ΡΡ" -#: builtin/index-pack.c:1293 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΆΠ°ΡΡ ΠΏΡΠΈΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ (%d)" -#: builtin/index-pack.c:1369 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ %s ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: builtin/index-pack.c:1393 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π·Π°ΠΊΡΡΡΠΈΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ Β«%sΒ»" -#: builtin/index-pack.c:1414 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΡΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ Β«%sΒ»" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 +#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "Π½Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΊΠΈ ΠΏΠΎΡΠΎΠΊΠΎΠ², ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° Β«%sΒ»" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π΄Π»Ρ Β«%sΒ»" -#: builtin/index-pack.c:1589 +#: builtin/index-pack.c:1591 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -7079,7 +7958,7 @@ msgstr[1] "Π½Π΅ Π΄Π΅Π»ΡΡΡ: %d ΠΎΠ±ΡΠ΅ΠΊΡΠ°" msgstr[2] "Π½Π΅ Π΄Π΅Π»ΡΡΡ: %d ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" msgstr[3] "Π½Π΅ Π΄Π΅Π»ΡΡΡ: %d ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1598 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -7088,141 +7967,137 @@ msgstr[1] "Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ = %d: %lu ΠΎΠ±ΡΠ΅ΠΊΡΠ°" msgstr[2] "Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ = %d: %lu ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" msgstr[3] "Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ = %d: %lu ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1611 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "ΠΈΠΌΡ ΠΏΠ°ΠΊΠ΅ΡΠ° Β«%sΒ» Π½Π΅ ΠΎΠΊΠ°Π½ΡΠΈΠ²Π°Π΅ΡΡΡ Π½Π° Β«.packΒ»" -#: builtin/index-pack.c:1638 -msgid "Cannot come back to cwd" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²Π΅ΡΠ½ΡΡΡΡΡ Π² ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" - -#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 -#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 +#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 #, c-format msgid "bad %s" msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ %s" -#: builtin/index-pack.c:1723 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π΅Π· --stdin" -#: builtin/index-pack.c:1731 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "--verify Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ Β«%sΒ»" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ ΡΠ°Π±Π»ΠΎΠ½Π° Β«%sΒ»" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ opendir Π΄Π»Ρ Β«%sΒ»" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ readlink Π΄Π»Ρ Β«%sΒ»" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ Β«%sΒ» Π½Π° Β«%sΒ»" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ» Π² Β«%sΒ»" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΡΠ°Π±Π»ΠΎΠ½Π° %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "ΡΠ°Π±Π»ΠΎΠ½Ρ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "Π½Π΅ ΠΊΠΎΠΏΠΈΡΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· Β«%sΒ»: %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "Π½Π΅ ΡΠ΄Π°Π΅ΡΡΡ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠΈΠΏΠ° %d" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "Π½Π΅ ΡΠ΄Π°Π΅ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΡΠ°ΠΉΠ» %s Π² %s" -#. TRANSLATORS: The first '%s' is either "Reinitialized -#. existing" or "Initialized empty", the second " shared" or -#. "", and the last '%s%s' is the verbatim directory name. +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" + #: builtin/init-db.c:403 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n" +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "ΠΠ΅ΡΠ΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΠΎΠ±ΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n" #: builtin/init-db.c:404 -msgid "Reinitialized existing" -msgstr "ΠΠ΅ΡΠ΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ΅Π³ΠΎ" +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "ΠΠ΅ΡΠ΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n" -#: builtin/init-db.c:404 -msgid "Initialized empty" -msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΠΏΡΡΡΠΎΠΉ" +#: builtin/init-db.c:408 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΠΏΡΡΡΠΎΠΉ ΠΎΠ±ΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n" -#: builtin/init-db.c:405 -msgid " shared" -msgstr " ΠΎΠ±ΡΠΈΠΉ" +#: builtin/init-db.c:409 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΠΏΡΡΡΠΎΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n" -#: builtin/init-db.c:452 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] " "[--shared[=<permissions>]] [<directory>]" msgstr "git init [-q | --quiet] [--bare] [--template=<ΠΊΠ°ΡΠ°Π»ΠΎΠ³-ΡΠ°Π±Π»ΠΎΠ½ΠΎΠ²>] [--shared[=<ΠΏΡΠ°Π²Π°-Π΄ΠΎΡΡΡΠΏΠ°>]] [<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>]" -#: builtin/init-db.c:475 +#: builtin/init-db.c:480 msgid "permissions" msgstr "ΠΏΡΠ°Π²Π°-Π΄ΠΎΡΡΡΠΏΠ°" -#: builtin/init-db.c:476 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "ΡΠΊΠ°ΠΆΠΈΡΠ΅, Π΅ΡΠ»ΠΈ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ git Π±ΡΠ΄Π΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΠΌΠΈ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΠΌΠΈ" -#: builtin/init-db.c:510 builtin/init-db.c:515 +#: builtin/init-db.c:515 builtin/init-db.c:520 #, c-format msgid "cannot mkdir %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ mkdir %s" -#: builtin/init-db.c:519 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ chdir Π² %s" -#: builtin/init-db.c:540 +#: builtin/init-db.c:545 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "%s (ΠΈΠ»ΠΈ --work-tree=<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>) Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ %s (ΠΈΠ»ΠΈ --git-dir=<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>)" -#: builtin/init-db.c:568 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π΄ΠΎΡΡΡΠΏ ΠΊ ΡΠ°Π±ΠΎΡΠ΅ΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Ρ Β«%sΒ»" @@ -7253,423 +8128,428 @@ msgstr "Π·Π°Π²Π΅ΡΡΠΈΡΠ΅Π»ΠΈ Π΄Π»Ρ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ" msgid "no input file given for in-place editing" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ, Π΄Π»Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΡΠ°ΠΉΠ»ΠΎΠ² Π½Π° ΠΌΠ΅ΡΡΠ΅" -#: builtin/log.c:43 +#: builtin/log.c:44 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<ΠΎΠΏΡΠΈΠΈ>] [<Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½-ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ>] [[--] <ΠΏΡΡΡ>β¦]" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git show [<options>] <object>..." msgstr "git show [<ΠΎΠΏΡΠΈΠΈ>] <ΠΎΠ±ΡΠ΅ΠΊΡ>β¦" -#: builtin/log.c:83 +#: builtin/log.c:84 #, c-format msgid "invalid --decorate option: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Π΄Π»Ρ --decorate: %s" -#: builtin/log.c:137 +#: builtin/log.c:139 msgid "suppress diff output" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΡ" -#: builtin/log.c:138 +#: builtin/log.c:140 msgid "show source" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠ½ΠΈΠΊ" -#: builtin/log.c:139 +#: builtin/log.c:141 msgid "Use mail map file" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΡ ΠΏΠΎΡΡΠΎΠ²ΡΡ
Π°Π΄ΡΠ΅ΡΠΎΠ²" -#: builtin/log.c:140 +#: builtin/log.c:142 msgid "decorate options" msgstr "ΠΎΠΏΡΠΈΠΈ ΡΠΎΡΠΌΠ°ΡΠ° Π²ΡΠ²ΠΎΠ΄Π° ΡΡΡΠ»ΠΎΠΊ" -#: builtin/log.c:143 +#: builtin/log.c:145 msgid "Process line range n,m in file, counting from 1" msgstr "ΠΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ ΡΡΡΠΎΠΊ n,m ΠΈΠ· ΡΠ°ΠΉΠ»Π°, Π½Π°ΡΠΈΠ½Π°Ρ Ρ 1" -#: builtin/log.c:239 +#: builtin/log.c:241 #, c-format msgid "Final output: %d %s\n" msgstr "Π€ΠΈΠ½Π°Π»ΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄: %d %s\n" -#: builtin/log.c:471 +#: builtin/log.c:486 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ΠΏΠ»ΠΎΡ
ΠΎΠΉ ΡΠ°ΠΉΠ»" -#: builtin/log.c:485 builtin/log.c:578 +#: builtin/log.c:500 builtin/log.c:594 #, c-format msgid "Could not read object %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ %s" -#: builtin/log.c:602 +#: builtin/log.c:618 #, c-format msgid "Unknown type: %d" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: %d" -#: builtin/log.c:722 +#: builtin/log.c:739 msgid "format.headers without value" msgstr "Π² format.headers Π½Π΅ ΡΠΊΠ°Π·Π°Π½ΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/log.c:812 +#: builtin/log.c:839 msgid "name of output directory is too long" msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ Π΄Π»ΠΈΠ½Π½ΠΎΠ΅ ΠΈΠΌΡ Π²ΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: builtin/log.c:827 +#: builtin/log.c:854 #, c-format msgid "Cannot open patch file %s" msgstr "ΠΡ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %s" -#: builtin/log.c:841 +#: builtin/log.c:868 msgid "Need exactly one range." msgstr "ΠΡΠΆΠ΅Π½ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄ΠΈΠ½ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½." -#: builtin/log.c:851 +#: builtin/log.c:878 msgid "Not a range." msgstr "ΠΠ΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ΠΎΠΌ." -#: builtin/log.c:957 +#: builtin/log.c:984 msgid "Cover letter needs email format" msgstr "Π‘ΠΎΠΏΡΠΎΠ²ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ Π΄ΠΎΠ»ΠΆΠ½ΠΎ Π±ΡΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΠΎΠΉ ΠΏΠΎΡΡΡ" -#: builtin/log.c:1036 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΠΎΠ»Π΅ in-reply-to: %s" -#: builtin/log.c:1064 +#: builtin/log.c:1091 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<ΠΎΠΏΡΠΈΠΈ>] [<Π½Π°ΡΠΈΠ½Π°Ρ-Ρ> | <Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½-ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ>]" -#: builtin/log.c:1109 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "ΠΠ²Π° Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°?" -#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 #, c-format msgid "Unknown commit %s" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s" -#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 -#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 -#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 -#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Β«%sΒ» ΠΊΠ°ΠΊ ΡΡΡΠ»ΠΊΡ." -#: builtin/log.c:1231 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΡΠ½ΡΡ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ." -#: builtin/log.c:1235 +#: builtin/log.c:1267 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΡΡ Π²Π΅ΡΠΊΡ. ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π°Π²ΡΠΎΠΌΠΈΡΠΈΡΠ΅ΡΠΊΠΈ, ΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ git branch --set-upstream-to Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΡ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΈ.\nΠΠ»ΠΈ ΠΆΠ΅ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΠΊΠ°Π·Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ --base=<ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ-ΠΊΠΎΠΌΠΌΠΈΡΠ°> Π²ΡΡΡΠ½ΡΡ." -#: builtin/log.c:1255 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΡΠ½ΡΡ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/log.c:1266 +#: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ ΠΏΡΠ΅Π΄ΠΊΠΎΠΌ ΡΠΏΠΈΡΠΊΠ° ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ" -#: builtin/log.c:1270 +#: builtin/log.c:1302 msgid "base commit shouldn't be in revision list" msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ Π² ΡΠΏΠΈΡΠΊΠ΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ" -#: builtin/log.c:1319 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΏΠ°ΡΡΠ°" -#: builtin/log.c:1377 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ [PATCH n/m] Π΄Π°ΠΆΠ΅ ΠΊΠΎΠ³Π΄Π° ΠΎΠ΄ΠΈΠ½ ΠΏΠ°ΡΡ" -#: builtin/log.c:1380 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ [PATCH] Π΄Π°ΠΆΠ΅ ΠΊΠΎΠ³Π΄Π° Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΠΏΠ°ΡΡΠ΅ΠΉ" -#: builtin/log.c:1384 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΠ°ΡΡΠΈ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/log.c:1386 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "Π³Π΅Π½Π΅ΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΏΡΠΎΠ²ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ" -#: builtin/log.c:1388 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΡΠΎΡΡΡΡ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΡ ΡΠΈΡΠ΅Π» Π΄Π»Ρ ΠΈΠΌΠ΅Π½ Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/log.c:1389 +#: builtin/log.c:1420 msgid "sfx" msgstr "ΡΡΡΡΠΈΠΊΡ" -#: builtin/log.c:1390 +#: builtin/log.c:1421 msgid "use <sfx> instead of '.patch'" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΡΡΡΠΈΠΊΡ <ΡΡΡΡΠΈΠΊΡ> Π²ΠΌΠ΅ΡΡΠΎ Β«.patchΒ»" -#: builtin/log.c:1392 +#: builtin/log.c:1423 msgid "start numbering patches at <n> instead of 1" msgstr "Π½Π°ΡΠ°ΡΡ Π½ΡΠΌΠ΅ΡΠ°ΡΠΈΡ ΠΏΠ°ΡΡΠ΅ΠΉ Ρ <n>, Π° Π½Π΅ Ρ 1" -#: builtin/log.c:1394 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ΅ΡΠΈΡ ΠΊΠ°ΠΊ ΡΠ½Π½ΡΡ ΠΏΠΎΠΏΡΡΠΊΡ" -#: builtin/log.c:1396 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ [RFC PATCH] Π²ΠΌΠ΅ΡΡΠΎ [PATCH]" + +#: builtin/log.c:1430 msgid "Use [<prefix>] instead of [PATCH]" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ [<ΠΏΡΠ΅ΡΠΈΠΊΡ>] Π²ΠΌΠ΅ΡΡΠΎ [PATCH]" -#: builtin/log.c:1399 +#: builtin/log.c:1433 msgid "store resulting files in <dir>" msgstr "ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅Π·ΡΠ»ΡΡΠΈΡΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π² <ΠΊΠ°ΡΠ°Π»ΠΎΠ³>" -#: builtin/log.c:1402 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "Π½Π΅ ΠΎΠ±ΡΠ΅Π·Π°ΡΡ/Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ [PATCH]" -#: builtin/log.c:1405 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΡΠ°Π·Π»ΠΈΡΠΈΡ" -#: builtin/log.c:1407 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π½ΡΠ»Π΅Π²ΡΡ Ρ
ΡΡ-ΡΡΠΌΠΌΡ Π² Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅ From" -#: builtin/log.c:1409 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "Π½Π΅ Π²ΠΊΠ»ΡΡΠ°ΡΡ ΠΏΠ°ΡΡ, Π΅ΡΠ»ΠΈ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΆΠ΅ Π΅ΡΡΡ Π² Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅" -#: builtin/log.c:1411 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ ΠΏΠ°ΡΡΠ°, Π° Π½Π΅ Π² ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠΌ (ΠΏΠ°ΡΡ + ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°)" -#: builtin/log.c:1413 +#: builtin/log.c:1447 msgid "Messaging" msgstr "ΠΠ΅ΡΠ΅Π΄Π°ΡΠ° ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ" -#: builtin/log.c:1414 +#: builtin/log.c:1448 msgid "header" msgstr "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ" -#: builtin/log.c:1415 +#: builtin/log.c:1449 msgid "add email header" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ" -#: builtin/log.c:1416 builtin/log.c:1418 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "ΠΏΠΎΡΡΠ°" -#: builtin/log.c:1416 +#: builtin/log.c:1450 msgid "add To: header" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ To:" -#: builtin/log.c:1418 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ Cc:" -#: builtin/log.c:1420 +#: builtin/log.c:1454 msgid "ident" msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ" -#: builtin/log.c:1421 +#: builtin/log.c:1455 msgid "set From address to <ident> (or committer ident if absent)" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π°Π΄ΡΠ΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΈΡΠ΅Π»Ρ Π½Π° <ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ> (ΠΈΠ»ΠΈ Π½Π° ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠ΅ΡΠ°, Π΅ΡΠ»ΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ)" -#: builtin/log.c:1423 +#: builtin/log.c:1457 msgid "message-id" msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ" -#: builtin/log.c:1424 +#: builtin/log.c:1458 msgid "make first mail a reply to <message-id>" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΠΏΠ΅ΡΠ²ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ ΠΎΡΠ²Π΅ΡΠΎΠΌ Π½Π° <ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ>" -#: builtin/log.c:1425 builtin/log.c:1428 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "Π²Π»ΠΎΠΆΠ΅Π½ΠΈΠ΅" -#: builtin/log.c:1426 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "ΠΏΡΠΈΠ»ΠΎΠΆΠΈΡΡ ΠΏΠ°ΡΡ" -#: builtin/log.c:1429 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΏΠ°ΡΡ Π² ΡΠ΅ΠΊΡΡ ΠΏΠΈΡΡΠΌΠ°" -#: builtin/log.c:1433 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ Π² ΠΏΠΈΡΡΠΌΠ°Ρ
ΠΈΠ΅ΡΠ°ΡΡ
ΠΈΡΠ½ΠΎΡΡΡ, ΡΡΠΈΠ»ΠΈ: shallow (ΡΠ°ΡΡΠΈΡΠ½ΡΡ), deep (Π³Π»ΡΠ±ΠΎΠΊΡΡ)" -#: builtin/log.c:1435 +#: builtin/log.c:1469 msgid "signature" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΡ" -#: builtin/log.c:1436 +#: builtin/log.c:1470 msgid "add a signature" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ" -#: builtin/log.c:1437 +#: builtin/log.c:1471 msgid "base-commit" msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/log.c:1438 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΡΡΠ΅Π±ΠΎΠ²Π°Π½ΠΈΠΈ Π΄Π΅ΡΠ΅Π²Π° ΠΊ ΡΠ΅ΡΠΈΠΈ ΠΏΠ°ΡΡΠ΅ΠΉ" -#: builtin/log.c:1440 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ ΠΈΠ· ΡΠ°ΠΉΠ»Π°" -#: builtin/log.c:1441 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΏΠ°ΡΡΠ΅ΠΉ" -#: builtin/log.c:1531 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "-n ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/log.c:1533 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/log.c:1541 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "--name-only Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/log.c:1543 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "--name-status Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/log.c:1545 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "--check Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/log.c:1573 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄ ΠΈΠ»ΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³?" -#: builtin/log.c:1575 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/log.c:1672 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ Β«%sΒ»" -#: builtin/log.c:1743 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΡΠΎΠ·Π΄Π°Π½ΠΈΠΈ Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/log.c:1792 +#: builtin/log.c:1826 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ-Π²Π΅ΡΠΊΠ°> [<Π³ΠΎΠ»ΠΎΠ²Π°> [<ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½ΠΈΠ΅>]]]" -#: builtin/log.c:1846 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " "manually.\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ, ΡΠΊΠ°ΠΆΠΈΡΠ΅ <Π²ΡΡΠ΅ΡΡΠΎΡΡΡΡ-Π²Π΅ΡΠΊΡ> Π²ΡΡΡΠ½ΡΡ.\n" -#: builtin/ls-files.c:378 +#: builtin/ls-files.c:458 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<ΠΎΠΏΡΠΈΠΈ>] [<ΡΠ°ΠΉΠ»>β¦]" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² Ρ ΠΌΠ΅ΡΠΊΠ°ΠΌΠΈ" -#: builtin/ls-files.c:429 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»Ρ Π² Π½ΠΈΠΆΠ½Π΅ΠΌ ΡΠ΅Π³ΠΈΡΡΡΠ΅ Π΄Π»Ρ Β«ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΠΎ Π±Π΅Π· ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉΒ» ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/ls-files.c:431 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΊΡΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/ls-files.c:433 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΡΠ΄Π°Π»Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅" -#: builtin/ls-files.c:435 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ Π΄ΡΡΠ³ΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅" -#: builtin/ls-files.c:439 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΡΠΈ Π²ΡΠ²ΠΎΠ΄Π΅" -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠΌΡ ΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π½Π° Π²ΡΠ²ΠΎΠ΄Π΅" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°ΠΉΠ»ΠΎΠ²ΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΠ΅, ΠΊΠΎΡΠΎΡΡΠ΅ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ" -#: builtin/ls-files.c:446 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° Ρ Β«Π΄ΡΡΠ³ΠΈΡ
Β» ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²" -#: builtin/ls-files.c:448 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ½ΡΡ ΡΡΡΠΎΠΊ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "Π½Π΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΏΡΡΡΡΠ΅ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ" -#: builtin/ls-files.c:453 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π½Π° Π²ΡΠ²ΠΎΠ΄Π΅" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠΈ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² ΠΈ ΠΎΡΠΌΠ΅Π½Π΅" -#: builtin/ls-files.c:457 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ, ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from <file>" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΠΈΠ· <ΡΠ°ΠΉΠ»>" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in <file>" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΡΠ΅ ΠΏΠΎΠΊΠ°ΡΠ°Π»ΠΎΠΆΠ½ΡΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΠΈΠ· <ΡΠ°ΠΉΠ»>" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠ΅ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ git" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΡΠΈ ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊΠΎΡΠ½Π΅Π²ΠΎΠ³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΏΡΠΎΠ΅ΠΊΡΠ°" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ ΠΏΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΠΌ" + +#: builtin/ls-files.c:553 msgid "if any <file> is not in the index, treat this as an error" msgstr "Π΅ΡΠ»ΠΈ ΠΊΠ°ΠΊΠΎΠΉ-Π»ΠΈΠ±ΠΎ <ΡΠ°ΠΉΠ»> Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅, ΡΡΠΈΡΠ°ΡΡ ΡΡΠΎ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "ΠΏΡΠΈΡΠ²ΠΎΡΠΈΡΡΡΡ, ΡΡΠΎ ΠΏΡΡΠΈ ΡΠ΄Π°Π»Π΅Π½Ρ, Ρ.ΠΊ. <ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°> Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠ»Π°Π΄ΠΎΡΠ½ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ" @@ -7752,186 +8632,172 @@ msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΠΎΠ»Π½ΡΠ΅ ΠΏΡΡΠΈ" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΏΠΎΠ»Π½ΠΎΠ΅ Π΄Π΅ΡΠ΅Π²ΠΎ; Π½Π΅ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ΅ΠΊΡΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ (Π²ΠΊΠ»ΡΡΠ°Π΅Ρ Π² ΡΠ΅Π±Ρ --full-name)" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<ΠΎΠΏΡΠΈΠΈ>] [<ΠΊΠΎΠΌΠΌΠΈΡ>β¦]" -#: builtin/merge.c:46 +#: builtin/merge.c:47 msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "git merge [<ΠΎΠΏΡΠΈΠΈ>] <ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅> HEAD <ΠΊΠΎΠΌΠΌΠΈΡ>" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:101 +#: builtin/merge.c:102 msgid "switch `m' requires a value" msgstr "ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° Β«mΒ» ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠΊΠ°Π·Π°ΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Β«%sΒ».\n" -#: builtin/merge.c:139 +#: builtin/merge.c:140 #, c-format msgid "Available strategies are:" msgstr "ΠΠΎΡΡΡΠΏΠ½ΡΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ:" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "Available custom strategies are:" msgstr "ΠΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΡΠΊΠΈΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ:" -#: builtin/merge.c:194 builtin/pull.c:126 +#: builtin/merge.c:195 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:198 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --stat)" -#: builtin/merge.c:200 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:136 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ (ΠΌΠ°ΠΊΡΠΈΠΌΡΠΌ <n>) Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΊΠΎΠ³ΠΎ ΠΆΡΡΠ½Π°Π»Π° Π² ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:203 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΌΠΈΡ, Π²ΠΌΠ΅ΡΡΠΎ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:205 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π΅ΡΠ»ΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/merge.c:207 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/merge.c:208 +#: builtin/merge.c:209 msgid "allow fast-forward (default)" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΡ Π²ΠΏΠ΅ΡΠ΅Π΄ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/merge.c:210 builtin/pull.c:150 +#: builtin/merge.c:211 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΅ΡΠ»ΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π°" -#: builtin/merge.c:214 -msgid "Verify that the named commit has a valid GPG signature" -msgstr "ΠΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠΌΠ΅Π΅Ρ Π²Π΅ΡΠ½ΡΡ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ GPG" +#: builtin/merge.c:215 builtin/pull.c:154 +msgid "verify that the named commit has a valid GPG signature" +msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠΌΠ΅Π΅Ρ Π²Π΅ΡΠ½ΡΡ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ GPG" -#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΠ°Ρ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "ΠΎΠΏΡΠΈΡ=Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "ΠΎΠΏΡΠΈΠΈ Π΄Π»Ρ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠΉ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:220 +#: builtin/merge.c:221 msgid "merge commit message (for a non-fast-forward merge)" msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ (Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ Π±Π΅Π· ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΈ Π²ΠΏΠ΅ΡΠ΅Π΄)" -#: builtin/merge.c:224 +#: builtin/merge.c:225 msgid "abort the current in-progress merge" msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΠΏΡΠΎΠΈΡΡ
ΠΎΠ΄ΡΡΠ΅Π³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:226 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ΡΠ²ΡΠ·Π°Π½Π½ΡΡ
ΠΈΡΡΠΎΡΠΈΠΉ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/merge.c:254 +#: builtin/merge.c:255 msgid "could not run stash." msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stash." -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "stash failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ stash" -#: builtin/merge.c:264 +#: builtin/merge.c:265 #, c-format msgid "not a valid object: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ: %s" -#: builtin/merge.c:283 builtin/merge.c:300 +#: builtin/merge.c:284 builtin/merge.c:301 msgid "read-tree failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ read-tree" -#: builtin/merge.c:330 +#: builtin/merge.c:331 msgid " (nothing to squash)" msgstr " (Π½Π΅ΡΠ΅Π³ΠΎ ΡΠΏΠ»ΠΎΡΠ½ΡΡΡ)" -#: builtin/merge.c:343 +#: builtin/merge.c:342 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Π£ΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° β Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡ HEAD\n" -#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 -#: builtin/merge.c:1000 -#, c-format -msgid "Could not write to '%s'" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² Β«%sΒ»" - -#: builtin/merge.c:375 -msgid "Writing SQUASH_MSG" -msgstr "ΠΠ°ΠΏΠΈΡΡ SQUASH_MSG" - -#: builtin/merge.c:377 -msgid "Finishing SQUASH_MSG" -msgstr "ΠΠ°Π²Π΅ΡΡΠ΅Π½ΠΈΠ΅ SQUASH_MSG" - -#: builtin/merge.c:400 +#: builtin/merge.c:392 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "ΠΠ΅Ρ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ β Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ΅ΠΌ HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:443 #, c-format msgid "'%s' does not point to a commit" msgstr "Β«%sΒ» Π½Π΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/merge.c:541 +#: builtin/merge.c:533 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° branch.%s.mergeoptions: %s" -#: builtin/merge.c:660 +#: builtin/merge.c:652 msgid "Not handling anything other than two heads merge." msgstr "ΠΠ΅ ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°Ρ Π½ΠΈΡΠ΅Π³ΠΎ, ΠΊΡΠΎΠΌΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ Π΄Π²ΡΡ
ΡΠΊΠ°Π·Π°ΡΠ΅Π»Π΅ΠΉ Π½Π° Π²Π΅ΡΠΊΠΈ." -#: builtin/merge.c:674 +#: builtin/merge.c:666 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ merge-recursive: -X%s" -#: builtin/merge.c:687 +#: builtin/merge.c:681 #, c-format msgid "unable to write %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ %s" -#: builtin/merge.c:776 +#: builtin/merge.c:733 #, c-format msgid "Could not read from '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠ΅ΡΡΡ ΠΈΠ· Β«%sΒ»" -#: builtin/merge.c:785 +#: builtin/merge.c:742 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "ΠΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git commitΒ» Π΄Π»Ρ Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ.\n" -#: builtin/merge.c:791 +#: builtin/merge.c:748 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7941,161 +8807,183 @@ msgid "" "the commit.\n" msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²Π²Π΅Π΄ΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°, Π΄Π»Ρ ΠΎΠ±ΡΡΡΠ½Π΅Π½ΠΈΡ, Π·Π°ΡΠ΅ΠΌ Π½ΡΠΆΠ½ΠΎ\nΡΡΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, ΠΎΡΠΎΠ±Π΅Π½Π½ΠΎ, Π΅ΡΠ»ΠΈ ΡΡΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΠΎΠΉ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ\nΠ²Π΅ΡΠΊΠΈ Π² ΡΠ΅ΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΡΡ Π²Π΅ΡΠΊΡ.\n\nΠ‘ΡΡΠΎΠΊΠΈ, Π½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ Β«%cΒ» Π±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ, Π° ΠΏΡΡΡΠΎΠ΅\nΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΡΠΌΠ΅Π½ΡΠ΅Ρ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: builtin/merge.c:815 +#: builtin/merge.c:772 msgid "Empty commit message." msgstr "ΠΡΡΡΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°." -#: builtin/merge.c:835 +#: builtin/merge.c:792 #, c-format msgid "Wonderful.\n" msgstr "ΠΡΠ΅ΠΊΡΠ°ΡΠ½ΠΎ.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:847 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠ²Π΅ΡΡΠΈ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅; ΠΈΡΠΏΡΠ°Π²ΡΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΠΈ ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ΅Π·ΡΠ»ΡΡΠ°ΡΠ°.\n" -#: builtin/merge.c:906 +#: builtin/merge.c:863 #, c-format msgid "'%s' is not a commit" msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ" -#: builtin/merge.c:947 +#: builtin/merge.c:904 msgid "No current branch." msgstr "ΠΠ΅Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ." -#: builtin/merge.c:949 +#: builtin/merge.c:906 msgid "No remote for the current branch." msgstr "Π£ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π½Π΅Ρ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." -#: builtin/merge.c:951 +#: builtin/merge.c:908 msgid "No default upstream defined for the current branch." msgstr "ΠΠ»Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π½Π΅ ΡΠΊΠ°Π·Π°Π½Π° Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ." -#: builtin/merge.c:956 +#: builtin/merge.c:913 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½Π° Π²Π½Π΅ΡΠ½ΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ° Π΄Π»Ρ %s Π½Π° %s" -#: builtin/merge.c:1091 +#: builtin/merge.c:960 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "ΠΠ»ΠΎΡ
ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ ΠΎΠΊΡΡΠΆΠ΅Π½ΠΈΡ Β«%sΒ»" + +#: builtin/merge.c:1034 #, c-format msgid "could not close '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ Β«%sΒ»" -#: builtin/merge.c:1219 +#: builtin/merge.c:1061 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΌ, ΡΡΠΎ ΠΌΠΎΠΆΠ½ΠΎ ΡΠ»ΠΈΡΡ Π² %s: %s" + +#: builtin/merge.c:1095 +msgid "not something we can merge" +msgstr "Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΌ, ΡΡΠΎ ΠΌΠΎΠΆΠ½ΠΎ ΡΠ»ΠΈΡΡ" + +#: builtin/merge.c:1162 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "ΠΠ΅Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ, ΠΊΠΎΡΠΎΡΠΎΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ (ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» MERGE_HEAD)." -#: builtin/merge.c:1235 +#: builtin/merge.c:1178 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» MERGE_HEAD).\nΠΡΠΏΠΎΠ»Π½ΠΈΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ Π²Π°ΡΠΈΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, ΠΏΠ΅ΡΠ΅Π΄ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ." -#: builtin/merge.c:1242 +#: builtin/merge.c:1185 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." -msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» CHERRY_PICK_HEAD).\nΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ Π²Π°ΡΠΈΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, ΠΏΠ΅ΡΠ΅Π΄ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ." +msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» CHERRY_PICK_HEAD).\nΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΏΠ΅ΡΠ΅Π΄ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ." -#: builtin/merge.c:1245 +#: builtin/merge.c:1188 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» CHERRY_PICK_HEAD)." +msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» CHERRY_PICK_HEAD)." -#: builtin/merge.c:1254 +#: builtin/merge.c:1197 msgid "You cannot combine --squash with --no-ff." msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --squash ΠΈ --no-ff." -#: builtin/merge.c:1262 +#: builtin/merge.c:1205 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "ΠΠΎΠΌΠΌΠΈΡ Π½Π΅ ΡΠΊΠ°Π·Π°Π½ ΠΈ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ merge.defaultToUpstream Π½Π΅ ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½." -#: builtin/merge.c:1279 +#: builtin/merge.c:1222 msgid "Squash commit into empty head not supported yet" msgstr "Π£ΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ Π΅ΡΠ΅ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ" -#: builtin/merge.c:1281 +#: builtin/merge.c:1224 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "ΠΠΎΠΌΠΌΠΈΡ, Π½Π΅ ΡΠ²Π»ΡΡΡΠΈΠΉΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΎΠΉ Π²ΠΏΠ΅ΡΠ΅Π΄, Π½Π΅Ρ ΡΠΌΡΡΠ»Π° Π΄Π΅Π»Π°ΡΡ Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ." -#: builtin/merge.c:1286 +#: builtin/merge.c:1229 #, c-format msgid "%s - not something we can merge" msgstr "%s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΌ, ΡΡΠΎ ΠΌΠΎΠΆΠ½ΠΎ ΡΠ»ΠΈΡΡ" -#: builtin/merge.c:1288 +#: builtin/merge.c:1231 msgid "Can merge only exactly one commit into empty head" msgstr "ΠΠΎΠΆΠ½ΠΎ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΌΠΈΡ Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ." -#: builtin/merge.c:1344 +#: builtin/merge.c:1287 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "ΠΠΎΠΌΠΌΠΈΡ %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½Π΅ Π΄ΠΎΠ²Π΅ΡΠ΅Π½Π½ΡΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ, ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΎΡ %s." -#: builtin/merge.c:1347 +#: builtin/merge.c:1290 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "ΠΠΎΠΌΠΌΠΈΡ %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΏΠ»ΠΎΡ
ΡΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ, ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΎΡ %s." -#: builtin/merge.c:1350 +#: builtin/merge.c:1293 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "ΠΠΎΠΌΠΌΠΈΡ %s Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ." -#: builtin/merge.c:1353 +#: builtin/merge.c:1296 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "ΠΠΎΠΌΠΌΠΈΡ %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ, ΠΎΡ %s.\n" -#: builtin/merge.c:1415 +#: builtin/merge.c:1358 msgid "refusing to merge unrelated histories" msgstr "ΠΎΡΠΊΠ°Π· ΡΠ»ΠΈΡΠ½ΠΈΡ Π½Π΅ΡΠ²ΡΠ·Π°Π½Π½ΡΡ
ΠΈΡΡΠΎΡΠΈΠΉ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/merge.c:1439 +#: builtin/merge.c:1367 +msgid "Already up-to-date." +msgstr "Π£ΠΆΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ." + +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ %s..%s\n" -#: builtin/merge.c:1476 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "ΠΠΎΠΏΡΡΠΊΠ° ΡΡΠΈΠ²ΠΈΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅β¦\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "ΠΠ΅ Π²ΡΡΠ»ΠΎ.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1450 +msgid "Already up-to-date. Yeeah!" +msgstr "Π£ΠΆΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ. ΠΡΡΡΠΎ!" + +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π°, ΠΎΡΠΌΠ΅Π½Π°." -#: builtin/merge.c:1538 builtin/merge.c:1617 +#: builtin/merge.c:1479 builtin/merge.c:1558 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π΄Π΅ΡΠ΅Π²Π° ΠΊ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠΌΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΡβ¦\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "ΠΠΎΠΏΡΡΠΊΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ %sβ¦\n" -#: builtin/merge.c:1608 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "ΠΠΈ ΠΎΠ΄Π½Π° ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π½Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π»Π° ΡΠ»ΠΈΡΠ½ΠΈΠ΅.\n" -#: builtin/merge.c:1610 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ %s.\n" -#: builtin/merge.c:1619 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΡ %s Π΄Π»Ρ ΠΏΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΊΠΈ ΡΡΡΠ½ΠΎΠ³ΠΎ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ².\n" -#: builtin/merge.c:1631 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "ΠΠ²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ; ΠΊΠ°ΠΊ ΠΈ Π·Π°ΠΏΡΠ°ΡΠΈΠ²Π°Π»ΠΈ, ΠΎΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΎ ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n" @@ -8120,23 +9008,23 @@ msgstr "git merge-base --is-ancestor <ΠΊΠΎΠΌΠΌΠΈΡ> <ΠΊΠΎΠΌΠΌΠΈΡ>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ΡΡΡΠ»ΠΊΠ°> [<ΠΊΠΎΠΌΠΌΠΈΡ>]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π²ΡΠ΅Ρ
ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠΎΠ²" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΏΡΠ΅Π΄ΠΊΠΎΠ² Π΄Π»Ρ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΌΠ½ΠΎΠ³ΠΎΡ
ΠΎΠ΄ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΅Π΄Π°ΡΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ ΠΈΠ· Π΄ΡΡΠ³ Π΄ΡΡΠ³Π°" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠ΅ΡΠ²ΡΠΌ ΠΏΡΠ΅Π΄ΠΊΠΎΠΌ Π²ΡΠΎΡΠΎΠ³ΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where <commit> forked from reflog of <ref>" msgstr "Π½Π°ΠΉΡΠΈ ΠΆΡΡΠ½Π°Π»Π΅ ΡΡΡΠ»ΠΎΠΊ <ΡΡΡΠ»ΠΊΠ°> Π³Π΄Π΅ ΠΈΠΌΠ΅Π½Π½ΠΎ <ΠΊΠΎΠΌΠΌΠΈΡ> ΡΠ°Π·Π²Π΅ΡΠ²ΠΈΠ»ΡΡ" @@ -8178,6 +9066,39 @@ msgstr "Π½Π΅ ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π°ΡΡ ΠΎ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°Ρ
" msgid "set labels for file1/orig-file/file2" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ°ΠΉΠ»1/ΠΎΡΠΈΠ³-ΡΠ°ΠΉΠ»/ΡΠ°ΠΉΠ»2" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΠΏΡΠΈΡ %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·Ρ. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s." +msgstr[1] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s." +msgstr[2] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s." +msgstr[3] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d Π±Π°Π·Ρ. ΠΠ³Π½ΠΎΡΠΈΡΡΡ %s." + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "Π½Π΅ ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°Ρ Π½ΠΈΡΠ΅Π³ΠΎ, ΠΊΡΠΎΠΌΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ Π΄Π²ΡΡ
ΡΠΊΠ°Π·Π°ΡΠ΅Π»Π΅ΠΉ Π½Π° Π²Π΅ΡΠΊΠΈ." + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°ΡΠΏΠΎΠ·Π½Π°ΡΡ ΡΡΡΠ»ΠΊΡ Β«%sΒ»" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ %s ΠΈ %s\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -8220,109 +9141,109 @@ msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ°ΡΡ/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Ρ msgid "skip move/rename errors" msgstr "ΠΏΡΠΎΠΏΡΡΠΊΠ°ΡΡ ΠΎΡΠΈΠ±ΠΊΠΈ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠΈ" -#: builtin/mv.c:152 +#: builtin/mv.c:155 #, c-format msgid "destination '%s' is not a directory" msgstr "ΡΠ΅Π»Π΅Π²ΠΎΠΉ ΠΏΡΡΡ Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" -#: builtin/mv.c:163 +#: builtin/mv.c:166 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ· Β«%sΒ» Π² Β«%sΒ»\n" -#: builtin/mv.c:167 +#: builtin/mv.c:170 msgid "bad source" msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ ΠΈΡΡΠΎΡΠ½ΠΈΠΊ" -#: builtin/mv.c:170 +#: builtin/mv.c:173 msgid "can not move directory into itself" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π² ΡΠ°ΠΌΠΎΠ³ΠΎ ΡΠ΅Π±Ρ" -#: builtin/mv.c:173 +#: builtin/mv.c:176 msgid "cannot move directory over file" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π² ΡΠ°ΠΉΠ»" -#: builtin/mv.c:182 +#: builtin/mv.c:185 msgid "source directory is empty" msgstr "ΠΈΡΡ
ΠΎΠ΄Π½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΡΡΡ" -#: builtin/mv.c:207 +#: builtin/mv.c:210 msgid "not under version control" msgstr "Π½Π΅ ΠΏΠΎΠ΄ Π²Π΅ΡΡΠΈΠΎΠ½Π½ΡΠΌ ΠΊΠΎΠ½ΡΡΠΎΠ»Π΅ΠΌ" -#: builtin/mv.c:210 +#: builtin/mv.c:213 msgid "destination exists" msgstr "ΡΠ΅Π»Π΅Π²ΠΎΠΉ ΠΏΡΡΡ ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/mv.c:218 +#: builtin/mv.c:221 #, c-format msgid "overwriting '%s'" msgstr "ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ Β«%sΒ»" -#: builtin/mv.c:221 +#: builtin/mv.c:224 msgid "Cannot overwrite" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°ΡΡ" -#: builtin/mv.c:224 +#: builtin/mv.c:227 msgid "multiple sources for the same target" msgstr "Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΠΈΡΡΠΎΡΠ½ΠΈΠΊΠΎΠ² Π΄Π»Ρ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΡΠ΅Π»Π΅Π²ΠΎΠ³ΠΎ ΠΏΡΡΠΈ" -#: builtin/mv.c:226 +#: builtin/mv.c:229 msgid "destination directory does not exist" msgstr "ΡΠ΅Π»Π΅Π²ΠΎΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/mv.c:233 +#: builtin/mv.c:236 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, ΠΎΡΠΊΡΠ΄Π°=%s, ΠΊΡΠ΄Π°=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:257 #, c-format msgid "Renaming %s to %s\n" msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ %s Π² %s\n" -#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 #, c-format msgid "renaming '%s' failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠΈ Β«%sΒ»" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] <ΠΊΠΎΠΌΠΌΠΈΡ>β¦" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° (Π±Π΅Π· SHA-1)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching <pattern>" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΡΠ»ΠΊΠΈ, ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΠ΅ <ΡΠ°Π±Π»ΠΎΠ½Ρ> " -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ Π²ΡΠ΅Ρ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ², Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΡ
ΡΠΎ Π²ΡΠ΅Ρ
ΡΡΡΠ»ΠΎΠΊ" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π²ΡΠ²ΠΎΠ΄ Β«undefinedΒ», Π΅ΡΠ»ΠΈ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "ΡΠ°Π·ΡΠΌΠ΅Π½ΠΎΠ²ΡΠ²Π°ΡΡ Π²Π²Π΅Π΄Π΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (Π΄Π»Ρ Π²Π½ΡΡΡΠ΅Π½Π½Π΅Π³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ)" @@ -8431,6 +9352,10 @@ msgstr "git notes prune [<ΠΎΠΏΡΠΈΠΈ>]" msgid "git notes get-ref" msgstr "git notes get-ref" +#: builtin/notes.c:94 +msgid "Write/edit the notes for the following object:" +msgstr "ΠΠ°ΠΏΠΈΡΠ°ΡΡ/ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ»Π΅Π΄ΡΡΡΠ΅Π³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ°:" + #: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" @@ -8445,366 +9370,456 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π²ΡΠ²ΠΎΠ΄ Β«showΒ»" msgid "failed to finish 'show' for object '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π²Π΅ΡΡΠΈΡΡ Β«showΒ» Π΄Π»Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Β«%sΒ»" -#: builtin/notes.c:174 builtin/tag.c:248 -#, c-format -msgid "could not create file '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ»" - -#: builtin/notes.c:193 -msgid "Please supply the note contents using either -m or -F option" -msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΡ ΠΎΠΏΡΠΈΡ -m ΠΈΠ»ΠΈ -F" +#: builtin/notes.c:194 +msgid "please supply the note contents using either -m or -F option" +msgstr "ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΡ ΠΎΠΏΡΠΈΡ -m ΠΈΠ»ΠΈ -F" -#: builtin/notes.c:202 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ" -#: builtin/notes.c:204 +#: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" -msgstr "Π‘ΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΎΡΡΠ°Π»ΠΎΡΡ Π² %s" +msgid "the note contents have been left in %s" +msgstr "ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΎΡΡΠ°Π»ΠΎΡΡ Π² %s" -#: builtin/notes.c:232 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" -#: builtin/notes.c:234 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" -#: builtin/notes.c:256 +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Β«%sΒ» ΠΊΠ°ΠΊ ΡΡΡΠ»ΠΊΡ." + +#: builtin/notes.c:257 +#, c-format +msgid "failed to read object '%s'." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." + +#: builtin/notes.c:261 +#, c-format +msgid "cannot read note data from non-blob object '%s'." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΈΠ· Π½Π΅Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Β«%sΒ»." + +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ Π²Π²Π΅Π΄Π΅Π½Π½Π°Ρ ΡΡΡΠΎΠΊΠ°: Β«%sΒ»." + +#: builtin/notes.c:316 #, c-format -msgid "Failed to read object '%s'." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." +msgid "failed to copy notes from '%s' to '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· Β«%sΒ» Π² Β«%sΒ»" -#: builtin/notes.c:260 +#. TRANSLATORS: the first %s will be replaced by a +#. git notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:345 #, c-format -msgid "Cannot read note data from non-blob object '%s'." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΈΠ· Π½Π΅Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Β«%sΒ»." +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "ΠΎΡΠΊΠ°Π· Π² ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ %s Π·Π°ΠΌΠ΅ΡΠΎΠΊ Π² %s (Π·Π° ΠΏΡΠ΅Π΄Π΅Π»Π°ΠΌΠΈ refs/notes/)" -#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 -#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:946 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠ²" -#: builtin/notes.c:375 builtin/notes.c:662 +#: builtin/notes.c:378 builtin/notes.c:665 #, c-format -msgid "No note found for object %s." -msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½Π° Π·Π°ΠΌΠ΅ΡΠΊΠ° Π΄Π»Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s." +msgid "no note found for object %s." +msgstr "Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π° Π·Π°ΠΌΠ΅ΡΠΊΠ° Π΄Π»Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s." -#: builtin/notes.c:396 builtin/notes.c:559 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "ΡΠ΅ΠΊΡΡΠΎΠ²ΠΎΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π² ΡΠ°ΠΉΠ»Π΅" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈ ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΠ΅ ΠΏΡΡΡΠΎΠΉ Π·Π°ΠΌΠ΅ΡΠΊΠΈ" -#: builtin/notes.c:409 builtin/notes.c:480 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "Π·Π°ΠΌΠ΅Π½ΠΈΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ" -#: builtin/notes.c:434 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ. ΠΠ°ΠΉΠ΄Π΅Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ°Ρ Π·Π°ΠΌΠ΅ΡΠΊΠ° Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Β«-fΒ» Π΄Π»Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ." -#: builtin/notes.c:449 builtin/notes.c:528 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "ΠΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 +#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 #, c-format msgid "Removing note for object %s\n" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s\n" -#: builtin/notes.c:481 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/notes.c:483 +#: builtin/notes.c:486 msgid "load rewriting config for <command> (implies --stdin)" msgstr "Π·Π°Π³ΡΡΠ·ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ Π΄Π»Ρ ΠΊΠΎΠΌΠ°Π½Π΄Ρ <ΠΊΠΎΠΌΠ°Π½Π΄Π°> (Π²ΠΊΠ»ΡΡΠ°Π΅Ρ Π² ΡΠ΅Π±Ρ --stdin)" -#: builtin/notes.c:501 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ°Π»ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠ²" -#: builtin/notes.c:522 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" " existing notes" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ. ΠΠ°ΠΉΠ΄Π΅Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ°Ρ Π·Π°ΠΌΠ΅ΡΠΊΠ° Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Β«-fΒ» Π΄Π»Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ." -#: builtin/notes.c:534 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." -msgstr "ΠΠ΅Ρ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΠ΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ." +msgid "missing notes on source object %s. Cannot copy." +msgstr "Π½Π΅Ρ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s. ΠΠ΅Π»ΡΠ·Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ." -#: builtin/notes.c:586 +#: builtin/notes.c:589 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "ΠΠΏΡΠΈΠΈ -m/-F/-c/-C Π΄Π»Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Ρ Β«editΒ» ΡΡΡΠ°ΡΠ΅Π»ΠΈ.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π²ΠΌΠ΅ΡΡΠΎ Π½ΠΈΡ
Β«git notes add -f -m/-F/-c/-CΒ».\n" -#: builtin/notes.c:768 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ NOTES_MERGE_REF" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«git notes mergeΒ»" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ· NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ· NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ NOTES_MERGE_REF" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ" + +#: builtin/notes.c:755 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ %s" + +#: builtin/notes.c:771 msgid "General options" msgstr "ΠΠ±ΡΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ" -#: builtin/notes.c:770 +#: builtin/notes.c:773 msgid "Merge options" msgstr "ΠΠΏΡΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/notes.c:772 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:774 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "ΠΠΎΠΌΠΌΠΈΡ Π½Π΅ ΡΠ»ΠΈΡΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:776 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ Π½Π΅ ΡΠ»ΠΈΡΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:778 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "ΠΡΠΌΠ΅Π½Π° ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:780 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:857 +#: builtin/notes.c:794 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --commit, --abort ΠΈ -s/--strategy" + +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" +msgstr "Π²Ρ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΡΡΡΠ»ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" + +#: builtin/notes.c:823 +#, c-format +msgid "unknown -s/--strategy: %s" +msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Π΄Π»Ρ -s/--strategy: %s" + +#: builtin/notes.c:860 +#, c-format +msgid "a notes merge into %s is already in-progress at %s" +msgstr "ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Π² %s ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π° %s" + +#: builtin/notes.c:863 +#, c-format +msgid "failed to store link to current notes ref (%s)" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π°Π΄ΡΠ΅Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ ΡΡΡΠ»ΠΊΠΈ Π½Π° Π·Π°ΠΌΠ΅ΡΠΊΡ (%s)" + +#: builtin/notes.c:865 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Π² %s ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π° %s" +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with" +" 'git notes merge --commit', or abort the merge with 'git notes merge " +"--abort'.\n" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ ΡΠ»ΠΈΡΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ. ΠΡΠΏΡΠ°Π²ΡΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π² %s ΠΈ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΡΡΠ΅ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git notes merge --commitΒ», ΠΈΠ»ΠΈ ΠΏΡΠ΅ΡΠ²ΠΈΡΠ΅ ΠΏΡΠΎΡΠ΅ΡΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git notes merge --abortΒ».\n" -#: builtin/notes.c:884 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "Π£ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s Π½Π΅Ρ Π·Π°ΠΌΠ΅ΡΠΊΠΈ\n" -#: builtin/notes.c:896 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "ΠΏΠΎΠΏΡΡΠΊΠ° ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ΅ΠΉ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ" -#: builtin/notes.c:899 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠΌΠ΅Π½Π° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/notes.c:980 +#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 +msgid "do not remove, show only" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΡΡΡ, ΡΠΎΠ»ΡΠΊΠΎ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ" + +#: builtin/notes.c:941 +msgid "report pruned notes" +msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ" + +#: builtin/notes.c:983 msgid "notes-ref" msgstr "ΡΡΡΠ»ΠΊΠ°-Π½Π°-Π·Π°ΠΌΠ΅ΡΠΊΡ" -#: builtin/notes.c:981 +#: builtin/notes.c:984 msgid "use notes from <notes-ref>" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· <ΡΡΡΠ»ΠΊΠ°-Π½Π°-Π·Π°ΠΌΠ΅ΡΠΊΡ>" -#: builtin/notes.c:1016 builtin/remote.c:1628 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" -msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s" +msgid "unknown subcommand: %s" +msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:29 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<ΠΎΠΏΡΠΈΠΈ>β¦] [< <ΡΠΏΠΈΡΠΎΠΊ-ΡΡΡΠ»ΠΎΠΊ> | < <ΡΠΏΠΈΡΠΎΠΊ-ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²>]" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<ΠΎΠΏΡΠΈΠΈ>β¦] <ΠΈΠΌΡ-Π±Π°Π·Ρ> [< <ΡΠΏΠΈΡΠΎΠΊ-ΡΡΡΠ»ΠΎΠΊ> | < <ΡΠΏΠΈΡΠΎΠΊ-ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²>]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 #, c-format msgid "deflate error (%d)" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΡΠΆΠ°ΡΠΈΡ (%d)" -#: builtin/pack-objects.c:763 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π·Π°ΠΏΠΈΡΠΈ Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΊΠ°ΡΡΡ Π±ΡΠ»ΠΈ ΡΠ°Π·Π±ΠΈΡΡ Π½Π° ΡΠ°ΡΡΠΈ ΠΈΠ·-Π·Π° pack.packSizeLimit" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "ΠΠ°ΠΏΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π·Π°ΠΏΠΈΡΠΈ Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π½Π΅ Π±ΡΠ»ΠΈ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Ρ" -#: builtin/pack-objects.c:2177 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "Π‘ΠΆΠ°ΡΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2563 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΡΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° %s" -#: builtin/pack-objects.c:2567 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "ΠΏΠ»ΠΎΡ
Π°Ρ Π²Π΅ΡΡΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Β«%sΒ»" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ Π·Π°ΠΏΠΈΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° --all-progress ΠΏΡΠΈ Π²ΠΊΠ»ΡΡΠ΅Π½Π½ΠΎΠΌ ΠΏΡΠΎΠ³ΡΠ΅ΡΡΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/pack-objects.c:2605 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "Π²Π΅ΡΡΠΈΡ[,ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅]" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π² ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ Π²Π΅ΡΡΠΈΠΈ ΡΠΎΡΠΌΠ°ΡΠ°" -#: builtin/pack-objects.c:2609 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½ΡΠΉ ΡΠ°Π·ΠΌΠ΅Ρ ΠΊΠ°ΠΆΠ΄ΠΎΠ³ΠΎ Π²ΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΡΠΆΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π²Π·ΡΡΡΠ΅ ΠΈΠ· Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΠΎΠ³ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2613 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡ ΠΎΠΊΠ½ΠΎ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΠΎ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2617 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡ ΠΎΠΊΠ½ΠΎ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΠΎ ΠΏΠ°ΠΌΡΡΠΈ" -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½Π°Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½Π°Ρ Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ Π΄Π΅Π»ΡΡ Π² ΡΠ΅Π·ΡΠ»ΡΡΠΈΡΡΡΡΠ΅ΠΌ ΠΏΠ°ΠΊΠ΅ΡΠ΅" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ Π΄Π΅Π»ΡΡΡ" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ OFS_DELTA" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΌΠ½ΠΎΠ³ΠΎΠΏΠΎΡΠΎΡΠ½ΠΎΡΡΡ ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ Π»ΡΡΡΠΈΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ Π΄Π΅Π»ΡΡ" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "Π½Π΅ ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΡΡΡΡΠ΅ Π²ΡΡ
ΠΎΠ΄Π½ΡΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ Π΅ΡΠ΅ Π½Π΅ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Ρ" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ ΠΏΠΎ Π»ΡΠ±ΠΎΠΉ ΠΈΠ· ΡΡΡΠ»ΠΎΠΊ" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°ΡΡΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΆΡΡΠ½Π°Π»Π° ΡΡΡΠ»ΠΎΠΊ" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°Π΅ΡΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΏΠ°ΠΊΠ΅Ρ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΠΌΠ΅ΡΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°ΡΡΡΡ Π½Π° ΡΠΏΠ°ΠΊΠΎΠ²ΡΠ²Π°Π΅ΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "ΡΠΎΡ
ΡΠ°Π½ΡΡΡ ΡΡΡΠ»ΠΊΠΈ Π½Π° Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2650 parse-options.h:142 -msgid "time" -msgstr "Π²ΡΠ΅ΠΌΡ" +#: builtin/pack-objects.c:2847 +msgid "pack loose unreachable objects" +msgstr "ΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than <time>" msgstr "ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½ΠΎΠ²Π΅Π΅, ΡΠ΅ΠΌ <Π²ΡΠ΅ΠΌΡ>" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2852 msgid "create thin packs" msgstr "ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΡΠΎΠ½ΠΊΠΈΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2854 msgid "create packs suitable for shallow fetches" msgstr "ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ, ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΡΡΠΈΠ΅ Π΄Π»Ρ ΡΠ°ΡΡΠΈΡΠ½ΡΡ
ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΉ" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:2856 msgid "ignore packs that have companion .keep file" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ, ΡΡΠ΄ΠΎΠΌ Ρ ΠΊΠΎΡΠΎΡΡΠΌΠΈ Π»Π΅ΠΆΠΈΡ .keep ΡΠ°ΠΉΠ»" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2858 msgid "pack compression level" msgstr "ΡΡΠΎΠ²Π΅Π½Ρ ΡΠΆΠ°ΡΠΈΡ ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2860 msgid "do not hide commits by grafts" msgstr "Π½Π΅ ΡΠΊΡΡΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ ΡΡΠ°ΡΠ΅Π½ΠΈΡΠΌΠΈ" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2862 msgid "use a bitmap index if available to speed up counting objects" msgstr "ΠΏΠΎ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡΠΈ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π² Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡΠ°Ρ
, Π΄Π»Ρ ΡΡΠΊΠΎΡΠ΅Π½ΠΈΡ ΠΏΠΎΠ΄ΡΡΠ΅ΡΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2864 msgid "write a bitmap index together with the pack index" msgstr "Π·Π°ΠΏΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π² Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡΠ°Ρ
Π²ΠΌΠ΅ΡΡΠ΅ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2993 msgid "Counting objects" msgstr "ΠΠΎΠ΄ΡΡΠ΅Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" @@ -8832,15 +9847,11 @@ msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π΄ΡΠ±Π»ΠΈΡΡΡΡΠΈΡ
ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <Π²ΡΠ΅ΠΌΡ>] [--] [<ΠΈΠΌΡ-Π²Π΅ΡΠΊΠΈ>β¦]" -#: builtin/prune.c:105 builtin/worktree.c:125 -msgid "do not remove, show only" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΡΡΡ, ΡΠΎΠ»ΡΠΊΠΎ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ" - -#: builtin/prune.c:106 builtin/worktree.c:126 +#: builtin/prune.c:106 builtin/worktree.c:128 msgid "report pruned objects" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/prune.c:109 builtin/worktree.c:128 +#: builtin/prune.c:109 builtin/worktree.c:130 msgid "expire objects older than <time>" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΡΡΠ°ΡΠ΅Π΅ ΡΠ΅ΠΌ <Π΄Π°ΡΠ°-ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ>" @@ -8848,73 +9859,62 @@ msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΡΡΠ°ΡΠ΅Π΅ ΡΠ΅ΠΌ <Π΄Π°ΡΠ°-ΠΎΠΊΠΎΠ½ΡΠ° msgid "cannot prune in a precious-objects repo" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΠΎΡΠΈΡΡΠΈΡΡ Π½Π΅ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π² precious-objects ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/pull.c:72 +#: builtin/pull.c:51 builtin/pull.c:53 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s: %s" + +#: builtin/pull.c:73 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<ΠΎΠΏΡΠΈΠΈ>] [<ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [<ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ-ΡΡΡΠ»ΠΊΠΈ>β¦]]" -#: builtin/pull.c:120 +#: builtin/pull.c:121 msgid "Options related to merging" msgstr "ΠΠΏΡΠΈΠΈ, ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ ΡΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "incorporate changes by rebasing rather than merging" msgstr "Π·Π°Π±ΡΠ°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ΅ΡΠ΅Π±Π°Π·ΠΈΡΠΎΠ²Π°Π½ΠΈΡ, Π° Π½Π΅ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/pull.c:147 builtin/revert.c:105 +#: builtin/pull.c:148 builtin/revert.c:101 msgid "allow fast-forward" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΡ Π²ΠΏΠ΅ΡΠ΅Π΄" -#: builtin/pull.c:153 -msgid "verify that the named commit has a valid GPG signature" -msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠΌΠ΅Π΅Ρ Π²Π΅ΡΠ½ΡΡ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ GPG" - -#: builtin/pull.c:156 +#: builtin/pull.c:157 msgid "automatically stash/stash pop before and after rebase" msgstr "Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ Π²ΡΠΏΠΎΠ»Π½ΡΡΡ stash/stash pop Π΄ΠΎ ΠΈ ΠΏΠΎΡΠ»Π΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ" -#: builtin/pull.c:172 +#: builtin/pull.c:173 msgid "Options related to fetching" msgstr "ΠΠΏΡΠΈΠΈ, ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/pull.c:194 +#: builtin/pull.c:195 msgid "number of submodules pulled in parallel" msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΠΏΠΎΠ»ΡΡΠ΅Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ" -#: builtin/pull.c:283 +#: builtin/pull.c:284 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ pull.ff: %s" -#: builtin/pull.c:379 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." - -#: builtin/pull.c:385 -msgid "Additionally, your index contains uncommitted changes." -msgstr "Π ΡΠΎΠΌΡ ΠΆΠ΅, Π² Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." - -#: builtin/pull.c:387 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." - -#: builtin/pull.c:463 +#: builtin/pull.c:397 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "ΠΠ΅Ρ ΠΏΡΠ΅ΡΠ΅Π½Π΄Π΅Π½ΡΠΎΠ² Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΡΡΠ΅Π΄ΠΈ ΡΡΡΠ»ΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ Π²Ρ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΠΎ ΠΏΠΎΠ»ΡΡΠΈΠ»ΠΈ." -#: builtin/pull.c:465 +#: builtin/pull.c:399 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "ΠΠ΅Ρ ΠΏΡΠ΅ΡΠ΅Π½Π΄Π΅Π½ΡΠΎΠ² Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ ΡΡΠ΅Π΄ΠΈ ΡΡΡΠ»ΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ Π²Ρ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΠΎ ΠΏΠΎΠ»ΡΡΠΈΠ»ΠΈ." -#: builtin/pull.c:466 +#: builtin/pull.c:400 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "ΠΠ±ΡΡΠ½ΠΎ ΡΡΠΎ ΠΎΠ·Π½Π°ΡΠ°Π΅Ρ, ΡΡΠΎ Π²Ρ ΠΏΠ΅ΡΠ΅Π΄Π°Π»ΠΈ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΡΡΡΠ»ΠΊΠΈ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠ°Π±Π»ΠΎΠ½Π° ΠΈ ΡΡΠΎΡ ΡΠ°Π±Π»ΠΎΠ½ Π½ΠΈ Ρ ΡΠ΅ΠΌ Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π» Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ." -#: builtin/pull.c:469 +#: builtin/pull.c:403 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8922,57 +9922,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "ΠΡ ΠΏΠΎΠΏΡΠΎΡΠΈΠ»ΠΈ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ», Π½ΠΎ Π½Π΅ ΡΠΊΠ°Π·Π°Π»ΠΈ Π²Π΅ΡΠΊΡ. Π’Π°ΠΊ ΠΊΠ°ΠΊ ΡΡΠΎ Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ Π΄Π»Ρ Π²Π°ΡΠ΅ΠΉ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ, Π²Ρ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ Π²Π΅ΡΠΊΡ Π² ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠ΅." -#: builtin/pull.c:474 git-parse-remote.sh:73 +#: builtin/pull.c:408 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΠΎΠΊ." -#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 +#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ Π½Π° ΠΊΠ°ΠΊΡΡ Π²Π΅ΡΠΊΡ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ Ρ ΠΊΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΎΠΉ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:413 builtin/pull.c:428 msgid "See git-pull(1) for details." msgstr "ΠΠ»Ρ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ, ΡΠΌΠΎΡΡΠΈΡΠ΅ git-pull(1)." -#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<Π²Π½Π΅ΡΠ½ΠΈΠΉ-ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ>" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Π²Π΅ΡΠΊΠ°>" -#: builtin/pull.c:489 git-parse-remote.sh:75 +#: builtin/pull.c:423 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Π£ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π½Π΅Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΠΈ." -#: builtin/pull.c:498 git-parse-remote.sh:95 +#: builtin/pull.c:432 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠ΅, Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅:" -#: builtin/pull.c:503 +#: builtin/pull.c:437 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "ΠΠ°ΡΠ° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ, ΡΡΠΎ Π½ΡΠΆΠ½ΠΎ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎ ΡΡΡΠ»ΠΊΠΎΠΉ\nΒ«%sΒ» ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ, Π½ΠΎ ΡΠ°ΠΊΠ°Ρ ΡΡΡΠ»ΠΊΠ° Π½Π΅ Π±ΡΠ»Π° ΠΏΠΎΠ»ΡΡΠ΅Π½Π°." -#: builtin/pull.c:864 +#: builtin/pull.c:754 +msgid "ignoring --verify-signatures for rebase" +msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ --verify-signatures ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ" + +#: builtin/pull.c:801 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π²ΠΌΠ΅ΡΡΠ΅ Ρ --rebase." -#: builtin/pull.c:872 +#: builtin/pull.c:809 msgid "Updating an unborn branch with changes added to the index." msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ Π΅ΡΠ΅ Π½Π΅ Π½Π°ΡΠ°Π²ΡΠ΅ΠΉΡΡ Π²Π΅ΡΠΊΠΈ Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ, Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΠΌΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡ." -#: builtin/pull.c:900 +#: builtin/pull.c:812 +msgid "pull with rebase" +msgstr "ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ" + +#: builtin/pull.c:813 +msgid "please commit or stash them." +msgstr "ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ ΠΈΡ
." + +#: builtin/pull.c:838 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8980,7 +9992,7 @@ msgid "" "commit %s." msgstr "ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΎΠ±Π½ΠΎΠ²ΠΈΠ»ΠΎ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π°ΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ.\nΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²Π°ΡΠ΅Π³ΠΎ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°\nΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s." -#: builtin/pull.c:905 +#: builtin/pull.c:843 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8991,11 +10003,11 @@ msgid "" "to recover." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°ΡΡ Π²ΠΏΠ΅ΡΡΠ΄ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² Π²Π°ΡΠ΅ΠΌ ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅.\nΠΠΎΡΠ»Π΅ ΡΠΎΠ³ΠΎ, ΠΊΠ°ΠΊ Π²Ρ ΡΠ±Π΅Π΄ΠΈΡΠ΅ΡΡ, ΡΡΠΎ Π²Ρ ΡΠΎΡ
ΡΠ°Π½ΠΈΠ»ΠΈ Π²ΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎΠ΅ ΠΈΠ· Π²ΡΠ²ΠΎΠ΄Π°\n$ git diff %s\n, Π·Π°ΠΏΡΡΡΠΈΡΠ΅\n$ git reset --hard\nΠ΄Π»Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ." -#: builtin/pull.c:920 +#: builtin/pull.c:858 msgid "Cannot merge multiple branches into empty head." msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ»ΠΈΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ Π² ΠΏΡΡΡΠΎΠΉ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π΅ΡΠΊΡ." -#: builtin/pull.c:924 +#: builtin/pull.c:862 msgid "Cannot rebase onto multiple branches." msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ Π½Π°Π΄ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΠΌΠΈ Π²Π΅ΡΠΊΠ°ΠΌΠΈ." @@ -9115,12 +10127,12 @@ msgstr "ΠΡΠΏΡΠ°Π²ΠΊΠ° Π² %s\n" msgid "failed to push some refs to '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»ΠΊΠΈ Π² Β«%sΒ»" -#: builtin/push.c:365 +#: builtin/push.c:366 #, c-format msgid "bad repository '%s'" msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ»" -#: builtin/push.c:366 +#: builtin/push.c:367 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote repository using\n" @@ -9132,103 +10144,115 @@ msgid "" " git push <name>\n" msgstr "ΠΠ΅ Π½Π°ΡΡΡΠΎΠ΅Π½Π° ΡΠΎΡΠΊΠ° Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ.\nΠΠΈΠ±ΠΎ ΡΠΊΠ°ΠΆΠΈΡΠ΅ URL Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ, Π»ΠΈΠ±ΠΎ Π½Π°ΡΡΡΠΎΠΉΡΠ΅ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Ρ ΠΏΠΎΠΌΠΎΡΡΡ\n\n git remote add <ΠΈΠΌΡ> <Π°Π΄ΡΠ΅Ρ>\n\nΠ° Π·Π°ΡΠ΅ΠΌ ΠΎΡΠΏΡΠ°Π²ΡΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΈΠΌΠ΅Π½ΠΈ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ\n\n git push <ΠΈΠΌΡ>\n" -#: builtin/push.c:381 +#: builtin/push.c:385 msgid "--all and --tags are incompatible" msgstr "--all ΠΈ --tags Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/push.c:382 +#: builtin/push.c:386 msgid "--all can't be combined with refspecs" msgstr "--all Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π²ΠΌΠ΅ΡΡΠ΅ ΡΠΎ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡΠΌΠΈ ΡΡΡΠ»ΠΎΠΊ" -#: builtin/push.c:387 +#: builtin/push.c:391 msgid "--mirror and --tags are incompatible" msgstr "--mirror ΠΈ --tags Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/push.c:388 +#: builtin/push.c:392 msgid "--mirror can't be combined with refspecs" msgstr "--mirror Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π²ΠΌΠ΅ΡΡΠ΅ ΡΠΎ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡΠΌΠΈ ΡΡΡΠ»ΠΎΠΊ" -#: builtin/push.c:393 +#: builtin/push.c:397 msgid "--all and --mirror are incompatible" msgstr "--all ΠΈ --mirror Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/push.c:505 +#: builtin/push.c:515 msgid "repository" msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/push.c:506 builtin/send-pack.c:161 +#: builtin/push.c:516 builtin/send-pack.c:161 msgid "push all refs" msgstr "ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ Π²ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ" -#: builtin/push.c:507 builtin/send-pack.c:163 +#: builtin/push.c:517 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ Π·Π΅ΡΠΊΠ°Π»ΠΎ Π²ΡΠ΅Ρ
ΡΡΡΠ»ΠΎΠΊ" -#: builtin/push.c:509 +#: builtin/push.c:519 msgid "delete refs" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΠΈ" -#: builtin/push.c:510 +#: builtin/push.c:520 msgid "push tags (can't be used with --all or --mirror)" msgstr "ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ ΠΌΠ΅ΡΠΊΠΈ (Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π²ΠΌΠ΅ΡΡΠ΅ Ρ --all ΠΈΠ»ΠΈ --mirror)" -#: builtin/push.c:513 builtin/send-pack.c:164 +#: builtin/push.c:523 builtin/send-pack.c:164 msgid "force updates" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅" -#: builtin/push.c:515 builtin/send-pack.c:175 +#: builtin/push.c:525 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "ΠΈΠΌΡ-ΡΡΡΠ»ΠΊΠΈ>:<ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ" -#: builtin/push.c:516 builtin/send-pack.c:176 +#: builtin/push.c:526 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "ΡΡΠ΅Π±ΠΎΠ²Π°ΡΡ, ΡΡΠΎΠ±Ρ ΡΡΠ°ΡΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ Π±ΡΠ»ΠΎ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΡΠΌ" -#: builtin/push.c:519 +#: builtin/push.c:529 msgid "control recursive pushing of submodules" msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎΠΉ ΠΎΡΠΏΡΠ°Π²ΠΊΠΎΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ" -#: builtin/push.c:521 builtin/send-pack.c:169 +#: builtin/push.c:531 builtin/send-pack.c:169 msgid "use thin pack" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ½ΠΊΠΈΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ" -#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 +#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "ΠΏΡΡΡ ΠΊ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ΅ ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ Π½Π° ΡΠ΅ΡΠ²Π΅ΡΠ΅" -#: builtin/push.c:524 +#: builtin/push.c:534 msgid "set upstream for git pull/status" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΡΡ Π²Π΅ΡΠΊΡ Π΄Π»Ρ git pull/status" -#: builtin/push.c:527 +#: builtin/push.c:537 msgid "prune locally removed refs" msgstr "ΠΏΠΎΡΠΈΡΡΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎ ΡΠ΄Π°Π»Π΅Π½Π½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ" -#: builtin/push.c:529 +#: builtin/push.c:539 msgid "bypass pre-push hook" -msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ ΠΏΠ΅ΡΠ΅Π΄-ΠΎΡΠΏΡΠ°Π²ΠΊΠΎΠΉ" +msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ pre-push" -#: builtin/push.c:530 +#: builtin/push.c:540 msgid "push missing but relevant tags" msgstr "ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ ΠΏΡΠΎΠΏΡΡΠ΅Π½Π½ΡΠ΅, Π½ΠΎ Π½ΡΠΆΠ½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ" -#: builtin/push.c:533 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ ΠΎΡΠΏΡΠ°Π²ΠΊΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ GPG" -#: builtin/push.c:535 builtin/send-pack.c:170 +#: builtin/push.c:545 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "Π·Π°ΠΏΡΠΎΡΠΈΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ Π°ΡΠΎΠΌΠ°ΡΠ½ΠΎΠΉ ΡΡΠ°Π½Π·Π°ΠΊΡΠΈΠΈ Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΉ ΡΡΠΎΡΠΎΠ½Π΅" -#: builtin/push.c:549 +#: builtin/push.c:546 +msgid "server-specific" +msgstr "Π·Π°Π²ΠΈΡΠΈΡ-ΠΎΡ-ΡΠ΅ΡΠ²Π΅ΡΠ°" + +#: builtin/push.c:546 +msgid "option to transmit" +msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π²Π°Π΅ΠΌΡΠ΅ ΠΎΠΏΡΠΈΠΈ" + +#: builtin/push.c:560 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete Π½Π΅ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎ Ρ --all, --mirror ΠΈ --tags" -#: builtin/push.c:551 +#: builtin/push.c:562 msgid "--delete doesn't make sense without any refs" msgstr "--delete Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π° Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΡΡΡΠ»ΠΎΠΊ" +#: builtin/push.c:579 +msgid "push options must not have new line characters" +msgstr "ΠΎΠΏΡΠΈΠΈ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΎΠ΄Π΅ΡΠΆΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»Ρ ΠΏΠ΅ΡΠ΅Π²ΠΎΠ΄Π° ΡΡΡΠΎΠΊ" + #: builtin/read-tree.c:37 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)" @@ -9300,15 +10324,44 @@ msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΡΠΈΠ»ΡΡΡΠ° ΡΠ°ΡΡΠΈΡΠ½Π msgid "debug unpack-trees" msgstr "ΠΎΡΠ»Π°Π΄ΠΊΠ° unpack-trees" -#: builtin/receive-pack.c:25 +#: builtin/receive-pack.c:26 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <ΠΊΠ°ΡΠ°Π»ΠΎΠ³-git>" -#: builtin/receive-pack.c:1719 +#: builtin/receive-pack.c:793 +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set 'receive.denyCurrentBranch' configuration variable to\n" +"'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ, ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ Π² ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ Ρ ΡΠ°Π±ΠΎΡΠ΅ΠΉ\nΠΊΠΎΠΏΠΈΠ΅ΠΉ (Π½Π΅ Π³ΠΎΠ»ΠΎΠΌ) Π·Π°ΠΏΡΠ΅ΡΠ΅Π½ΠΎ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΡΡΠΎ ΡΠ΄Π΅Π»Π°Π΅Ρ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΠΈΠ½Π΄Π΅ΠΊΡΠ°\nΠΈ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΏΡΠΎΡΠΈΠ²ΠΎΡΠ΅ΡΠΈΠ²ΡΠΌ, ΠΈ Π²Π°ΠΌ ΠΏΡΠΈΠΉΠ΄Π΅ΡΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ\nΒ«git reset --hardΒ», ΡΡΠΎΠ±Ρ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΡΠ½ΠΎΠ²Π°\nΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΎΠ²Π°Π»ΠΎ HEAD.\n\nΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ Β«receive.denyCurrentBranchΒ»\nΠ² Β«ignoreΒ» ΠΈΠ»ΠΈ Β«warnΒ» Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ, ΡΡΠΎΠ±Ρ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ\nΠΎΡΠΏΡΠ°Π²ΠΊΡ Π² Π΅Π³ΠΎ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ; Π½ΠΎ ΡΡΠΎ Π½Π΅ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡΠ΅ΡΡΡ, Π΅ΡΠ»ΠΈ ΡΠΎΠ»ΡΠΊΠΎ\nΠ²Ρ Π½Π΅ Π½Π°ΠΌΠ΅ΡΠ΅Π½Ρ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π΅Π³ΠΎ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΡΠΏΠΎΡΠΎΠ±ΠΎΠΌ ΠΏΠΎΠ΄ΠΎΠ±Π½ΡΠΌ\nΠ²ΡΡΠ΅ΠΎΠΏΠΈΡΠ°Π½Π½ΠΎΠΌΡ.\n\nΠ§ΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈ Π²ΡΠ΅ ΡΠ°Π²Π½ΠΎ ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΏΠΎΠ²Π΅Π΄Π΅Π½ΠΈΠ΅\nΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ, ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ Β«receive.denyCurrentBranchΒ»\nΠ² Β«refuseΒ»." + +#: builtin/receive-pack.c:813 +msgid "" +"By default, deleting the current branch is denied, because the next\n" +"'git clone' won't result in any file checked out, causing confusion.\n" +"\n" +"You can set 'receive.denyDeleteCurrent' configuration variable to\n" +"'warn' or 'ignore' in the remote repository to allow deleting the\n" +"current branch, with or without a warning message.\n" +"\n" +"To squelch this message, you can set it to 'refuse'." +msgstr "ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ, ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π·Π°ΠΏΡΠ΅ΡΠ΅Π½ΠΎ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΏΠΎΡΠ»Π΅Π΄ΡΡΡΠΈΠΉ\nΒ«git cloneΒ» Π½Π΅ ΡΠΌΠΎΠΆΠ΅Ρ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π½ΠΈΠΊΠ°ΠΊΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ², ΡΡΠΎ ΠΏΡΠΈΠ²Π΅Π΄Π΅Ρ ΠΊ ΠΏΡΡΠ°Π½ΠΈΡΠ΅.\n\nΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ Β«receive.denyDeleteCurrentΒ»\nΠ² Β«warnΒ» ΠΈΠ»ΠΈ Β«ignoreΒ», Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ, ΡΡΠΎΠ±Ρ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ\nΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Ρ ΠΈΠ»ΠΈ Π±Π΅Π· ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π°ΡΡΠ΅Π³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ.\n\nΠ§ΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅, Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ\nΠ² Β«refuseΒ»." + +#: builtin/receive-pack.c:1883 msgid "quiet" msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ" -#: builtin/receive-pack.c:1733 +#: builtin/receive-pack.c:1897 msgid "You must specify a directory." msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³." @@ -9453,12 +10506,12 @@ msgstr "ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΌΠ°ΡΡΠ΅Ρ Π²Π΅ΡΠΊΠΈ Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π° Ρ msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π΅ΡΠΎΠΊ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ» ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ Π·Π΅ΡΠΊΠ°Π»ΡΠ½ΠΎΠΌ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΈ" -#: builtin/remote.c:190 builtin/remote.c:633 +#: builtin/remote.c:190 builtin/remote.c:629 #, c-format msgid "remote %s already exists." msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ %s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/remote.c:194 builtin/remote.c:637 +#: builtin/remote.c:194 builtin/remote.c:633 #, c-format msgid "'%s' is not a valid remote name" msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΌ ΠΈΠΌΠ΅Π½Π΅ΠΌ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." @@ -9481,17 +10534,17 @@ msgstr "(ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠ°Ρ)" msgid "(delete)" msgstr "(ΡΠ΄Π°Π»Π΅Π½Π½Π°Ρ)" -#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 #, c-format msgid "No such remote: %s" msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ: %s" -#: builtin/remote.c:643 +#: builtin/remote.c:639 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ Ρ Β«%sΒ» Π½Π° Β«%sΒ»" -#: builtin/remote.c:663 +#: builtin/remote.c:659 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9499,17 +10552,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "ΠΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡ Π½Π΅ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΡ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΡΡΡΠ»ΠΊΠΈ Π΄Π»Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ\n\t%s\n\tΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π΅ΡΠ»ΠΈ ΡΡΠ΅Π±ΡΠ΅ΡΡΡ, ΠΎΠ±Π½ΠΎΠ²ΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ Π²ΡΡΡΠ½ΡΡ." -#: builtin/remote.c:699 +#: builtin/remote.c:695 #, c-format msgid "deleting '%s' failed" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Β«%sΒ»" -#: builtin/remote.c:733 +#: builtin/remote.c:729 #, c-format msgid "creating '%s' failed" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Β«%sΒ»" -#: builtin/remote.c:796 +#: builtin/remote.c:792 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9521,145 +10574,155 @@ msgstr[1] "ΠΡΠΈΠΌΠ΅ΡΠ°Π½ΠΈΠ΅: ΠΠ΅ΠΊΠΎΡΠΎΡΡΠ΅ Π²Π΅ΡΠΊΠΈ Π²Π½Π΅ ΠΈΠ΅ΡΠ°Ρ msgstr[2] "ΠΡΠΈΠΌΠ΅ΡΠ°Π½ΠΈΠ΅: ΠΠ΅ΠΊΠΎΡΠΎΡΡΠ΅ Π²Π΅ΡΠΊΠΈ Π²Π½Π΅ ΠΈΠ΅ΡΠ°ΡΡ
ΠΈΠΈ refs/remotes/ Π½Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ;\nΡΡΠΎΠ±Ρ ΡΠ΄Π°Π»ΠΈΡΡ ΠΈΡ
, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅:" msgstr[3] "ΠΡΠΈΠΌΠ΅ΡΠ°Π½ΠΈΠ΅: ΠΠ΅ΠΊΠΎΡΠΎΡΡΠ΅ Π²Π΅ΡΠΊΠΈ Π²Π½Π΅ ΠΈΠ΅ΡΠ°ΡΡ
ΠΈΠΈ refs/remotes/ Π½Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ;\nΡΡΠΎΠ±Ρ ΡΠ΄Π°Π»ΠΈΡΡ ΠΈΡ
, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅:" -#: builtin/remote.c:810 +#: builtin/remote.c:806 #, c-format msgid "Could not remove config section '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ΅ΠΊΡΠΈΡ ΡΠ°ΠΉΠ»Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ Β«%sΒ»" -#: builtin/remote.c:911 +#: builtin/remote.c:907 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " Π½ΠΎΠ²Π°Ρ (ΡΠ»Π΅Π΄ΡΡΡΠ΅Π΅ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡ Π΅Π΅ Π² remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:910 msgid " tracked" msgstr " ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΡΡΡ" -#: builtin/remote.c:916 +#: builtin/remote.c:912 msgid " stale (use 'git remote prune' to remove)" msgstr " Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½Π° (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git remote pruneΒ», ΡΡΠΎΠ±Ρ ΡΠ΄Π°Π»ΠΈΡΡ)" -#: builtin/remote.c:918 +#: builtin/remote.c:914 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:955 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ branch.%s.merge; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ Π±ΠΎΠ»Π΅Π΅ ΡΠ΅ΠΌ Π½Π°Π΄ 1 Π²Π΅ΡΠΊΠΎΠΉ" -#: builtin/remote.c:967 +#: builtin/remote.c:963 #, c-format msgid "rebases interactively onto remote %s" msgstr "ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ°Π΅ΡΡΡ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ Π½Π°Π΄ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ %s" -#: builtin/remote.c:971 +#: builtin/remote.c:964 +#, c-format +msgid "rebases onto remote %s" +msgstr "ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ°Π΅ΡΡΡ Π½Π°Π΄ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ %s" + +#: builtin/remote.c:967 #, c-format msgid " merges with remote %s" msgstr " Π±ΡΠ΄Π΅Ρ ΡΠ»ΠΈΡΠ° Ρ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ %s" -#: builtin/remote.c:972 -msgid " and with remote" -msgstr " ΠΈ Ρ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ" - -#: builtin/remote.c:974 +#: builtin/remote.c:970 #, c-format msgid "merges with remote %s" msgstr "Π±ΡΠ΄Π΅Ρ ΡΠ»ΠΈΡΠ° Ρ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ %s" -#: builtin/remote.c:975 -msgid " and with remote" -msgstr " ΠΈ Ρ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ" +#: builtin/remote.c:973 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s ΠΈ Ρ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ %s\n" -#: builtin/remote.c:1021 +#: builtin/remote.c:1016 msgid "create" msgstr "ΡΠΎΠ·Π΄Π°Π½Π°" -#: builtin/remote.c:1024 +#: builtin/remote.c:1019 msgid "delete" msgstr "ΡΠ΄Π°Π»Π΅Π½Π°" -#: builtin/remote.c:1028 +#: builtin/remote.c:1023 msgid "up to date" msgstr "ΡΠΆΠ΅ Π°ΠΊΡΡΠ°Π»ΡΠ½Π°" -#: builtin/remote.c:1031 +#: builtin/remote.c:1026 msgid "fast-forwardable" msgstr "Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π° ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄" -#: builtin/remote.c:1034 +#: builtin/remote.c:1029 msgid "local out of date" msgstr "Π»ΠΎΠΊΠ°Π»ΡΠ½Π°Ρ Π²Π΅ΡΠΊΠ° ΡΡΡΠ°ΡΠ΅Π»Π°" -#: builtin/remote.c:1041 +#: builtin/remote.c:1036 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s Π±ΡΠ΄Π΅Ρ ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΎΡΠΏΡΠ°Π²Π»Π΅Π½Π° Π² %-*s (%s)" -#: builtin/remote.c:1044 +#: builtin/remote.c:1039 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s Π±ΡΠ΄Π΅Ρ ΠΎΡΠΏΡΠ°Π²Π»Π΅Π½Π° Π² %-*s (%s)" -#: builtin/remote.c:1048 +#: builtin/remote.c:1043 #, c-format msgid " %-*s forces to %s" msgstr " %-*s Π±ΡΠ΄Π΅Ρ ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΎΡΠΏΡΠ°Π²Π»Π΅Π½Π° Π² %s" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s Π±ΡΠ΄Π΅Ρ ΠΎΡΠΏΡΠ°Π²Π»Π΅Π½Π° Π² %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1114 msgid "do not query remotes" msgstr "Π½Π΅ ΠΎΠΏΡΠ°ΡΠΈΠ²Π°ΡΡ Π²Π½Π΅ΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/remote.c:1146 +#: builtin/remote.c:1141 #, c-format msgid "* remote %s" msgstr "* Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ %s" -#: builtin/remote.c:1147 +#: builtin/remote.c:1142 #, c-format msgid " Fetch URL: %s" msgstr " URL Π΄Π»Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ: %s" -#: builtin/remote.c:1148 builtin/remote.c:1301 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 msgid "(no URL)" msgstr "(Π½Π΅Ρ URL)" #. TRANSLATORS: the colon ':' should align with #. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1159 builtin/remote.c:1161 +#: builtin/remote.c:1154 builtin/remote.c:1156 #, c-format msgid " Push URL: %s" -msgstr " URL Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ: %s" +msgstr " URL Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ: %s" -#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 +#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " HEAD branch: %s" msgstr " HEAD Π²Π΅ΡΠΊΠ°: %s" -#: builtin/remote.c:1169 +#: builtin/remote.c:1158 +msgid "(not queried)" +msgstr "(Π½Π΅ Π·Π°ΠΏΡΠ°ΡΠΈΠ²Π°Π»ΡΡ)" + +#: builtin/remote.c:1160 +msgid "(unknown)" +msgstr "(Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎ)" + +#: builtin/remote.c:1164 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD Π²Π΅ΡΠΊΠ° (HEAD Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π½Π΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΡΠΉ, ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ·):\n" -#: builtin/remote.c:1181 +#: builtin/remote.c:1176 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" -msgstr[0] " ΠΠ½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΠ°:%s" -msgstr[1] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" -msgstr[2] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" -msgstr[3] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" +msgstr[0] " ΠΠ½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΠ°:%s" +msgstr[1] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" +msgstr[2] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" +msgstr[3] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" -#: builtin/remote.c:1184 builtin/remote.c:1211 +#: builtin/remote.c:1179 builtin/remote.c:1205 msgid " (status not queried)" -msgstr " (ΡΡΠ°ΡΡΡ Π½Π΅ Π·Π°ΠΏΡΠΎΡΠ΅Π½)" +msgstr " (ΡΡΠ°ΡΡΡ Π½Π΅ Π·Π°ΠΏΡΠ°ΡΠΈΠ²Π°Π»ΡΡ)" -#: builtin/remote.c:1193 +#: builtin/remote.c:1188 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " ΠΠΎΠΊΠ°Π»ΡΠ½Π°Ρ Π²Π΅ΡΠΊΠ°, Π½Π°ΡΡΡΠΎΠ΅Π½Π½Π°Ρ Π΄Π»Ρ Β«git pullΒ»:" @@ -9667,11 +10730,11 @@ msgstr[1] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git msgstr[2] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pullΒ»:" msgstr[3] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pullΒ»:" -#: builtin/remote.c:1201 +#: builtin/remote.c:1196 msgid " Local refs will be mirrored by 'git push'" msgstr " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π·Π΅ΡΠΊΠ°Π»ΠΈΡΡΠ΅ΠΌΡΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git pushΒ»" -#: builtin/remote.c:1208 +#: builtin/remote.c:1202 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -9680,207 +10743,220 @@ msgstr[1] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«gi msgstr[2] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pushΒ»%s:" msgstr[3] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pushΒ»%s:" -#: builtin/remote.c:1229 +#: builtin/remote.c:1223 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ refs/remotes/<ΠΈΠΌΡ>/HEAD Π² Π·Π°Π²ΠΈΡΠΈΠΌΠΎΡΡΠΈ ΠΎΡ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/remote.c:1231 +#: builtin/remote.c:1225 msgid "delete refs/remotes/<name>/HEAD" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ refs/remotes/<ΠΈΠΌΡ>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1240 msgid "Cannot determine remote HEAD" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ HEAD" -#: builtin/remote.c:1248 +#: builtin/remote.c:1242 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "ΠΠ΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π½Π΅ΡΠ½ΠΈΡ
HEAD Π²Π΅ΡΠΎΠΊ. Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠ²Π½ΠΎ ΠΎΠ΄Π½Ρ ΠΈΠ· Π½ΠΈΡ
:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1252 #, c-format msgid "Could not delete %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1260 #, c-format msgid "Not a valid ref: %s" -msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ°: %s" +msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΡΡΠ»ΠΊΠ°: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1262 #, c-format msgid "Could not setup %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΡΡΡΠΎΠΈΡΡ %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1280 #, c-format msgid " %s will become dangling!" msgstr " %s Π±ΡΠ΄Π΅Ρ Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1281 #, c-format msgid " %s has become dangling!" msgstr " %s ΡΡΠ°Π»Π° Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1291 #, c-format msgid "Pruning %s" -msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ %s" +msgstr "ΠΡΠΈΡΡΠΊΠ° %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1292 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1308 #, c-format msgid " * [would prune] %s" msgstr " * [Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½Π°] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1311 #, c-format msgid " * [pruned] %s" msgstr " * [ΡΠ΄Π°Π»Π΅Π½Π°] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1356 msgid "prune remotes after fetching" msgstr "ΠΏΠΎΡΠΈΡΡΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΏΠΎΡΠ»Π΅ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 #, c-format msgid "No such remote '%s'" msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ»" -#: builtin/remote.c:1441 +#: builtin/remote.c:1435 msgid "add branch" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/remote.c:1448 +#: builtin/remote.c:1442 msgid "no remote specified" msgstr "Π½Π΅ ΡΠΊΠ°Π·Π°Π½ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/remote.c:1465 +#: builtin/remote.c:1459 msgid "query push URLs rather than fetch URLs" msgstr "Π·Π°ΠΏΡΠΎΡΠΈΡΡ URL ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ, Π²ΠΌΠ΅ΡΡΠΎ URL ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ" -#: builtin/remote.c:1467 +#: builtin/remote.c:1461 msgid "return all URLs" msgstr "Π²Π΅ΡΠ½ΡΡΡ Π²ΡΠ΅ URL" -#: builtin/remote.c:1495 +#: builtin/remote.c:1489 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL Π½Π΅ Π½Π°ΡΡΡΠΎΠ΅Π½Ρ Π΄Π»Ρ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ»" -#: builtin/remote.c:1521 +#: builtin/remote.c:1515 msgid "manipulate push URLs" msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ URL ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: builtin/remote.c:1523 +#: builtin/remote.c:1517 msgid "add URL" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1519 msgid "delete URLs" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ URL" -#: builtin/remote.c:1532 +#: builtin/remote.c:1526 msgid "--add --delete doesn't make sense" msgstr "--add Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --delete" -#: builtin/remote.c:1573 +#: builtin/remote.c:1567 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ°Π±Π»ΠΎΠ½ ΡΡΠ°ΡΠΎΠ³ΠΎ URL: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1575 #, c-format msgid "No such URL found: %s" msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ URL: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1577 msgid "Will not delete all non-push URLs" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ URL Π½Π΅-ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: builtin/remote.c:1597 +#: builtin/remote.c:1591 msgid "be verbose; must be placed before a subcommand" msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅; Π΄ΠΎΠ»ΠΆΠ½ΠΎ ΡΡΠΎΡΡΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ" +#: builtin/remote.c:1622 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s" + #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<ΠΎΠΏΡΠΈΠΈ>]" -#: builtin/repack.c:159 +#: builtin/repack.c:160 msgid "pack everything in a single pack" msgstr "ΡΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ Π²ΡΡ Π² ΠΎΠ΄ΠΈΠ½ ΠΏΠ°ΠΊΠ΅Ρ" -#: builtin/repack.c:161 +#: builtin/repack.c:162 msgid "same as -a, and turn unreachable objects loose" msgstr "ΡΠΎΠΆΠ΅, ΡΡΠΎ ΠΈ -a, Π½ΠΎ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΎΡΠ±ΡΠΎΡΠΈΡΡ Π½Π΅Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/repack.c:164 +#: builtin/repack.c:165 msgid "remove redundant packs, and run git-prune-packed" msgstr "ΡΠ΄Π°Π»ΠΈΡΠ΅ Π»ΠΈΡΠ½ΠΈΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ ΠΈ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ git-prune-packed" -#: builtin/repack.c:166 +#: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΠΎΠΏΡΠΈΡ --no-reuse-delta Π² git-pack-objects" -#: builtin/repack.c:168 +#: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΠΎΠΏΡΠΈΡ --no-reuse-object Π² git-pack-objects" -#: builtin/repack.c:170 +#: builtin/repack.c:171 msgid "do not run git-update-server-info" msgstr "Π½Π΅ Π·Π°ΠΏΡΡΠΊΠ°ΡΡ git-update-server-info" -#: builtin/repack.c:173 +#: builtin/repack.c:174 msgid "pass --local to git-pack-objects" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΠΎΠΏΡΠΈΡ --local Π² git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:176 msgid "write bitmap index" msgstr "Π·Π°ΠΏΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π² Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡΠ°Ρ
" -#: builtin/repack.c:176 +#: builtin/repack.c:177 msgid "approxidate" msgstr "ΠΏΡΠΈΠΌΠ΅ΡΠ½Π°Ρ-Π΄Π°ΡΠ°" -#: builtin/repack.c:177 +#: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" msgstr "Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ -A, Π½Π΅ ΠΎΡΠ±ΡΠ°ΡΡΠ²Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΡΡΠ°ΡΠ΅Π΅, ΡΠ΅ΠΌ ΡΠΊΠ°Π·Π°Π½ΠΎ" -#: builtin/repack.c:179 +#: builtin/repack.c:180 +msgid "with -a, repack unreachable objects" +msgstr "Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠΌ -a, ΠΏΠ΅ΡΠ΅ΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" + +#: builtin/repack.c:182 msgid "size of the window used for delta compression" msgstr "ΡΠ°Π·ΠΌΠ΅Ρ ΠΎΠΊΠ½Π°, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΡΠΉ Π΄Π»Ρ ΠΊΠΎΠΌΠΏΡΠ΅ΡΡΠΈΠΈ Π΄Π΅Π»ΡΡ" -#: builtin/repack.c:180 builtin/repack.c:184 +#: builtin/repack.c:183 builtin/repack.c:187 msgid "bytes" msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ-Π±Π°ΠΉΡ" -#: builtin/repack.c:181 +#: builtin/repack.c:184 msgid "same as the above, but limit memory size instead of entries count" msgstr "ΡΠΎΠΆΠ΅, ΡΡΠΎ ΠΈ Π²ΡΡΠ΅, Π½ΠΎ ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡ ΡΠ°Π·ΠΌΠ΅Ρ ΠΏΠ°ΠΌΡΡΠΈ, Π° Π½Π΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ Π·Π°ΠΏΠΈΡΠ΅ΠΉ" -#: builtin/repack.c:183 +#: builtin/repack.c:186 msgid "limits the maximum delta depth" msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½ΠΈΠ΅ Π½Π° ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½ΡΡ Π³Π»ΡΠ±ΠΈΠ½Ρ Π΄Π΅Π»ΡΡ" -#: builtin/repack.c:185 +#: builtin/repack.c:188 msgid "maximum size of each packfile" msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½ΡΠΉ ΡΠ°Π·ΠΌΠ΅Ρ ΠΊΠ°ΠΆΠ΄ΠΎΠ³ΠΎ ΠΈΠ· ΡΠ°ΠΉΠ»ΠΎΠ² ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/repack.c:187 +#: builtin/repack.c:190 msgid "repack objects in packs marked with .keep" msgstr "ΠΏΠ΅ΡΠ΅ΡΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π² ΠΏΠ°ΠΊΠ΅ΡΡ, ΠΏΠΎΠΌΠ΅ΡΠ΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠΌ .keep" -#: builtin/repack.c:197 +#: builtin/repack.c:200 msgid "cannot delete packs in a precious-objects repo" msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠ΄Π°Π»ΡΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ Π² precious-objects ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/repack.c:381 +#: builtin/repack.c:204 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable ΠΈ -A Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" + +#: builtin/repack.c:391 builtin/worktree.c:115 #, c-format -msgid "removing '%s' failed" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Β«%sΒ»" +msgid "failed to remove '%s'" +msgstr "ΡΠ±ΠΎΠΉ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Β«%sΒ»" #: builtin/replace.c:19 msgid "git replace [-f] <object> <replacement>" @@ -9980,8 +11056,8 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<ΠΊΠΎΠΌΠΌΠΈΡ>]" #: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°> [--] <ΠΏΡΡΠΈ>β¦" +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ-Π΄Π΅ΡΠ΅Π²Π°>] [--] <ΠΏΡΡΠΈ>β¦" #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" @@ -10099,27 +11175,27 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ±ΡΠΎΡΠΈΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π° ΡΠ΅Π΄ msgid "Could not write new index file." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°." -#: builtin/rev-list.c:350 +#: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-list Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΎΡΠΎΠ±ΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/rev-parse.c:358 +#: builtin/rev-parse.c:386 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<ΠΎΠΏΡΠΈΠΈ>] -- [<Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡ>β¦]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:391 msgid "keep the `--` passed as an arg" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π²Π°ΡΡ Π΄Π°Π»Π΅Π΅ Β«--Β» ΠΊΠ°ΠΊ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:393 msgid "stop parsing after the first non-option argument" msgstr "ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΡΠ°Π·Π±ΠΎΡ ΠΏΠΎΡΠ»Π΅ ΠΏΠ΅ΡΠ²ΠΎΠ³ΠΎ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠ° Π½Π΅ ΡΠ²Π»ΡΡΡΠ΅Π³ΠΎΡΡ ΠΎΠΏΡΠΈΠ΅ΠΉ" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:396 msgid "output in stuck long form" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡ Π² Π΄Π»ΠΈΠ½Π½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅" -#: builtin/rev-parse.c:499 +#: builtin/rev-parse.c:527 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -10151,15 +11227,15 @@ msgstr "%s: %s Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ #: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" -msgstr "ΠΊΠΎΠ½Π΅Ρ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΠΈ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ ΠΈΠ»ΠΈ Π²ΠΎΠ·Π²ΡΠ°ΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" +msgstr "ΠΊΠΎΠ½Π΅Ρ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ»ΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" #: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" -msgstr "ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΡ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ ΠΈΠ»ΠΈ Π²ΠΎΠ·Π²ΡΠ°ΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" +msgstr "ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ»ΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" #: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" -msgstr "ΠΎΡΠΌΠ΅Π½Π° ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΠΈ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ ΠΈΠ»ΠΈ Π²ΠΎΠ·Π²ΡΠ°ΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" +msgstr "ΠΎΡΠΌΠ΅Π½Π° ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ»ΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" #: builtin/revert.c:83 msgid "don't automatically commit" @@ -10185,33 +11261,29 @@ msgstr "ΠΎΠΏΡΠΈΡ" msgid "option for merge strategy" msgstr "ΠΎΠΏΡΠΈΡ Π΄Π»Ρ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/revert.c:104 +#: builtin/revert.c:100 msgid "append commit name" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠΌΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/revert.c:106 +#: builtin/revert.c:102 msgid "preserve initially empty commits" msgstr "ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΠΎ ΠΏΡΡΡΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ" -#: builtin/revert.c:107 +#: builtin/revert.c:103 msgid "allow commits with empty messages" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ Ρ ΠΏΡΡΡΡΠΌΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡΠΌΠΈ" -#: builtin/revert.c:108 +#: builtin/revert.c:104 msgid "keep redundant, empty commits" msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΈΠ·Π±ΡΡΠΎΡΠ½ΡΠ΅, ΠΏΡΡΡΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ" -#: builtin/revert.c:112 -msgid "program error" -msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ΅" - -#: builtin/revert.c:197 +#: builtin/revert.c:192 msgid "revert failed" -msgstr "ΡΠ±ΠΎΠΉ Π²ΠΎΠ·Π²ΡΠ°ΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" +msgstr "ΡΠ±ΠΎΠΉ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/revert.c:212 +#: builtin/revert.c:205 msgid "cherry-pick failed" -msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΎΡΠ±ΠΎΡΠ΅ Π»ΡΡΡΠ΅Π³ΠΎ" +msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°" #: builtin/rm.c:17 msgid "git rm [<options>] [--] <file>..." @@ -10363,70 +11435,131 @@ msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-ord msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<Π±Π°Π·Π°>]] [--list] [<ΡΡΡΠ»ΠΊΠ°>]" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:375 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΊΠΈ" +msgstr[1] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΎΠΊ" +msgstr[2] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΎΠΊ" +msgstr[3] "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s; Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΡΡΠ»ΠΊΠΈ" + +#: builtin/show-branch.c:541 +#, c-format +msgid "no matching refs with %s" +msgstr "Π½Π΅Ρ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΡ
Π·Π°ΠΏΠΈΡΠ΅ΠΉ Ρ %s" + +#: builtin/show-branch.c:639 msgid "show remote-tracking and local branches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
Π²Π΅ΡΠΎΠΊ" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:641 msgid "show remote-tracking branches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
Π²Π΅ΡΠΎΠΊ" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:643 msgid "color '*!+-' corresponding to the branch" msgstr "ΠΎΠΊΡΠ°ΡΠΈΠ²Π°ΡΡ Β«*!+-Β» Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ Π²Π΅ΡΠΊΠΎΠΉ" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show <n> more commits after the common ancestor" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² ΠΏΠΎΡΠ»Π΅ ΠΎΠ±ΡΠ΅Π³ΠΎ ΠΏΡΠ΅Π΄ΠΊΠ°" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "synonym to more=-1" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ more=-1" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "suppress naming strings" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "include the current branch" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ Π² Π²ΡΠ²ΠΎΠ΄ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "name commits with their object names" msgstr "ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ ΠΈΡ
ΠΈΠΌΠ΅Π½Π°ΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "show possible merge bases" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΡΠ΅ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show refs unreachable from any other ref" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΡΠ»ΠΊΠΈ, Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΈΠ· Π»ΡΠ±ΡΡ
Π΄ΡΡΠ³ΠΈΡ
ΡΡΡΠ»ΠΎΠΊ" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "show commits in topological order" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΊΠΎΠΌΠΌΠΈΡΡ Π² ΡΠΎΠΏΠΎΠ»ΠΎΠ³ΠΈΡΠ΅ΡΠΊΠΎΠΌ ΠΏΠΎΡΡΠ΄ΠΊΠ΅" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show only commits not on the first branch" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΎΠ»ΡΠΊΠΎ ΠΊΠΎΠΌΠΌΠΈΡΡ, ΠΎΡΡΡΡΡΡΠ²ΡΡΡΠΈΠ΅ Π² ΠΏΠ΅ΡΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠ΅" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show merges reachable from only one tip" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΠ΅ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠ· ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΡ
ΡΡΠ΅ΠΊ" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "topologically sort, maintaining date order where possible" msgstr "ΡΠΎΠΏΠΎΠ»ΠΎΠ³ΠΈΡΠ΅ΡΠΊΠ°Ρ ΡΠΎΡΡΠΈΡΠΎΠ²ΠΊΠ°, Ρ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΏΠΎΡΡΠ΄ΠΊΠ° Π΄Π°Ρ, Π΅ΡΠ»ΠΈ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "<n>[,<base>]" msgstr "<n>[,<Π±Π°Π·Π°>]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show <n> most recent ref-log entries starting at base" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΡ
Π·Π°ΠΏΠΈΡΠ΅ΠΉ Π² ΠΆΡΡΠ½Π°Π»Π΅ ΡΡΡΠ»ΠΎΠΊ, Π½Π°ΡΠΈΠ½Π°Ρ Ρ Π±Π°Π·Ρ" +#: builtin/show-branch.c:703 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-" +"base" +msgstr "--reflog Π½Π΅ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎ Ρ --all, --remotes, --independent ΠΈ --merge-base" + +#: builtin/show-branch.c:727 +msgid "no branches given, and HEAD is not valid" +msgstr "Π½Π΅ ΡΠΊΠ°Π·Π°Π½Ρ Π²Π΅ΡΠΊΠΈ ΠΈ HEAD Π½Π΅ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ" + +#: builtin/show-branch.c:730 +msgid "--reflog option needs one branch name" +msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --reflog ΡΡΠ΅Π±ΡΠ΅Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΈΠΌΠ΅Π½ΠΈ ΠΎΠ΄Π½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" + +#: builtin/show-branch.c:733 +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΡ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Π° ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." +msgstr[1] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." +msgstr[2] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." +msgstr[3] "ΡΠΎΠ»ΡΠΊΠΎ %d Π·Π°ΠΏΠΈΡΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." + +#: builtin/show-branch.c:737 +#, c-format +msgid "no such ref %s" +msgstr "Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ %s" + +#: builtin/show-branch.c:829 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ." +msgstr[1] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ." +msgstr[2] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ." +msgstr[3] "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π±ΠΎΠ»ΡΡΠ΅ %d ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΊΠΎΠΌΠΌΠΈΡ %s (%s)" + #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | " @@ -10485,12 +11618,12 @@ msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΈ ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ ΡΡΡΠΎΠΊΠΈ, Π½Π°ΡΠΈΠ½Π° msgid "prepend comment character and space to each line" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠ°ΠΆΠ΄ΠΎΠΉ ΡΡΡΠΎΠΊΠΎΠΉ ΡΠΈΠΌΠ²ΠΎΠ» ΠΊΠΎΠΌΠΌΠ΅ΡΠ°ΡΠΈΡ ΠΈ ΠΏΡΠΎΠ±Π΅Π»" -#: builtin/submodule--helper.c:24 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 #, c-format msgid "No such ref: %s" msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ: %s" -#: builtin/submodule--helper.c:31 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 #, c-format msgid "Expecting a full ref name, got %s" msgstr "ΠΠΆΠΈΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»Π½ΠΎΠ΅ ΠΈΠΌΡ ΡΡΡΠ»ΠΊΠΈ, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s" @@ -10500,160 +11633,200 @@ msgstr "ΠΠΆΠΈΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»Π½ΠΎΠ΅ ΠΈΠΌΡ ΡΡΡΠ»ΠΊΠΈ, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ msgid "cannot strip one component off url '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±ΡΠ΅Π·Π°ΡΡ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ url Β«%sΒ»" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 +#: builtin/submodule--helper.c:590 msgid "alternative anchor for relative paths" msgstr "Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠΉ ΡΠΈΠΌΠ²ΠΎΠ» Π΄Π»Ρ ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΡΡ
ΠΏΡΡΠ΅ΠΉ" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:287 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ΠΏΡΡΡ>] [<ΠΏΡΡΡ>β¦]" -#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² .gitmodules" -#: builtin/submodule--helper.c:366 +#: builtin/submodule--helper.c:369 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ Π°Π΄ΡΠ΅ΡΠ° Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" -#: builtin/submodule--helper.c:370 +#: builtin/submodule--helper.c:373 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ» (%s) Π·Π°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°Π½ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ»\n" -#: builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:383 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "Π²Π½ΠΈΠΌΠ°Π½ΠΈΠ΅: ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΆΠΈΠΌ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»\n" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:390 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ ΡΠ΅ΠΆΠΈΠΌΠ° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:409 msgid "Suppress output for initializing a submodule" msgstr "ΠΠ΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<ΠΏΡΡΡ>]" -#: builtin/submodule--helper.c:432 +#: builtin/submodule--helper.c:435 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ΠΏΡΡΡ>" -#: builtin/submodule--helper.c:438 +#: builtin/submodule--helper.c:441 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ Π² .gitmodules Π΄Π»Ρ ΠΏΡΡΠΈ Β«%sΒ»" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ» Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Ρ: %s" + +#: builtin/submodule--helper.c:563 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "ΠΠ½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° submodule.alternateErrorStrategy Π½Π΅ ΡΠ°ΠΏΠΎΠ·Π½Π°Π½ΠΎ" + +#: builtin/submodule--helper.c:570 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "ΠΠ½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° submodule.alternateLocation Π½Π΅ ΡΠ°ΠΏΠΎΠ·Π½Π°Π½ΠΎ" + +#: builtin/submodule--helper.c:593 msgid "where the new submodule will be cloned to" msgstr "ΠΊΡΠ΄Π° Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ Π½ΠΎΠ²ΡΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:596 msgid "name of the new submodule" msgstr "ΠΈΠΌΡ Π½ΠΎΠ²ΠΎΠ³ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:599 msgid "url where to clone the submodule from" msgstr "url ΠΎΡΠΊΡΠ΄Π° Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΠ» ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ Π½ΠΎΠ²ΡΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:501 +#: builtin/submodule--helper.c:605 msgid "depth for shallow clones" msgstr "Π³Π»ΡΠ±ΠΈΠ½Π° Π΄Π»Ρ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°" -#: builtin/submodule--helper.c:507 +#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +msgid "force cloning progress" +msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ" + +#: builtin/submodule--helper.c:613 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "git submodule--helper clone [--prefix=<ΠΏΡΡΡ>] [--quiet] [--reference <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ>] [--name <ΠΈΠΌΡ>] [--depth <Π³Π»ΡΠ±ΠΈΠ½Π°>] --url <url> --path <ΠΏΡΡΡ>" -#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 +#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 #, c-format msgid "could not create directory '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/submodule--helper.c:534 +#: builtin/submodule--helper.c:644 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ Β«%sΒ» Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ»" -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:660 #, c-format msgid "cannot open file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» Β«%sΒ»" -#: builtin/submodule--helper.c:555 +#: builtin/submodule--helper.c:665 #, c-format msgid "could not close file %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ ΡΠ°ΠΉΠ» %s" -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:672 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" -#: builtin/submodule--helper.c:609 +#: builtin/submodule--helper.c:726 #, c-format msgid "Submodule path '%s' not initialized" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ» Π½Π΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:730 msgid "Maybe you want to use 'update --init'?" msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Ρ
ΠΎΡΠ΅Π»ΠΈ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Β«update --initΒ»?" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:756 #, c-format msgid "Skipping unmerged submodule %s" msgstr "ΠΡΠΎΠΏΡΡΠΊ Π½Π΅ ΡΠ»ΠΈΡΠΎΠ³ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:777 #, c-format msgid "Skipping submodule '%s'" msgstr "ΠΡΠΎΠΏΡΡΠΊ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:913 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ Β«%sΒ». ΠΠ°ΠΏΠ»Π°Π½ΠΈΡΠΎΠ²Π°Π½Π° ΠΏΠΎΠ²ΡΠΎΡΠ½Π°Ρ ΠΏΠΎΠΏΡΡΠΊΠ°" + +#: builtin/submodule--helper.c:924 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ Β«%sΒ» ΡΠΎ Π²ΡΠΎΡΠΎΠΉ ΠΏΠΎΠΏΡΡΠΊΠΈ, ΠΎΡΠΌΠ΅Π½Π°" + +#: builtin/submodule--helper.c:945 msgid "path into the working tree" msgstr "ΠΏΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/submodule--helper.c:771 +#: builtin/submodule--helper.c:948 msgid "path into the working tree, across nested submodule boundaries" msgstr "ΠΏΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅, Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
Π³ΡΠ°Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:775 +#: builtin/submodule--helper.c:952 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout ΠΈΠ»ΠΈ none" -#: builtin/submodule--helper.c:779 +#: builtin/submodule--helper.c:956 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½, ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½Π½ΡΠΉ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΌ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎΠΌ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ" -#: builtin/submodule--helper.c:782 +#: builtin/submodule--helper.c:959 msgid "parallel jobs" msgstr "ΠΏΠ°ΡΠ°Π»Π»Π΅Π»ΡΠ½ΡΠ΅ Π·Π°Π΄Π°ΡΠΈ" -#: builtin/submodule--helper.c:783 +#: builtin/submodule--helper.c:961 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "Π΄ΠΎΠ»ΠΆΠ΅Π½ Π»ΠΈ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄Π°ΡΠΈΠΈ ΠΎ ΡΠ°ΡΡΠΈΡΠ½ΠΎΡΡΠΈ" + +#: builtin/submodule--helper.c:962 msgid "don't print cloning progress" msgstr "Π²Ρ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ" -#: builtin/submodule--helper.c:788 +#: builtin/submodule--helper.c:969 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<ΠΏΡΡΡ>] [<ΠΏΡΡΡ>β¦]" -#: builtin/submodule--helper.c:798 +#: builtin/submodule--helper.c:979 msgid "bad value for update parameter" msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° update" -#: builtin/submodule--helper.c:855 +#: builtin/submodule--helper.c:1050 +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "ΠΠ΅ΡΠΊΠ° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ (%s) Π½Π°ΡΡΡΠΎΠ΅Π½Π° Π½Π° Π½Π°ΡΠ»Π΅Π΄ΠΎΠ²Π°Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ ΠΈΠ· ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΎΠ³ΠΎ ΠΏΡΠΎΠ΅ΠΊΡΠ°, Π½ΠΎ ΠΎΠ½ Π½Π΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ Π²Π΅ΡΠΊΠ΅" + +#: builtin/submodule--helper.c:1100 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π° submodule--helper Π΄ΠΎΠ»ΠΆΠ½Π° Π²ΡΠ·ΡΠ²Π°ΡΡΡΡ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Ρ" -#: builtin/submodule--helper.c:862 +#: builtin/submodule--helper.c:1107 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ submodule--helper" @@ -10875,7 +12048,7 @@ msgstr "ΠΌΠ΅ΡΠΊΠ° Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" msgid "Updated tag '%s' (was %s)\n" msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π° (Π±ΡΠ»Π° %s)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:493 msgid "Unpacking objects" msgstr "Π Π°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" @@ -10937,139 +12110,143 @@ msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π½Π΅ ΠΈΠ·ΠΌΠ΅ msgid " OK" msgstr " OK" -#: builtin/update-index.c:575 +#: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<ΠΎΠΏΡΠΈΠΈ>] [--] [<ΡΠ°ΠΉΠ»>β¦]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:919 msgid "continue refresh even when index needs update" msgstr "ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΠΈΠ½Π΄Π΅ΠΊΡ ΡΡΠ΅Π±ΡΠ΅Ρ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ" -#: builtin/update-index.c:933 +#: builtin/update-index.c:922 msgid "refresh: ignore submodules" msgstr "ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅: ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" -#: builtin/update-index.c:936 +#: builtin/update-index.c:925 msgid "do not ignore new files" msgstr "Π½Π΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π½ΠΎΠ²ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/update-index.c:938 +#: builtin/update-index.c:927 msgid "let files replace directories and vice-versa" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠ°ΠΉΠ»Π°ΠΌ Π·Π°ΠΌΠ΅Π½ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ ΠΈ Π½Π°ΠΎΠ±ΠΎΡΠΎΡ" -#: builtin/update-index.c:940 +#: builtin/update-index.c:929 msgid "notice files missing from worktree" msgstr "Π·Π°ΠΌΠ΅ΡΠ°ΡΡ ΡΠ°ΠΉΠ»Ρ ΠΎΡΡΡΡΡΡΠ²ΡΡΡΠΈΠ΅ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/update-index.c:942 +#: builtin/update-index.c:931 msgid "refresh even if index contains unmerged entries" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ Π·Π°ΠΏΠΈΡΠΈ" -#: builtin/update-index.c:945 +#: builtin/update-index.c:934 msgid "refresh stat information" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΡΡΠ°ΡΡΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/update-index.c:949 +#: builtin/update-index.c:938 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "ΠΊΠ°ΠΊ --refresh, Π½ΠΎ ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΡ assume-unchanged" -#: builtin/update-index.c:953 +#: builtin/update-index.c:942 msgid "<mode>,<object>,<path>" msgstr "<ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ°>,<ΠΎΠ±ΡΠ΅ΠΊΡ>,<ΠΏΡΡΡ>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:943 msgid "add the specified entry to the index" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ Π·Π°ΠΏΠΈΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/update-index.c:958 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/update-index.c:959 -msgid "override the executable bit of the listed files" -msgstr "ΠΏΠ΅ΡΠ΅ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π±ΠΈΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" - -#: builtin/update-index.c:963 +#: builtin/update-index.c:952 msgid "mark files as \"not changing\"" msgstr "ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΠΊΠ°ΠΊ Β«Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅Β»" -#: builtin/update-index.c:966 +#: builtin/update-index.c:955 msgid "clear assumed-unchanged bit" msgstr "ΡΠ±ΡΠ°ΡΡ ΠΏΠΎΠΌΠ΅ΡΠΊΡ assumed-unchanged" -#: builtin/update-index.c:969 +#: builtin/update-index.c:958 msgid "mark files as \"index-only\"" msgstr "ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°ΠΉΠ»Ρ ΠΊΠ°ΠΊ Β«ΡΠΎΠ»ΡΠΊΠΎ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅Β»" -#: builtin/update-index.c:972 +#: builtin/update-index.c:961 msgid "clear skip-worktree bit" msgstr "ΡΠ±ΡΠ°ΡΡ ΠΏΠΎΠΌΠ΅ΡΠΊΡ skip-worktree" -#: builtin/update-index.c:975 +#: builtin/update-index.c:964 msgid "add to index only; do not add content to object database" msgstr "ΡΠΎΠ»ΡΠΊΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡ; Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π² Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/update-index.c:977 +#: builtin/update-index.c:966 msgid "remove named paths even if present in worktree" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΠΏΡΡΠΈ, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΠΎΠ½ΠΈ ΡΡΡΠ΅ΡΡΠ²ΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/update-index.c:979 +#: builtin/update-index.c:968 msgid "with --stdin: input lines are terminated by null bytes" msgstr "Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --stdin: ΡΡΡΠΎΠΊΠΈ Π½Π° Π²Π²ΠΎΠ΄Π΅ ΠΎΡΠ΄Π΅Π»ΡΡΡΡΡ ΠΠ£ΠΠΠΠ«Π Π±Π°ΠΉΡΠΎΠΌ" -#: builtin/update-index.c:981 +#: builtin/update-index.c:970 msgid "read list of paths to be updated from standard input" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ΅ΠΌΡΡ
ΠΏΡΡΠ΅ΠΉ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/update-index.c:985 +#: builtin/update-index.c:974 msgid "add entries from standard input to the index" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/update-index.c:989 +#: builtin/update-index.c:978 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "Π·Π°Π½ΠΎΠ²ΠΎ Π·Π°ΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ #2 ΠΈ #3 Π΄Π»Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ" -#: builtin/update-index.c:993 +#: builtin/update-index.c:982 msgid "only update entries that differ from HEAD" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π·Π°ΠΏΠΈΡΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΡΠ»ΠΈΡΠ°ΡΡΡΡ ΠΎΡ HEAD" -#: builtin/update-index.c:997 +#: builtin/update-index.c:986 msgid "ignore files missing from worktree" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ, ΠΎΡΡΡΡΡΡΠ²ΡΡΡΠΈΠ΅ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:989 msgid "report actions to standard output" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΠΌΡΠ΅ Π΄Π΅ΠΉΡΡΠ²ΠΈΡ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:991 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(Π΄Π»Ρ ΠΌΠ°ΡΠΈΠ½Π½ΠΎΠΉ ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠΈ) Π·Π°Π±ΡΡΡ ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΠ΅ Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:995 msgid "write index in this format" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:997 msgid "enable or disable split index" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΈΠ»ΠΈ Π·Π°ΠΏΡΠ΅ΡΠΈΡΡ ΡΠ°Π·Π΄Π΅Π»ΡΠ½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:999 msgid "enable/disable untracked cache" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ/ΠΎΡΠΊΠ»ΡΡΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1001 msgid "test if the filesystem supports untracked cache" msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠ°ΠΉΠ»ΠΎΠ²Π°Ρ ΡΠΈΡΡΠ΅ΠΌΠ° ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1003 msgid "enable untracked cache without testing the filesystem" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Π±Π΅Π· ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²ΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΡ" -#: builtin/update-index.c:1134 +#: builtin/update-index.c:1119 +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ core.untrackedCache ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ true; ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΠ»ΠΈ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΠ΅ Π΅Π³ΠΎ, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: builtin/update-index.c:1123 msgid "Untracked cache disabled" msgstr "ΠΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠΊΠ»ΡΡΠ΅Π½" -#: builtin/update-index.c:1146 +#: builtin/update-index.c:1131 +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want" +" to enable the untracked cache" +msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ core.untrackedCache ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ false; ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΠ»ΠΈ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΠ΅ Π΅Π³ΠΎ, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΊΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: builtin/update-index.c:1135 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "ΠΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Π²ΠΊΠ»ΡΡΠ΅Π½ Π΄Π»Ρ Β«%sΒ»" @@ -11147,82 +12324,109 @@ msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<ΠΎΠΏΡΠΈΠΈ>] <ΠΏΡΡΡ> [<Π²Π΅ΡΠΊΠ°>]" #: builtin/worktree.c:16 +msgid "git worktree list [<options>]" +msgstr "git worktree list [<ΠΎΠΏΡΠΈΠΈ>]" + +#: builtin/worktree.c:17 +msgid "git worktree lock [<options>] <path>" +msgstr "git worktree lock [<ΠΎΠΏΡΠΈΠΈ>] <ΠΏΡΡΡ>" + +#: builtin/worktree.c:18 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<ΠΎΠΏΡΠΈΠΈ>]" -#: builtin/worktree.c:17 -msgid "git worktree list [<options>]" -msgstr "git worktree list [<ΠΎΠΏΡΠΈΠΈ>]" +#: builtin/worktree.c:19 +msgid "git worktree unlock <path>" +msgstr "git worktree unlock <ΠΏΡΡΡ>" -#: builtin/worktree.c:40 +#: builtin/worktree.c:42 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" -#: builtin/worktree.c:46 +#: builtin/worktree.c:48 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: ΡΠ°ΠΉΠ» gitdir Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/worktree.c:51 +#: builtin/worktree.c:53 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» gitdir (%s)" -#: builtin/worktree.c:62 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» gitdir" -#: builtin/worktree.c:78 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: gitdir ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ΅Π΅ ΡΠ°ΡΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅" -#: builtin/worktree.c:113 -#, c-format -msgid "failed to remove '%s'" -msgstr "ΡΠ±ΠΎΠΉ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Β«%sΒ»" - -#: builtin/worktree.c:202 +#: builtin/worktree.c:204 #, c-format msgid "'%s' already exists" msgstr "Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/worktree.c:234 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/worktree.c:270 +#: builtin/worktree.c:272 #, c-format msgid "Preparing %s (identifier %s)" msgstr "ΠΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΊΠ° %s (ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ %s)" -#: builtin/worktree.c:322 +#: builtin/worktree.c:323 msgid "checkout <branch> even if already checked out in other worktree" msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° <Π²Π΅ΡΠΊΠ°> Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΠΎΠ½Π° ΡΠΆΠ΅ Π°ΠΊΡΠΈΠ²Π½Π° Π² Π΄ΡΡΠ³ΠΎΠΌ ΡΠ°Π±ΠΎΡΠ΅ΡΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/worktree.c:324 +#: builtin/worktree.c:325 msgid "create a new branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/worktree.c:326 +#: builtin/worktree.c:327 msgid "create or reset a branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΈΠ»ΠΈ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π²Π΅ΡΠΊΡ" -#: builtin/worktree.c:327 -msgid "detach HEAD at named commit" -msgstr "ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ HEAD Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ΅" - -#: builtin/worktree.c:328 +#: builtin/worktree.c:329 msgid "populate the new working tree" msgstr "Π½Π°ΠΏΠΎΠ»Π½ΠΈΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: builtin/worktree.c:336 +#: builtin/worktree.c:337 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B ΠΈ --detach Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" +#: builtin/worktree.c:470 +msgid "reason for locking" +msgstr "ΠΏΡΠΈΡΠΈΠ½Π° Π±Π»ΠΎΠΊΠΈΡΠΎΠ²ΠΊΠΈ" + +#: builtin/worktree.c:482 builtin/worktree.c:515 +#, c-format +msgid "'%s' is not a working tree" +msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°Π±ΠΎΡΠΈΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" + +#: builtin/worktree.c:484 builtin/worktree.c:517 +msgid "The main working tree cannot be locked or unlocked" +msgstr "ΠΠ»Π°Π²Π½ΡΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°Π½ ΠΈΠ»ΠΈ ΡΠ°Π·Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°Π½" + +#: builtin/worktree.c:489 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "Β«%sΒ» ΡΠΆΠ΅ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°Π½, ΠΏΡΠΈΡΠΈΠ½Π°: %s" + +#: builtin/worktree.c:491 +#, c-format +msgid "'%s' is already locked" +msgstr "Β«%sΒ» ΡΠΆΠ΅ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°Π½" + +#: builtin/worktree.c:519 +#, c-format +msgid "'%s' is not locked" +msgstr "Β«%sΒ» Π½Π΅ Π·Π°Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°Π½" + #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<ΠΏΡΠ΅ΡΠΈΠΊΡ>/]" @@ -11239,6 +12443,35 @@ msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π΅ΡΠ΅Π²Π° Π΄Π»Ρ ΠΏΠΎΠ΄ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Ρ msgid "only useful for debugging" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΎΡΠ»Π°Π΄ΠΊΠ΅" +#: upload-pack.c:22 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<ΠΎΠΏΡΠΈΠΈ>] <ΠΊΠ°ΡΠ°Π»ΠΎΠ³>" + +#: upload-pack.c:1028 +msgid "quit after a single request/response exchange" +msgstr "Π²ΡΡ
ΠΎΠ΄ ΠΏΠΎΡΠ»Π΅ ΠΎΠ±ΠΌΠ΅Π½Π° ΠΎΠ΄Π½ΠΈΠΌ Π·Π°ΠΏΡΠΎΡΠΎΠΌ/ΠΎΡΠ²Π΅ΡΠΎΠΌ" + +#: upload-pack.c:1030 +msgid "exit immediately after initial ref advertisement" +msgstr "Π²ΡΡ
ΠΎΠ΄ΠΈΡΡ ΡΡΠ°Π·Ρ ΠΏΠΎΡΠ»Π΅ Π½Π°ΡΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΎΠ±ΡΡΠ²Π»Π΅Π½ΠΈΡ ΡΠΏΠΈΡΠΊΠ° ΡΡΡΠ»ΠΎΠΊ" + +#: upload-pack.c:1032 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "Π½Π΅ ΠΏΡΠΎΠ²Π΅ΡΡΡΡ <ΠΊΠ°ΡΠ°Π»ΠΎΠ³>/.git/ Π΅ΡΠ»ΠΈ <ΠΊΠ°ΡΠ°Π»ΠΎΠ³> Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ Git" + +#: upload-pack.c:1034 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "ΠΏΡΠ΅ΡΠ²Π°ΡΡ ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΠΏΠΎΡΠ»Π΅ <ΠΊΠΎΠ»> ΡΠ΅ΠΊΡΠ½Π΄ ΠΏΡΠΎΡΡΠΎΡ" + +#: credential-cache--daemon.c:223 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "ΠΡΠ°Π²Π° Π΄ΠΎΡΡΡΠΏΠ° ΠΊ Π²Π°ΡΠ΅ΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Ρ ΡΠΎΠΊΠ΅ΡΠΎΠ² ΡΠ»ΠΈΡΠΊΠΎΠΌ ΡΠ²ΠΎΠ±ΠΎΠ΄Π½Ρ; Π΄ΡΡΠ³Π΅ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΠΈ ΠΌΠΎΠ³ΡΠΈ ΡΠΈΡΠ°ΡΡ Π²Π°ΡΠΈ Π·Π°ΠΊΡΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΏΠ°ΡΠΎΠ»ΠΈ Π΄ΠΎΡΡΡΠΏΠ°. ΠΠ±Π΄ΡΠΌΠ°ΠΉΡΠ΅ Π·Π°ΠΏΡΡΠΊ ΠΊΠΎΠΌΠ°Π½Π΄Ρ:\n\n\tchmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "Π²ΡΠ²ΠΎΠ΄ ΠΎΡΠ»Π°Π΄ΠΎΡΠ½ΡΡ
ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ Π½Π° stderr" @@ -11250,7 +12483,11 @@ msgid "" "to read about a specific subcommand or concept." msgstr "Β«git help -Π°Β» ΠΈ Β«git help -gΒ» Π²ΡΠ²ΠΎΠ΄ΠΈΡ ΡΠΏΠΈΡΠΎΠΊ Π΄ΠΎΡΡΡΠΏΠ½ΡΡ
ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ ΠΈ\nΠ½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π° ΠΏΠΎ ΡΠ΅ΠΌΠ°ΠΌ. ΠΠ°ΠΏΡΡΡΠΈΡΠ΅ Β«git help <ΠΊΠΎΠΌΠ°Π½Π΄Π°>Β» ΠΈΠ»ΠΈ\nΒ«git help <ΡΠ΅ΡΠΌΠΈΠ½>Β», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΡΠ΅ΡΡΡ ΠΎ ΠΊΠΎΠ½ΠΊΡΠ΅ΡΠ½ΡΡ
ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π΅ ΠΈΠ»ΠΈ ΡΠ΅ΠΌΠ΅." -#: http.c:322 +#: http.c:342 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "ΠΠ΅Π»Π΅Π³Π°ΡΠΈΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΠΎΠ»Π½ΠΎΠΌΠΎΡΠΈΠΉ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ Ρ cURL < 7.22.0" + +#: http.c:351 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ Ρ cURL < 7.44.0" @@ -11366,15 +12603,15 @@ msgstr "Π΄Π°ΡΠ°-ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ" msgid "no-op (backward compatibility)" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ (ΠΎΡΡΠ°Π²Π»Π΅Π½ΠΎ Π΄Π»Ρ ΠΎΠ±ΡΠ°ΡΠ½ΠΎΠΉ ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎΡΡΠΈ)" -#: parse-options.h:237 +#: parse-options.h:238 msgid "be more verbose" msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅" -#: parse-options.h:239 +#: parse-options.h:240 msgid "be more quiet" msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ" -#: parse-options.h:245 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <n> ΡΠΈΡΡ Π΄Π»Ρ Π²ΡΠ²ΠΎΠ΄Π° SHA-1" @@ -11382,58 +12619,59 @@ msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <n> ΡΠΈΡΡ Π΄Π»Ρ Π²ΡΠ²ΠΎΠ΄Π° SHA-1" msgid "update the index with reused conflict resolution if possible" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ΅ΡΠ΅ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°, Π΅ΡΠ»ΠΈ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ" -#: git-bisect.sh:55 +#: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "ΠΠ°ΠΌ Π½ΡΠΆΠ½ΠΎ Π½Π°ΡΠ°ΡΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git bisect startΒ»" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:61 +#: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "ΠΡ ΡΠ²Π΅ΡΠ΅Π½Ρ, ΡΡΠΎ Ρ
ΠΎΡΠΈΡΠ΅, ΡΡΠΎΠ±Ρ Ρ ΡΠ΄Π΅Π»Π°Π» ΡΡΠΎ [Y - Π΄Π°/n - Π½Π΅Ρ]? " -#: git-bisect.sh:122 +#: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΎΠΏΡΠΈΡ: Β«$argΒ»" -#: git-bisect.sh:126 +#: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "Β«$argΒ» Π½Π΅ ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ" -#: git-bisect.sh:155 +#: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "ΠΠ»ΠΎΡ
ΠΎΠΉ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ HEAD β ΠΠ΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ HEAD" -#: git-bisect.sh:168 +#: git-bisect.sh:167 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "Π‘Π±ΠΎΠΉ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄Π° Π½Π° Β«$start_headΒ». ΠΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Β«git bisect reset <ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ°Ρ-Π²Π΅ΡΠΊΠ°>Β»." -#: git-bisect.sh:178 +#: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "Π½Π΅Π»ΡΠ·Ρ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ Π½Π° Π΄Π΅ΡΠ΅Π²Π΅ ΠΏΠΎΡΠ»Π΅ cg-seek" -#: git-bisect.sh:182 +#: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "ΠΠ»ΠΎΡ
ΠΎΠΉ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ HEAD β ΡΡΡΠ°Π½Π½Π°Ρ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ°" -#: git-bisect.sh:234 +#: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "ΠΠ»ΠΎΡ
ΠΎΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ bisect_write: $state" -#: git-bisect.sh:263 +#: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" msgstr "ΠΠ»ΠΎΡ
ΠΎΠΉ Π²Π²ΠΎΠ΄ Π½ΠΎΠΌΠ΅ΡΠ° ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ: $arg" -#: git-bisect.sh:278 -msgid "Please call 'bisect_state' with at least one argument." -msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²ΡΠ·ΡΠ²Π°ΠΉΡΠ΅ Β«bisect_stateΒ» ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ Ρ ΠΎΠ΄Π½ΠΈΠΌ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΎΠΌ." +#: git-bisect.sh:281 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "ΠΠ»ΠΎΡ
ΠΎΠΉ Π²Π²ΠΎΠ΄ Π½ΠΎΠΌΠ΅ΡΠ° ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ: $bisected_head" #: git-bisect.sh:290 #, sh-format @@ -11563,61 +12801,99 @@ msgid "" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ $arg Π΄Π»Ρ Β«git bisect termsΒ».\nΠΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ: --term-good|--term-old ΠΈ --term-bad|--term-new." -#: git-rebase.sh:57 +#: git-merge-octopus.sh:46 +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "ΠΡΠΈΠ±ΠΊΠ°: ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ" + +#: git-merge-octopus.sh:61 +msgid "Automated merge did not work." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-merge-octopus.sh:62 +msgid "Should not be doing an octopus." +msgstr "ΠΠΎΠ»ΠΆΠ½ΠΎ Π±ΡΡΡ octopus Π½Π΅ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΠΈΡ." + +#: git-merge-octopus.sh:73 +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΎΠ±ΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Ρ $pretty_name" + +#: git-merge-octopus.sh:77 +#, sh-format +msgid "Already up-to-date with $pretty_name" +msgstr "Π£ΠΆΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ $pretty_name" + +#: git-merge-octopus.sh:89 +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π΄ΠΎ: $pretty_name" + +#: git-merge-octopus.sh:97 +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "ΠΠΎΠΏΡΡΠΊΠ° ΠΏΡΠΎΡΡΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ Ρ $pretty_name" + +#: git-merge-octopus.sh:102 +msgid "Simple merge did not work, trying automatic merge." +msgstr "ΠΡΠΎΡΡΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ, ΠΏΠΎΠΏΡΡΠΊΠ° Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ." + +#: git-rebase.sh:56 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" "To check out the original branch and stop rebasing, run \"git rebase --abort\"." msgstr "ΠΠΎΠ³Π΄Π° Π²Ρ ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΡΡΠΎΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git rebase --continueΒ».\nΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git rebase --skipΒ».\nΠ§ΡΠΎΠ±Ρ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git rebase --abortΒ»." -#: git-rebase.sh:168 +#: git-rebase.sh:156 git-rebase.sh:395 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π°Π·Π°Π΄ Π½Π° $head_name" + +#: git-rebase.sh:167 msgid "Applied autostash." msgstr "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΎ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΠΏΡΡΡΠ°Π½ΡΠ΅." -#: git-rebase.sh:171 +#: git-rebase.sh:170 #, sh-format msgid "Cannot store $stash_sha1" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ $stash_sha1" -#: git-rebase.sh:172 +#: git-rebase.sh:171 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ³ΠΎ ΠΏΡΡΡΠ°Π½ΡΡ Π²ΡΠ·Π²Π°Π»ΠΎ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ.\nΠΠ°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΏΡΡΡΠ°Π½Ρ ΠΈ Π² Π±Π΅Π·ΠΎΠΏΠ°ΡΠ½ΠΎΡΡΠΈ.\nΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Β«git stash popΒ» ΠΈΠ»ΠΈ Β«git stash dropΒ» Π² Π»ΡΠ±ΠΎΠΉ ΠΌΠΎΠΌΠ΅Π½Ρ.\n" -#: git-rebase.sh:211 +#: git-rebase.sh:210 msgid "The pre-rebase hook refused to rebase." -msgstr "ΠΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ ΠΏΡΠ΅-ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΠΎΡΠΊΠ°Π·Π°Π» Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ." +msgstr "ΠΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ pre-rebase ΠΎΡΠΊΠ°Π·Π°Π» Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ." -#: git-rebase.sh:216 +#: git-rebase.sh:215 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, git-am Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ. ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ." -#: git-rebase.sh:357 +#: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "ΠΠ΅Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅?" -#: git-rebase.sh:368 +#: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "ΠΠ΅ΠΉΡΡΠ²ΠΈΠ΅ --edit-todo ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠΌ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ." -#: git-rebase.sh:375 +#: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:377 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ΅\nΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π° ΠΏΠΎΡΠΎΠΌ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ\nΠΈΡ
ΠΊΠ°ΠΊ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ git add" -#: git-rebase.sh:396 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π°Π·Π°Π΄ Π½Π° $head_name" - -#: git-rebase.sh:415 +#: git-rebase.sh:414 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11630,97 +12906,101 @@ msgid "" "valuable there." msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΠΊΠ°ΡΠ°Π»ΠΎΠ³ $state_dir_base ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Ρ ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Ρ, ΡΡΠΎ Π²Ρ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π΄ΡΡΠ³ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ. ΠΡΠ»ΠΈ ΡΡΠΎ ΡΠ°ΠΊ, ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅\n\t$cmd_live_rebase\nΠΡΠ»ΠΈ Π½Π΅Ρ\n\t$cmd_clear_stale_rebase\nΠΈ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ ΠΌΠ΅Π½Ρ ΡΠ½ΠΎΠ²Π°. Π― ΠΎΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°ΡΡΡ, ΡΡΠΎΠ±Ρ Π²Ρ Π½Π΅ ΠΏΠΎΡΠ΅ΡΡΠ»ΠΈ ΡΡΠΎ-ΡΠΎ Π²Π°ΠΆΠ½ΠΎΠ΅." -#: git-rebase.sh:466 +#: git-rebase.sh:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½Π°Ρ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° $upstream_name" -#: git-rebase.sh:490 +#: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ΠΈΠΌΠ΅Π΅ΡΡΡ Π±ΠΎΠ»ΡΡΠ΅ ΠΎΠ΄Π½ΠΎΠΉ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: git-rebase.sh:493 git-rebase.sh:497 +#: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: Π½Π΅Ρ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: git-rebase.sh:502 +#: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "ΠΠ΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ: $onto_name" -#: git-rebase.sh:525 +#: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΈ: $branch_name" -#: git-rebase.sh:558 +#: git-rebase.sh:557 msgid "Cannot autostash" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΠΏΡΡΡΠ°Π½ΡΠ΅" -#: git-rebase.sh:563 +#: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ ΡΠΏΡΡΡΠ°Π½Ρ: $stash_abbrev" -#: git-rebase.sh:567 +#: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "Π‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ ΠΈΡ
." -#: git-rebase.sh:587 +#: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Π’Π΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° $branch_name ΡΠΆΠ΅ ΡΠ²Π΅ΠΆΠ°Ρ." -#: git-rebase.sh:591 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Π’Π΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° $branch_name ΡΠΆΠ΅ ΡΠ²Π΅ΠΆΠ°Ρ, ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅." -#: git-rebase.sh:602 +#: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΎΡ $mb Π΄ΠΎ $onto:" -#: git-rebase.sh:611 +#: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." msgstr "Π‘Π½Π°ΡΠ°Π»Π° ΠΏΠ΅ΡΠ΅ΠΌΠ°ΡΡΠ²Π°Π΅ΠΌ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ ΡΠ΅ΠΊΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°, ΡΡΠΎΠ±Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎΠ²Π΅ΡΡ
Π½Π΅Π³ΠΎβ¦" -#: git-rebase.sh:621 +#: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠ°Π½Π° Π²ΠΏΠ΅ΡΠ΅Π΄ $branch_name Π΄ΠΎ $onto_name." -#: git-stash.sh:51 +#: git-stash.sh:50 msgid "git stash clear with parameters is unimplemented" msgstr "git stash ΠΎΡΠΈΡΡΠΊΠ° Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ°ΠΌΠΈ Π½Π΅ ΡΠ΅Π°Π»ΠΈΠ·ΠΎΠ²Π°Π½Π°" -#: git-stash.sh:74 +#: git-stash.sh:73 msgid "You do not have the initial commit yet" msgstr "Π£ Π²Π°Ρ Π΅ΡΠ΅ Π½Π΅Ρ Π½Π°ΡΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: git-stash.sh:89 +#: git-stash.sh:88 msgid "Cannot save the current index state" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: git-stash.sh:124 git-stash.sh:137 +#: git-stash.sh:103 +msgid "Cannot save the untracked files" +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" + +#: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: git-stash.sh:141 +#: git-stash.sh:140 msgid "No changes selected" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π½Π΅ Π²ΡΠ±ΡΠ°Π½Ρ" -#: git-stash.sh:144 +#: git-stash.sh:143 msgid "Cannot remove temporary index (can't happen)" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ (Π½Π΅ Π΄ΠΎΠ»ΠΆΠ½ΠΎ ΡΠ»ΡΡΠ°ΡΡΡΡ)" -#: git-stash.sh:157 +#: git-stash.sh:156 msgid "Cannot record working tree state" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: git-stash.sh:189 +#: git-stash.sh:188 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ $ref_stash Ρ ΠΏΠΎΠΌΠΎΡΡΡ $w_commit" @@ -11734,115 +13014,132 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ $ref_stash Ρ ΠΏΠΎΠΌΠΎΡΡΡ $w_com #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:239 +#: git-stash.sh:238 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΠΏΡΠΈΡ Π΄Π»Ρ Β«stash saveΒ»: $option\n ΠΠ»Ρ ΠΏΡΠ΅Π΄ΠΎΡΡΠ°Π²Π»Π΅Π½ΠΈΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ git stash save -- Β«$optionΒ»" -#: git-stash.sh:260 +#: git-stash.sh:251 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ --patch ΠΈ --include-untracked ΠΈΠ»ΠΈ --all ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" + +#: git-stash.sh:259 msgid "No local changes to save" msgstr "ΠΠ΅Ρ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π»Ρ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΡ" -#: git-stash.sh:264 +#: git-stash.sh:263 msgid "Cannot initialize stash" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΡΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" -#: git-stash.sh:268 +#: git-stash.sh:267 msgid "Cannot save the current status" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΡΠ°ΡΡΡ" -#: git-stash.sh:286 +#: git-stash.sh:268 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΈ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΡΠΎΡ
ΡΠ°Π½Π΅Π½Ρ $stash_msg" + +#: git-stash.sh:285 msgid "Cannot remove worktree changes" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: git-stash.sh:405 +#: git-stash.sh:403 #, sh-format msgid "unknown option: $opt" msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΠΏΡΠΈΡ: $opt" -#: git-stash.sh:415 +#: git-stash.sh:416 msgid "No stash found." msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ ΡΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: git-stash.sh:422 +#: git-stash.sh:423 #, sh-format msgid "Too many revisions specified: $REV" msgstr "ΠΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ: $REV" -#: git-stash.sh:428 +#: git-stash.sh:438 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" -#: git-stash.sh:456 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "Β«$argsΒ» Π½Π΅ ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΎ ΡΠΏΡΡΡΠ°Π½Π½ΡΠΌΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ" -#: git-stash.sh:467 +#: git-stash.sh:477 #, sh-format msgid "'$args' is not a stash reference" msgstr "Β«$argsΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΡΡΠ»ΠΊΠΎΠΉ Π½Π° ΡΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" -#: git-stash.sh:475 +#: git-stash.sh:485 msgid "unable to refresh index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-stash.sh:479 +#: git-stash.sh:489 msgid "Cannot apply a stash in the middle of a merge" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: git-stash.sh:487 +#: git-stash.sh:497 msgid "Conflicts in index. Try without --index." msgstr "ΠΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅. ΠΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Π±Π΅Π· --index." -#: git-stash.sh:489 +#: git-stash.sh:499 msgid "Could not save index tree" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: git-stash.sh:523 +#: git-stash.sh:508 +msgid "Could not restore untracked files from stash" +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠΏΡΡΠ°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: git-stash.sh:533 msgid "Cannot unstage modified files" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΡΠ±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: git-stash.sh:538 +#: git-stash.sh:548 msgid "Index was not unstashed." msgstr "ΠΠ½Π΄Π΅ΠΊΡ Π½Π΅ Π±ΡΠ» ΠΈΠ·Π²Π»Π΅ΡΡΠ½ ΠΈΠ· ΡΠΏΡΡΡΠ°Π½Π½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." -#: git-stash.sh:561 +#: git-stash.sh:562 +msgid "The stash is kept in case you need it again." +msgstr "Π‘ΠΏΡΡΡΠ°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎΡ
ΡΠ°Π½Π΅Π½Ρ, Π½Π° ΡΠ»ΡΡΠ°ΠΉ Π΅ΡΠ»ΠΈ ΠΎΠ½ΠΈ ΡΠ½ΠΎΠ²Π° Π²Π°ΠΌ ΠΏΠΎΠ½Π°Π΄ΠΎΠ±ΡΡΡΡ." + +#: git-stash.sh:571 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "ΠΡΠ±ΡΠΎΡΠ΅Π½ΠΎ ${REV} ($s)" -#: git-stash.sh:562 +#: git-stash.sh:572 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠ±ΡΠΎΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΈΠ· ΡΠΏΡΡΡΠ°Π½Π½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: git-stash.sh:570 +#: git-stash.sh:580 msgid "No branch name specified" msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ" -#: git-stash.sh:642 +#: git-stash.sh:652 msgid "(To restore them type \"git stash apply\")" msgstr "(Π§ΡΠΎΠ±Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΈΡ
, Π½Π°Π±Π΅ΡΠΈΡΠ΅ Β«git stash applyΒ»)" -#: git-submodule.sh:219 +#: git-submodule.sh:184 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "ΠΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΏΡΡΡ ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π½Π°Ρ
ΠΎΠ΄ΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΠ½Π΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: git-submodule.sh:229 +#: git-submodule.sh:194 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ: Β«$repoΒ» Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ Π°Π±ΡΠΎΠ»ΡΡΠ½ΡΠΌ ΠΈΠ»ΠΈ Π½Π°ΡΠΈΠ½Π°ΡΡΡΡ Ρ ./|../" -#: git-submodule.sh:246 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "Β«$sm_pathΒ» ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: git-submodule.sh:250 +#: git-submodule.sh:215 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11850,212 +13147,208 @@ msgid "" "Use -f if you really want to add it." msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ ΠΏΡΡΠΈ ΠΈΠ³Π½ΠΎΡΠΈΡΡΡΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ· Π²Π°ΡΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ² .gitignore:\n$sm_path\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ -f, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΅Π³ΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ." -#: git-submodule.sh:268 +#: git-submodule.sh:233 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "ΠΠΎΠ±Π°Π²Π»ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΈΠ· Β«$sm_pathΒ» Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-submodule.sh:270 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "Β«$sm_pathΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ git" -#: git-submodule.sh:278 +#: git-submodule.sh:243 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ git Π΄Π»Ρ Β«$sm_nameΒ» Π½Π°ΠΉΠ΄Π΅Π½ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎ Π½Π° Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡΡ
:" -#: git-submodule.sh:280 +#: git-submodule.sh:245 #, sh-format msgid "" -"If you want to reuse this local git directory instead of cloning again from" -msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΠ΅ΡΠ΅ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π²ΠΌΠ΅ΡΡΠΎ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ·" +"If you want to reuse this local git directory instead of cloning again from\n" +" $realrepo\n" +"use the '--force' option. If the local git directory is not the correct repo\n" +"or you are unsure what this means choose another name with the '--name' option." +msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π²ΠΌΠ΅ΡΡΠΎ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ·\n $realrepo\nΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Β«--forceΒ». ΠΡΠ»ΠΈ ΠΆΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π½ΡΠΆΠ½ΡΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ ΠΈΠ»ΠΈ Π΅ΡΠ»ΠΈ Π²Ρ Π½Π΅ ΡΠ²Π΅ΡΠ΅Π½Ρ, ΡΡΠΎ ΡΡΠΎ Π·Π½Π°ΡΠΈΡ, ΡΠΎ ΡΠΊΠ°ΠΆΠΈΡΠ΅ Π΄ΡΡΠ³ΠΎΠ΅ ΠΈΠΌΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° Β«--nameΒ»." -#: git-submodule.sh:282 -#, sh-format -msgid "" -"use the '--force' option. If the local git directory is not the correct repo" -msgstr ", ΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ Β«--forceΒ». ΠΡΠ»ΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ" - -#: git-submodule.sh:283 -#, sh-format -msgid "" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "ΠΈΠ»ΠΈ Π΅ΡΠ»ΠΈ Π²Ρ Π½Π΅ ΠΏΠΎΠ½ΡΠ»ΠΈ, ΡΡΠΎ ΡΡΠΎ Π·Π½Π°ΡΠΈΡ, ΡΠΎ ΠΏΡΠΎΡΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π΄ΡΡΠ³ΠΎΠ΅ ΠΈΠΌΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΎΠΏΡΠΈΠΈ Β«--nameΒ»." - -#: git-submodule.sh:285 +#: git-submodule.sh:251 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° git Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_nameΒ»." -#: git-submodule.sh:297 +#: git-submodule.sh:263 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_pathΒ»" -#: git-submodule.sh:302 +#: git-submodule.sh:268 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Π‘Π±ΠΎΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_pathΒ»" -#: git-submodule.sh:311 +#: git-submodule.sh:277 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_pathΒ»" -#: git-submodule.sh:355 +#: git-submodule.sh:324 #, sh-format msgid "Entering '$displaypath'" msgstr "ΠΠ°Ρ
ΠΎΠ΄ΠΈΠΌ Π² Β«$displaypathΒ»" -#: git-submodule.sh:375 +#: git-submodule.sh:344 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "ΠΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅ΠΌΡΡ Π½Π° Β«$displaypathΒ»; ΡΡΠ΅Π½Π°ΡΠΈΠΉ Π²Π΅ΡΠ½ΡΠ» Π½Π΅ Π½ΡΠ»Π΅Π²ΠΎΠΉ ΠΊΠΎΠ΄ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°." -#: git-submodule.sh:448 +#: git-submodule.sh:415 #, sh-format msgid "pathspec and --all are incompatible" msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ ΠΈ --all Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: git-submodule.sh:453 +#: git-submodule.sh:420 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«--allΒ», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΄Π΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" -#: git-submodule.sh:470 -#, sh-format -msgid "Submodule work tree '$displaypath' contains a .git directory" -msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ .git" - -#: git-submodule.sh:471 +#: git-submodule.sh:440 #, sh-format msgid "" +"Submodule work tree '$displaypath' contains a .git directory\n" "(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«rm -rfΒ», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ Π΅Π³ΠΎ, Π²ΠΊΠ»ΡΡΠ°Ρ Π²ΡΡ Π΅Π³ΠΎ ΠΈΡΡΠΎΡΠΈΡ)" +msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ» ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ .git\n(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«rm -rfΒ», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ Π΅Π³ΠΎ ΡΠΎ Π²ΡΠ΅ΠΉ ΠΈΡΡΠΎΡΠΈΠ΅ΠΉ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ)" -#: git-submodule.sh:477 +#: git-submodule.sh:448 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to" " discard them" msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«-fΒ», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΡ
" -#: git-submodule.sh:480 +#: git-submodule.sh:451 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "ΠΡΠΈΡΠ΅Π½ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«$displaypathΒ»" -#: git-submodule.sh:481 +#: git-submodule.sh:452 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" -#: git-submodule.sh:484 +#: git-submodule.sh:455 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΏΡΡΡΠΎΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" -#: git-submodule.sh:493 +#: git-submodule.sh:464 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$nameΒ» ($url) Π±ΡΠ» ΡΠ½ΡΡ Ρ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:635 +#: git-submodule.sh:617 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:644 +#: git-submodule.sh:627 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$sm_pathΒ»" -#: git-submodule.sh:667 +#: git-submodule.sh:632 +#, sh-format +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ ${remote_name}/${branch} Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$sm_pathΒ»" + +#: git-submodule.sh:650 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:680 +#: git-submodule.sh:656 +#, sh-format +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "ΠΠΎΠ»ΡΡΠ΅Π½ ΠΏΠΎ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ», Π½ΠΎ Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ $sha1. Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΠΏΡΡΠΌΠΎΠΌ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°." + +#: git-submodule.sh:663 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Β«$sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:681 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: Π·Π°Π±ΡΠ°Π½ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Β«$sha1Β»" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ Β«$sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:686 +#: git-submodule.sh:669 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ Π½Π°Π΄ Β«$sha1Β»" -#: git-submodule.sh:691 +#: git-submodule.sh:674 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ Β«$sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:692 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: ΡΠ»ΠΈΡΠΎ Ρ Β«$sha1Β»" -#: git-submodule.sh:697 +#: git-submodule.sh:680 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "Π‘Π±ΠΎΠΉ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Β«$command $sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:698 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: Β«$command $sha1Β»" -#: git-submodule.sh:729 +#: git-submodule.sh:712 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:837 +#: git-submodule.sh:820 msgid "The --cached option cannot be used with the --files option" msgstr "ΠΠΏΡΠΈΡ --cached Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --files" -#: git-submodule.sh:889 +#: git-submodule.sh:872 #, sh-format msgid "unexpected mode $mod_dst" msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ $mod_dst" -#: git-submodule.sh:909 +#: git-submodule.sh:892 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡ $sha1_src" -#: git-submodule.sh:912 +#: git-submodule.sh:895 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡ $sha1_dst" -#: git-submodule.sh:915 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΡ $sha1_src ΠΈ $sha1_dst" -#: git-submodule.sh:940 -msgid "blob" -msgstr "Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ" - -#: git-submodule.sh:1059 +#: git-submodule.sh:1045 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$sm_pathΒ»" -#: git-submodule.sh:1123 +#: git-submodule.sh:1112 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Π‘ΠΈΠ½Ρ
ΡΠΎΠ½ΠΈΠ·Π°ΡΠΈΡ url Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" @@ -12064,3 +13357,395 @@ msgstr "Π‘ΠΈΠ½Ρ
ΡΠΎΠ½ΠΈΠ·Π°ΡΠΈΡ url Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ #, sh-format msgid "See git-${cmd}(1) for details." msgstr "ΠΠ»Ρ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ, ΡΠΌΠΎΡΡΠΈΡΠ΅ git-${cmd}(1)." + +#: git-rebase--interactive.sh:140 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ($new_count/$total)" + +#: git-rebase--interactive.sh:156 +msgid "" +"\n" +"Commands:\n" +" p, pick = use commit\n" +" r, reword = use commit, but edit the commit message\n" +" e, edit = use commit, but stop for amending\n" +" s, squash = use commit, but meld into previous commit\n" +" f, fixup = like \"squash\", but discard this commit's log message\n" +" x, exec = run command (the rest of the line) using shell\n" +" d, drop = remove commit\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "\nΠΠΎΠΌΠ°Π½Π΄Ρ:\n p, pick = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ\n r, reword = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n e, edit = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡΡΡ Π΄Π»Ρ Π²Π½Π΅ΡΠ΅Π½ΠΈΡ ΠΏΡΠ°Π²ΠΎΠΊ\n s, squash = ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½ΠΈΡΡ Π΅Π³ΠΎ Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ\n f, fixup = ΠΊΠ°ΠΊ Β«squashΒ», Π½ΠΎ ΠΎΡΠ±ΡΠΎΡΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΡΡΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n x, exec = Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ (ΠΎΡΡΠ°ΡΠΎΠΊ ΡΡΡΠΎΠΊΠΈ) Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΠΎΠ±ΠΎΠ»ΠΎΡΠΊΠΈ\n d, drop = ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ\n\nΠΡΠΈ ΡΡΡΠΎΠΊΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½Ρ; Π²ΡΠΏΠΎΠ»Π½ΡΡΡΡΡ ΠΏΠΎ ΠΎΡΠ΅ΡΠ΅Π΄ΠΈ ΡΠ²Π΅ΡΡ
Ρ Π²Π½ΠΈΠ·.\n" + +#: git-rebase--interactive.sh:171 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "\nΠΠ΅ ΡΠ΄Π°Π»ΡΠΉΡΠ΅ ΡΡΡΠΎΠΊΠΈ. ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«dropΒ», ΡΡΠΎΠ±Ρ ΡΠ²Π½ΠΎ ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ.\n" + +#: git-rebase--interactive.sh:175 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "\nΠΡΠ»ΠΈ Π²Ρ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΡΡΠΎΠΊΡ Π·Π΄Π΅ΡΡ, ΡΠΎ Π£ΠΠΠΠΠΠΠ«Π ΠΠΠΠΠΠ’ ΠΠ£ΠΠΠ’ Π£Π’ΠΠ Π―Π.\n" + +#: git-rebase--interactive.sh:211 +#, sh-format +msgid "" +"You can amend the commit now, with\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +"\tgit rebase --continue" +msgstr "Π’Π΅ΠΏΠ΅ΡΡ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ\n\n\tgit commit --amend $gpg_sign_opt_quoted\n\nΠΠ°ΠΊ ΡΠΎΠ»ΡΠΊΠΎ Π²Ρ Π±ΡΠ΄Π΅ΡΠ΅ Π΄ΠΎΠ²ΠΎΠ»ΡΠ½Ρ ΡΠ΅Π·ΡΠ»ΡΡΠ°ΡΠΎΠΌ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅\n\n\tgit rebase --continue" + +#: git-rebase--interactive.sh:236 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1: Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΠΊΠΎΡΠΎΡΡΠΉ ΠΌΠΎΠΆΠ½ΠΎ Π²Π·ΡΡΡ" + +#: git-rebase--interactive.sh:275 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°: $sha1" + +#: git-rebase--interactive.sh:317 +msgid "Cannot write current commit's replacement sha1" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π·Π°ΠΌΠ΅Π½Ρ sha1 ΡΠ΅ΠΊΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" + +#: git-rebase--interactive.sh:369 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π΄ΠΎ $sha1" + +#: git-rebase--interactive.sh:371 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°ΡΡ Π²ΠΏΠ΅ΡΠ΅Π΄ Π΄ΠΎ $sha1" + +#: git-rebase--interactive.sh:380 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ HEAD Π½Π° $first_parent" + +#: git-rebase--interactive.sh:385 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠΏΠ»ΠΎΡΠ½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅: $sha1" + +#: git-rebase--interactive.sh:399 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΠ²ΡΠΎΡΠ΅Π½ΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ $sha1" + +#: git-rebase--interactive.sh:407 +#, sh-format +msgid "Could not pick $sha1" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²Π·ΡΡΡ $sha1" + +#: git-rebase--interactive.sh:416 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "ΠΡΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½ΠΎΠΌΠ΅Ρ #${n}:" + +#: git-rebase--interactive.sh:421 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½ΠΎΠΌΠ΅Ρ #${n} Π±ΡΠ΄Π΅Ρ ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ:" + +#: git-rebase--interactive.sh:432 +#, sh-format +msgid "This is a combination of $count commit." +msgid_plural "This is a combination of $count commits." +msgstr[0] "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ $count ΠΊΠΎΠΌΠΌΠΈΡΠ°" +msgstr[1] "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ $count ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" +msgstr[2] "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ $count ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" +msgstr[3] "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ $count ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" + +#: git-rebase--interactive.sh:440 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ $fixup_msg" + +#: git-rebase--interactive.sh:443 +msgid "This is a combination of 2 commits." +msgstr "ΠΡΠΎ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅ 2 ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" + +#: git-rebase--interactive.sh:444 +msgid "This is the 1st commit message:" +msgstr "ΠΡΠΎ 1-Π΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" + +#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527 +#: git-rebase--interactive.sh:530 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ $sha1β¦ $rest" + +#: git-rebase--interactive.sh:558 +#, sh-format +msgid "" +"Could not amend commit after successfully picking $sha1... $rest\n" +"This is most likely due to an empty commit message, or the pre-commit hook\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue before\n" +"you are able to reword the commit." +msgstr "ΠΠ΅ ΡΠ΄ΠΎΠ»ΠΎΡΡ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΏΠ΅ΡΠ½ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄Π° Π½Π° $sha1β¦ $rest\nΠΡΠΎ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»ΠΎ, ΡΠΊΠΎΡΠ΅Π΅ Π²ΡΠ΅Π³ΠΎ, ΠΈΠ·-Π·Π° ΠΏΡΡΡΠΎΠ³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° ΠΈΠ»ΠΈ ΠΈΠ·-Π·Π° ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ. ΠΡΠ»ΠΈ ΠΆΠ΅ ΡΡΠΎ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»ΠΎ ΠΈΠ·-Π·Π° ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΡΠΎ Π²Π°ΠΌ Π½ΡΠΆΠ½ΠΎ ΡΠ΅ΡΠΈΡΡ Ρ Π½ΠΈΠΌ ΠΏΡΠΎΠ±Π»Π΅ΠΌΡ ΠΈ ΠΏΠΎΠ²ΡΠΎΡΠΈΡΡ ΠΏΠΎΠΏΡΡΠΊΡ ΡΠ½ΠΎΠ²Π°." + +#: git-rebase--interactive.sh:573 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "ΠΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΎ Π½Π° $sha1_abbrevβ¦ $rest" + +#: git-rebase--interactive.sh:588 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ΄Π΅Π»Π°ΡΡ Β«$squash_styleΒ» Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" + +#: git-rebase--interactive.sh:630 +#, sh-format +msgid "Executing: $rest" +msgstr "ΠΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅: $rest" + +#: git-rebase--interactive.sh:638 +#, sh-format +msgid "Execution failed: $rest" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ: $rest" + +#: git-rebase--interactive.sh:640 +msgid "and made changes to the index and/or the working tree" +msgstr "ΠΈ Π±ΡΠ»ΠΈ ΡΠ΄Π΅Π»Π°Π½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΈ/ΠΈΠ»ΠΈ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" + +#: git-rebase--interactive.sh:642 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "ΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΎΡΠΈΠ±ΠΊΡ, Π° Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΡ\n\n\tgit rebase --continue" + +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--interactive.sh:655 +#, sh-format +msgid "" +"Execution succeeded: $rest\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "Π£ΡΠΏΠ΅ΡΠ½ΠΎΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅: $rest\nΠ½ΠΎ ΠΎΡΡΠ°Π»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΈ/ΠΈΠ»ΠΈ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅\nΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, Π° Π·Π°ΡΠ΅ΠΌ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅\n\n\tgit rebase --continue" + +#: git-rebase--interactive.sh:666 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "ΠΠ΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°: $command $sha1 $rest" + +#: git-rebase--interactive.sh:667 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ° ΠΈΡΠΏΡΠ°Π²ΡΡΠ΅ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git rebase --edit-todoΒ»." + +#: git-rebase--interactive.sh:702 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "Π£ΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΠ΅ΡΠ΅Π±Π°Π·ΠΈΡΠΎΠ²Π°Π½ ΠΈ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ½ $head_name." + +#: git-rebase--interactive.sh:749 +msgid "Could not skip unnecessary pick commands" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ Π½Π΅Π½ΡΠΆΠ½ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ ΠΎΡΠ±ΠΎΡΠ° (pick)" + +#: git-rebase--interactive.sh:907 +#, sh-format +msgid "" +"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +" - $line" +msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅: Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ SHA-1 ΠΈΠ»ΠΈ ΠΎΠ½ Π½Π΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ. ΠΠ° ΡΡΡΠΎΠΊΠ΅:\n - $line" + +#: git-rebase--interactive.sh:940 +#, sh-format +msgid "" +"Warning: the command isn't recognized in the following line:\n" +" - $line" +msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅: ΠΊΠΎΠΌΠ°Π½Π΄Π° Π½Π΅ ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π° Π½Π° ΡΡΡΠΎΠΊΠ΅:\n - $line" + +#: git-rebase--interactive.sh:979 +msgid "could not detach HEAD" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠ΄Π΅Π»ΠΈΡΡ HEAD" + +#: git-rebase--interactive.sh:1017 +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):" +msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅: Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ ΠΌΠΎΠ³Π»ΠΈ Π±ΡΡΡ ΠΎΡΠ±ΡΠΎΡΠ΅Π½Ρ ΠΏΠΎ ΠΎΡΠΈΠ±ΠΊΠ΅.\nΠΡΠ±ΡΠΎΡΠ΅Π½Π½ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ (ΠΎΡ Π½ΠΎΠ²ΡΡ
ΠΊ ΡΡΠ°ΡΡΠΌ):" + +#: git-rebase--interactive.sh:1025 +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n" +"The possible behaviours are: ignore, warn, error." +msgstr "ΠΠ»Ρ ΠΈΠ·Π±Π΅ΠΆΠ°Π½ΠΈΡ ΡΡΠΎΠ³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«dropΒ» ΡΡΠΎΠ±Ρ ΡΠ²Π½ΠΎ ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ.\n\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ Β«git config rebase.missingCommitsCheckΒ» Π΄Π»Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Π° ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠΉ.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ: ignore, warn, error." + +#: git-rebase--interactive.sh:1036 +#, sh-format +msgid "" +"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " +"Ignoring." +msgstr "ΠΠ΅ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ Π½Π°ΡΡΡΠΎΠΉΠΊΠ° $check_level Π΄Π»Ρ ΠΎΠΏΡΠΈΠΈ rebase.missingCommitsCheck. ΠΠ³Π½ΠΎΡΠΈΡΡΡ." + +#: git-rebase--interactive.sh:1053 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase " +"--continue'." +msgstr "ΠΡ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git rebase --edit-todoΒ», Π° ΠΏΠΎΡΠΎΠΌ Π·Π°ΠΏΡΡΡΠΈΠ² Β«git rebase --continueΒ»." + +#: git-rebase--interactive.sh:1054 +msgid "Or you can abort the rebase with 'git rebase --abort'." +msgstr "ΠΠ»ΠΈ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΏΡΠΎΡΠ΅ΡΡ ΠΏΠ΅ΡΠ΅Π±Π°Π·ΠΈΡΠΎΠ²Π°Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git rebase --abortΒ»." + +#: git-rebase--interactive.sh:1078 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ CHERRY_PICK_HEAD" + +#: git-rebase--interactive.sh:1083 +#, sh-format +msgid "" +"You have staged changes in your working tree.\n" +"If these changes are meant to be\n" +"squashed into the previous commit, run:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "Π£ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅.\nΠΡΠ»ΠΈ ΡΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΎΠ±ΡΠ΅Π΄Π΅Π½Π΅Π½Ρ Ρ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit --amend $gpg_sign_opt_quoted\n\nΠΡΠ»ΠΈ ΠΆΠ΅ ΠΎΠ½ΠΈ Π΄ΠΎΠ»ΠΆΠ½Ρ Π±ΡΡΡ ΠΏΠΎΠΌΠ΅ΡΠ΅Π½Ρ Π² Π½ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n\n git commit $gpg_sign_opt_quoted\n\nΠ Π»ΡΠ±ΠΎΠΌ ΡΠ»ΡΡΠ°Π΅, ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ³ΠΎ ΠΊΠ°ΠΊ Π²Ρ Π·Π°ΠΊΠΎΠ½ΡΠΈΡΠ΅, ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΌΠΎΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΠ²:\n\n git rebase --continue\n" + +#: git-rebase--interactive.sh:1100 +msgid "Error trying to find the author identity to amend commit" +msgstr "ΠΡΠΎΠΈΠ·ΠΎΡΠ»Π° ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ Π°Π²ΡΠΎΡΠ° Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" + +#: git-rebase--interactive.sh:1105 +msgid "" +"You have uncommitted changes in your working tree. Please commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "Π£ Π²Π°Ρ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅. Π‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ, Π° Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git rebase --continueΒ» ΡΠ½ΠΎΠ²Π°." + +#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114 +msgid "Could not commit staged changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-rebase--interactive.sh:1138 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "\nΠΡ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΡΠ΅ΡΠ΅ ΡΠ°ΠΉΠ» ΡΠΎ ΡΠΏΠΈΡΠΊΠΎΠΌ Π΄Π΅Π» Π΄Π»Ρ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ.\nΠΠ»Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ, ΠΏΠΎΡΠ»Π΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° Π·Π°ΠΏΡΡΡΠΈΡΠ΅:\n git rebase --continue\n\n" + +#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304 +msgid "Could not execute editor" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΎΡ" + +#: git-rebase--interactive.sh:1159 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π²Π΅ΡΡΠΈΡ $switch_to" + +#: git-rebase--interactive.sh:1164 +msgid "No HEAD?" +msgstr "ΠΠ΅Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ HEAD?" + +#: git-rebase--interactive.sh:1165 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ $state_dir" + +#: git-rebase--interactive.sh:1167 +msgid "Could not mark as interactive" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΠΊΠ°ΠΊ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ" + +#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182 +msgid "Could not init rewritten commits" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ" + +#: git-rebase--interactive.sh:1282 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ $shortrevisions Π½Π°Π΄ $shortonto ($todocount ΠΊΠΎΠΌΠ°Π½Π΄Π°)" +msgstr[1] "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ $shortrevisions Π½Π°Π΄ $shortonto ($todocount ΠΊΠΎΠΌΠ°Π½Π΄Ρ)" +msgstr[2] "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ $shortrevisions Π½Π°Π΄ $shortonto ($todocount ΠΊΠΎΠΌΠ°Π½Π΄)" +msgstr[3] "ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ $shortrevisions Π½Π°Π΄ $shortonto ($todocount ΠΊΠΎΠΌΠ°Π½Π΄)" + +#: git-rebase--interactive.sh:1287 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "\nΠΠΎ Π΅ΡΠ»ΠΈ Π²Ρ ΡΠ΄Π°Π»ΠΈΡΠ΅ Π²ΡΠ΅, ΡΠΎ ΠΏΡΠΎΡΠ΅ΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ Π±ΡΠ΄Π΅Ρ Π±ΡΠ΄Π΅Ρ ΠΏΡΠ΅ΡΠ²Π°Π½.\n\n" + +#: git-rebase--interactive.sh:1294 +msgid "Note that empty commits are commented out" +msgstr "ΠΠ°ΠΌΠ΅ΡΡΡΠ΅, ΡΡΠΎ ΠΏΡΡΡΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠ΅Π½ΡΠΈΡΠΎΠ²Π°Π½Π½Ρ" + +#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅: $dashless $USAGE" + +#: git-sh-setup.sh:190 +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ chdir Π² $cdup, Π²Π΅ΡΡΠΈΠ½Ρ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" + +#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°: $program_name Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π½Π΅ ΠΈΠΌΠ΅Ρ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°." + +#: git-sh-setup.sh:220 +msgid "Cannot rebase: You have unstaged changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:223 +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ Π²Π΅ΡΠΎΠΊ: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:229 +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ $action: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:242 +msgid "Cannot rebase: Your index contains uncommitted changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:248 +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ $action: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "Π ΡΠΎΠΌΡ ΠΆΠ΅, Π² Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." + +#: git-sh-setup.sh:372 +msgid "You need to run this command from the toplevel of the working tree." +msgstr "ΠΠ°ΠΌ Π½ΡΠΆΠ½ΠΎ Π·Π°ΠΏΡΡΠΊΠ°ΡΡ ΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Π½Π°Ρ
ΠΎΠ΄ΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΠ½Π΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°." + +#: git-sh-setup.sh:377 +msgid "Unable to determine absolute path of git directory" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π°Π±ΡΠΎΠ»ΡΡΠ½ΡΠΉ ΠΏΡΡΡ ΠΊ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Ρ git" |