diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2012-07-30 06:24:47 +0400 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2012-07-30 06:24:47 +0400 |
commit | 0bbe5b483df990a85183b29c29db7a96071e87a6 (patch) | |
tree | aa2581d499a0cf9632e075495a2bc37082021dbc /po | |
parent | 9e2116adbe192f3090785bdf3412bf7e3e2767b7 (diff) |
l10n: Update git.pot (4 new, 3 removed messages)
Generate po/git.pot from v1.7.12-rc0-54-g9e211, and there are 4 new,
3 removed l10n messages.
* 4 new messages are added at lines:
1254, 1264, 1459, 1523
* 3 old messages are deleted from the previous version at lines:
1254, 1273, 2854
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po')
-rw-r--r-- | po/git.pot | 953 |
1 files changed, 478 insertions, 475 deletions
diff --git a/po/git.pot b/po/git.pot index 3d9ae759ea..6f22d43af2 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-07-03 10:23+0800\n" +"POT-Creation-Date: 2012-07-30 09:18+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,7 +45,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:696 +#: bundle.c:89 builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "" @@ -55,7 +55,7 @@ msgid "Repository lacks these prerequisite commits:" msgstr "" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347 +#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" @@ -82,7 +82,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -250,7 +250,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] "" msgstr[1] "" -#: diff.c:3478 +#: diff.c:3461 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -284,44 +284,44 @@ msgstr "" msgid "'%s': short read %s" msgstr "" -#: help.c:208 +#: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:215 +#: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:271 +#: help.c:275 #, 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 "" -#: help.c:328 +#: help.c:332 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:350 +#: help.c:354 #, 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 "" -#: help.c:355 +#: help.c:359 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:362 +#: help.c:366 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:366 +#: help.c:370 msgid "" "\n" "Did you mean this?" @@ -331,35 +331,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: parse-options.c:493 +#: parse-options.c:494 msgid "..." msgstr "" -#: parse-options.c:511 +#: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:516 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:518 +#: parse-options.c:519 #, c-format msgid " %s" msgstr "" -#: remote.c:1629 +#: remote.c:1632 #, 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" msgstr[0] "" msgstr[1] "" -#: remote.c:1635 +#: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -367,7 +367,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1643 +#: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -582,7 +582,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:805 builtin/apply.c:3697 +#: sequencer.c:805 builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "" @@ -614,21 +614,21 @@ msgstr "" msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:864 +#: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:867 +#: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:869 +#: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:872 +#: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -642,333 +642,333 @@ msgstr "" msgid "no such user" msgstr "" -#: wt-status.c:141 +#: wt-status.c:140 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:168 wt-status.c:195 +#: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:170 wt-status.c:197 +#: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:174 +#: wt-status.c:173 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:176 wt-status.c:180 +#: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:178 +#: wt-status.c:177 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:189 +#: wt-status.c:188 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:207 +#: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:211 +#: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:213 +#: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:214 +#: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:216 +#: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:225 +#: wt-status.c:224 #, c-format msgid "%s files:" msgstr "" -#: wt-status.c:228 +#: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:245 +#: wt-status.c:244 msgid "bug" msgstr "" -#: wt-status.c:250 +#: wt-status.c:249 msgid "both deleted:" msgstr "" -#: wt-status.c:251 +#: wt-status.c:250 msgid "added by us:" msgstr "" -#: wt-status.c:252 +#: wt-status.c:251 msgid "deleted by them:" msgstr "" -#: wt-status.c:253 +#: wt-status.c:252 msgid "added by them:" msgstr "" -#: wt-status.c:254 +#: wt-status.c:253 msgid "deleted by us:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:254 msgid "both added:" msgstr "" -#: wt-status.c:256 +#: wt-status.c:255 msgid "both modified:" msgstr "" -#: wt-status.c:286 +#: wt-status.c:285 msgid "new commits, " msgstr "" -#: wt-status.c:288 +#: wt-status.c:287 msgid "modified content, " msgstr "" -#: wt-status.c:290 +#: wt-status.c:289 msgid "untracked content, " msgstr "" -#: wt-status.c:304 +#: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:307 +#: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:310 +#: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:313 +#: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:316 +#: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:319 +#: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:322 +#: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:325 +#: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:328 +#: wt-status.c:327 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:786 +#: wt-status.c:785 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:789 wt-status.c:913 +#: wt-status.c:788 wt-status.c:912 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:792 +#: wt-status.c:791 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:795 +#: wt-status.c:794 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:805 +#: wt-status.c:804 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:808 +#: wt-status.c:807 msgid "The current patch is empty." msgstr "" -#: wt-status.c:812 +#: wt-status.c:811 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr "" -#: wt-status.c:814 +#: wt-status.c:813 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:816 +#: wt-status.c:815 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:874 wt-status.c:884 +#: wt-status.c:873 wt-status.c:883 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:877 +#: wt-status.c:876 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:879 +#: wt-status.c:878 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:881 +#: wt-status.c:880 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:887 +#: wt-status.c:886 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:889 +#: wt-status.c:888 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:892 +#: wt-status.c:891 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:894 +#: wt-status.c:893 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:897 +#: wt-status.c:896 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:899 +#: wt-status.c:898 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:909 +#: wt-status.c:908 msgid "You are currently cherry-picking." msgstr "" -#: wt-status.c:916 +#: wt-status.c:915 msgid " (all conflicts fixed: run \"git commit\")" msgstr "" -#: wt-status.c:925 +#: wt-status.c:924 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:928 +#: wt-status.c:927 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:979 +#: wt-status.c:978 msgid "On branch " msgstr "" -#: wt-status.c:986 +#: wt-status.c:985 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:998 +#: wt-status.c:997 msgid "Initial commit" msgstr "" -#: wt-status.c:1012 +#: wt-status.c:1011 msgid "Untracked" msgstr "" -#: wt-status.c:1014 +#: wt-status.c:1013 msgid "Ignored" msgstr "" -#: wt-status.c:1016 +#: wt-status.c:1015 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1018 +#: wt-status.c:1017 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1024 +#: wt-status.c:1023 msgid "No changes" msgstr "" -#: wt-status.c:1028 +#: wt-status.c:1027 #, c-format msgid "no changes added to commit%s\n" msgstr "" -#: wt-status.c:1030 +#: wt-status.c:1029 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "" -#: wt-status.c:1032 +#: wt-status.c:1031 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" -#: wt-status.c:1034 +#: wt-status.c:1033 msgid " (use \"git add\" to track)" msgstr "" -#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "" -#: wt-status.c:1037 +#: wt-status.c:1036 msgid " (create/copy files and use \"git add\" to track)" msgstr "" -#: wt-status.c:1040 +#: wt-status.c:1039 msgid " (use -u to show untracked files)" msgstr "" -#: wt-status.c:1043 +#: wt-status.c:1042 msgid " (working directory clean)" msgstr "" -#: wt-status.c:1151 +#: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1157 +#: wt-status.c:1156 msgid "Initial commit on " msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1171 msgid "behind " msgstr "" -#: wt-status.c:1175 wt-status.c:1178 +#: wt-status.c:1174 wt-status.c:1177 msgid "ahead " msgstr "" -#: wt-status.c:1180 +#: wt-status.c:1179 msgid ", behind " msgstr "" @@ -977,7 +977,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:226 +#: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "" @@ -1067,75 +1067,75 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "" -#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:815 +#: builtin/apply.c:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:824 +#: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:905 +#: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:937 +#: builtin/apply.c:946 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:941 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:942 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:949 +#: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1394 +#: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1451 +#: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1468 +#: builtin/apply.c:1477 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1146,395 +1146,403 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1628 +#: builtin/apply.c:1637 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1630 +#: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1656 +#: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1692 +#: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1694 +#: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1697 +#: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1843 +#: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1958 +#: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2048 +#: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2052 +#: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2123 +#: builtin/apply.c:2132 msgid "oops" msgstr "" -#: builtin/apply.c:2645 +#: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2763 +#: builtin/apply.c:2772 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2775 +#: builtin/apply.c:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2781 +#: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2800 +#: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2903 +#: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2909 +#: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2930 +#: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3045 +#: builtin/apply.c:3061 #, c-format -msgid "patch %s has been renamed/deleted" +msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3052 builtin/apply.c:3069 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3139 builtin/apply.c:3361 #, c-format -msgid "%s: already exists in working directory" +msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3143 +#: builtin/apply.c:3220 builtin/apply.c:3375 #, c-format -msgid "%s: has been deleted/renamed" +msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3148 builtin/apply.c:3179 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3159 +#: builtin/apply.c:3229 builtin/apply.c:3383 #, c-format -msgid "%s: does not exist in index" +msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3173 -#, c-format -msgid "%s: does not match index" +#: builtin/apply.c:3331 +msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3190 +#: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3192 +#: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3247 +#: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3267 +#: builtin/apply.c:3506 +#, c-format +msgid "%s: already exists in working directory" +msgstr "" + +#: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3272 +#: builtin/apply.c:3531 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3280 +#: builtin/apply.c:3539 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3293 +#: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3491 +#: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3518 +#: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3522 +#: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3527 +#: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3530 +#: builtin/apply.c:3790 builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3563 +#: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3612 +#: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3668 +#: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3676 +#: builtin/apply.c:3967 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:3970 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3689 +#: builtin/apply.c:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:3710 +#: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:3713 +#: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:3844 +#: builtin/apply.c:4154 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:3855 +#: builtin/apply.c:4165 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:3970 builtin/apply.c:3973 +#: builtin/apply.c:4284 builtin/apply.c:4287 msgid "path" msgstr "" -#: builtin/apply.c:3971 +#: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:3974 +#: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:3976 +#: builtin/apply.c:4290 msgid "num" msgstr "" -#: builtin/apply.c:3977 +#: builtin/apply.c:4291 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:3980 +#: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:3982 +#: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:3986 +#: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:3988 +#: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:3990 +#: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:3992 +#: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:3994 +#: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:3996 +#: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:3998 +#: builtin/apply.c:4312 +msgid "attempt three-way merge if a patch does not apply" +msgstr "" + +#: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4000 +#: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4003 +#: builtin/apply.c:4319 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4004 +#: builtin/apply.c:4320 msgid "action" msgstr "" -#: builtin/apply.c:4005 +#: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4008 builtin/apply.c:4011 +#: builtin/apply.c:4324 builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4014 +#: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4016 +#: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4018 +#: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4020 +#: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4021 +#: builtin/apply.c:4337 msgid "be verbose" msgstr "" -#: builtin/apply.c:4023 +#: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4026 +#: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4028 +#: builtin/apply.c:4344 msgid "root" msgstr "" -#: builtin/apply.c:4029 +#: builtin/apply.c:4345 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4050 +#: builtin/apply.c:4367 +msgid "--3way outside a repository" +msgstr "" + +#: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4053 +#: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4069 +#: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4083 +#: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4089 builtin/apply.c:4099 +#: builtin/apply.c:4414 builtin/apply.c:4424 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1733,7 +1741,7 @@ msgstr "" msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:788 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "" @@ -1758,99 +1766,99 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:131 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:175 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:192 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:209 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:234 builtin/checkout.c:392 +#: builtin/checkout.c:235 builtin/checkout.c:393 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "" -#: builtin/checkout.c:414 +#: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:533 +#: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:566 +#: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:573 +#: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:576 +#: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:580 +#: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:582 +#: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:584 +#: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:640 +#: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:647 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1865,7 +1873,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:664 +#: builtin/checkout.c:665 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1875,96 +1883,96 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:694 +#: builtin/checkout.c:695 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:698 +#: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:724 +#: builtin/checkout.c:725 builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:974 +#: builtin/checkout.c:977 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:983 +#: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:986 +#: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "" -#: builtin/checkout.c:988 +#: builtin/checkout.c:991 msgid "--detach cannot be used with -t" msgstr "" -#: builtin/checkout.c:994 +#: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1001 +#: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" msgstr "" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -2058,78 +2066,78 @@ msgstr "" msgid "done.\n" msgstr "" -#: builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:549 +#: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:639 +#: builtin/clone.c:642 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:643 +#: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:654 +#: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:668 +#: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:673 +#: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:683 +#: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:693 +#: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/clone.c:709 builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:709 +#: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:728 +#: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:730 +#: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:786 +#: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:835 +#: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:842 +#: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "" @@ -2168,93 +2176,93 @@ msgid "" "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:253 +#: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:295 +#: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:301 +#: builtin/commit.c:304 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:386 +#: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:388 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:398 +#: builtin/commit.c:401 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:418 +#: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:493 builtin/commit.c:499 +#: builtin/commit.c:496 builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:522 +#: builtin/commit.c:525 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:585 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:632 builtin/shortlog.c:296 +#: builtin/commit.c:635 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:634 +#: builtin/commit.c:637 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:638 +#: builtin/commit.c:641 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:644 +#: builtin/commit.c:647 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:660 +#: builtin/commit.c:663 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:664 +#: builtin/commit.c:667 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:668 +#: builtin/commit.c:671 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:720 +#: builtin/commit.c:723 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:731 +#: builtin/commit.c:734 #, c-format msgid "" "\n" @@ -2264,7 +2272,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:736 +#: builtin/commit.c:739 #, c-format msgid "" "\n" @@ -2274,171 +2282,171 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:748 +#: builtin/commit.c:751 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:753 +#: builtin/commit.c:756 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:766 +#: builtin/commit.c:769 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:773 +#: builtin/commit.c:776 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:793 +#: builtin/commit.c:796 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:830 +#: builtin/commit.c:833 msgid "Error building trees" msgstr "" -#: builtin/commit.c:845 builtin/tag.c:361 +#: builtin/commit.c:848 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:942 +#: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:957 builtin/commit.c:1157 +#: builtin/commit.c:960 builtin/commit.c:1160 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:997 +#: builtin/commit.c:1000 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1008 +#: builtin/commit.c:1011 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1011 +#: builtin/commit.c:1014 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1013 +#: builtin/commit.c:1016 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1016 +#: builtin/commit.c:1019 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1028 +#: builtin/commit.c:1031 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1036 +#: builtin/commit.c:1039 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1053 +#: builtin/commit.c:1056 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1057 +#: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1059 +#: builtin/commit.c:1062 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1069 builtin/tag.c:577 +#: builtin/commit.c:1072 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1074 +#: builtin/commit.c:1077 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1257 +#: builtin/commit.c:1260 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1259 +#: builtin/commit.c:1262 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1300 +#: builtin/commit.c:1303 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1302 +#: builtin/commit.c:1305 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1446 +#: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1484 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1491 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1531 +#: builtin/commit.c:1534 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1576 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2794,71 +2802,66 @@ msgstr "" msgid "both --cached and trees are given." msgstr "" -#: builtin/help.c:63 +#: builtin/help.c:65 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:215 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:227 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:291 +#: builtin/help.c:299 msgid "The most commonly used git commands are:" msgstr "" -#: builtin/help.c:359 +#: builtin/help.c:367 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:376 +#: builtin/help.c:384 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:384 +#: builtin/help.c:392 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:395 -#, c-format -msgid "'%s': not a documentation directory." -msgstr "" - -#: builtin/help.c:436 builtin/help.c:443 +#: builtin/help.c:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:459 +#: builtin/help.c:470 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" @@ -2932,176 +2935,176 @@ msgstr "" msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:530 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:533 +#: builtin/index-pack.c:532 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:558 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675 -#: builtin/index-pack.c:709 builtin/index-pack.c:718 +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:649 builtin/pack-objects.c:170 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:715 +#: builtin/index-pack.c:718 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:729 +#: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:744 +#: builtin/index-pack.c:747 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:749 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:748 +#: builtin/index-pack.c:751 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:818 builtin/index-pack.c:844 +#: builtin/index-pack.c:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:983 +#: builtin/index-pack.c:986 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:983 +#: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1009 +#: builtin/index-pack.c:1012 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1014 +#: builtin/index-pack.c:1017 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1017 +#: builtin/index-pack.c:1020 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1028 +#: builtin/index-pack.c:1031 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1051 +#: builtin/index-pack.c:1054 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1102 +#: builtin/index-pack.c:1105 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1124 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1149 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1225 +#: builtin/index-pack.c:1228 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1252 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1262 +#: builtin/index-pack.c:1265 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1270 +#: builtin/index-pack.c:1273 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1286 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1294 +#: builtin/index-pack.c:1297 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1398 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1400 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1447 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1451 +#: builtin/index-pack.c:1454 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1481 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1522 builtin/index-pack.c:1525 -#: builtin/index-pack.c:1537 builtin/index-pack.c:1541 +#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1555 +#: builtin/index-pack.c:1558 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1559 builtin/index-pack.c:1569 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1578 +#: builtin/index-pack.c:1581 msgid "--verify with no packfile name given" msgstr "" @@ -3175,22 +3178,22 @@ msgstr "" msgid "insane git directory %s" msgstr "" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "" @@ -3200,49 +3203,49 @@ msgstr "" #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr "" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "" -#: builtin/init-db.c:521 builtin/init-db.c:528 +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "" -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -3252,95 +3255,95 @@ msgstr "" msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:402 builtin/log.c:490 +#: builtin/log.c:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:514 +#: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:603 +#: builtin/log.c:608 msgid "format.headers without value" msgstr "" -#: builtin/log.c:677 +#: builtin/log.c:682 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:688 +#: builtin/log.c:693 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:702 +#: builtin/log.c:707 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:710 +#: builtin/log.c:715 msgid "Not a range." msgstr "" -#: builtin/log.c:787 +#: builtin/log.c:792 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:860 +#: builtin/log.c:865 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:933 +#: builtin/log.c:938 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1154 +#: builtin/log.c:1160 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1199 +#: builtin/log.c:1205 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1201 +#: builtin/log.c:1207 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1209 +#: builtin/log.c:1215 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1211 +#: builtin/log.c:1217 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1213 +#: builtin/log.c:1219 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1242 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1238 +#: builtin/log.c:1244 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1391 +#: builtin/log.c:1397 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1495 +#: builtin/log.c:1501 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 #, c-format msgid "Unknown commit %s" msgstr "" @@ -4379,30 +4382,30 @@ msgstr "" msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:297 +#: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:302 +#: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:311 +#: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:313 +#: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:325 +#: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:341 +#: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" @@ -4778,7 +4781,7 @@ msgstr "" msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:671 +#: git-am.sh:683 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -4786,53 +4789,53 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:708 +#: git-am.sh:710 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:755 +#: git-am.sh:757 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:759 +#: git-am.sh:761 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. -#: git-am.sh:766 +#: git-am.sh:768 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:802 +#: git-am.sh:804 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:823 +#: git-am.sh:825 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-am.sh:831 +#: git-am.sh:833 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:847 +#: git-am.sh:849 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:857 +#: git-am.sh:859 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:873 +#: git-am.sh:880 msgid "applying to an empty history" msgstr "" @@ -5152,27 +5155,27 @@ msgstr "" msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:186 +#: git-submodule.sh:189 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:196 +#: git-submodule.sh:201 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:285 +#: git-submodule.sh:290 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:302 +#: git-submodule.sh:307 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:306 +#: git-submodule.sh:311 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5180,155 +5183,155 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:317 +#: git-submodule.sh:322 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:319 +#: git-submodule.sh:324 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:333 +#: git-submodule.sh:338 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:338 +#: git-submodule.sh:343 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:343 +#: git-submodule.sh:348 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:385 +#: git-submodule.sh:390 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:399 +#: git-submodule.sh:404 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:442 +#: git-submodule.sh:447 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:451 +#: git-submodule.sh:456 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:453 +#: git-submodule.sh:458 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:461 +#: git-submodule.sh:466 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:560 +#: git-submodule.sh:565 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:578 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:592 +#: git-submodule.sh:597 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:606 +#: git-submodule.sh:611 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:607 +#: git-submodule.sh:612 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:612 +#: git-submodule.sh:617 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:613 +#: git-submodule.sh:618 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:618 +#: git-submodule.sh:623 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:624 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:641 git-submodule.sh:964 +#: git-submodule.sh:646 git-submodule.sh:969 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:749 +#: git-submodule.sh:754 msgid "--cached cannot be used with --files" msgstr "" #. unexpected type -#: git-submodule.sh:789 +#: git-submodule.sh:794 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:807 +#: git-submodule.sh:812 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:810 +#: git-submodule.sh:815 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:813 +#: git-submodule.sh:818 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:838 +#: git-submodule.sh:843 msgid "blob" msgstr "" -#: git-submodule.sh:839 +#: git-submodule.sh:844 msgid "submodule" msgstr "" -#: git-submodule.sh:876 +#: git-submodule.sh:881 msgid "# Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:878 +#: git-submodule.sh:883 msgid "# Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:1022 +#: git-submodule.sh:1027 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "" |