mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 04:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

l10n: Update git.pot (5 new, 1 removed messages)

Browse Source 
L10n for git 1.8.1 round 2: Generate po/git.pot from v1.8.0.1-347-gf94c3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin 2012-11-30 12:41:47 +08:00
parent f94c3251e1
commit f9472e359e
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
po/git.pot
View File

@ -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-11-23 14:27+0800\n"
"POT-Creation-Date: 2012-11-30 12:40+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"
@ -309,20 +309,30 @@ msgstr ""
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
#: diff.c:219
#: diff.c:194
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
#: diff.c:237
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
#: diff.c:3467
#: diff.c:3494
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
#: diff.c:3508
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
#: gpg-interface.c:59
msgid "could not run gpg."
msgstr ""
@ -680,7 +690,11 @@ msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
#: remote.c:1638
#: remote.c:1637
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
#: remote.c:1640
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@ -688,7 +702,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
#: remote.c:1646
#: remote.c:1647
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
#: remote.c:1650
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@ -699,6 +717,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
#: remote.c:1659
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
#: builtin/merge.c:994
#, c-format
@ -1332,7 +1354,7 @@ msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:260
#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
@ -1461,7 +1483,7 @@ msgstr ""
msgid "index file corrupt"
msgstr ""
#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:355
#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370
msgid "Unable to write new index file"
msgstr ""
@ -6814,7 +6836,7 @@ msgstr ""
msgid "git remote remove <name>"
msgstr ""
#: builtin/remote.c:15
#: builtin/remote.c:15 builtin/remote.c:42
msgid "git remote set-head <name> (-a | -d | <branch>)"
msgstr ""
@ -6851,10 +6873,6 @@ msgstr ""
msgid "git remote add [<options>] <name> <url>"
msgstr ""
#: builtin/remote.c:42
msgid "git remote set-head <name> (-a | -d | <branch>])"
msgstr ""
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr ""
@ -7592,12 +7610,12 @@ msgstr ""
msgid "exit with a zero status even if nothing matched"
msgstr ""
#: builtin/rm.c:268
#: builtin/rm.c:283
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
#: builtin/rm.c:307
#: builtin/rm.c:322
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""