l10n: git.pot: v1.8.2 round 3 (5 new)
Generate po/git.pot from v1.8.2-rc0-16-g20a59 for git v1.8.2 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin
parent
20a599e2c1
commit
235537a07e
225
po/git.pot
225
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: 2013-02-14 14:46+0800\n"
|
||||
"POT-Creation-Date: 2013-02-19 13:32+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"
|
||||
@ -299,36 +299,36 @@ msgid_plural "%lu years ago"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: diff.c:111
|
||||
#: diff.c:112
|
||||
#, c-format
|
||||
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:116
|
||||
#: diff.c:117
|
||||
#, c-format
|
||||
msgid " Unknown dirstat parameter '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:194
|
||||
#: diff.c:210
|
||||
#, c-format
|
||||
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:237
|
||||
#: diff.c:260
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Found errors in 'diff.dirstat' config variable:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:3494
|
||||
#: diff.c:3468
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Failed to parse --dirstat/-X option parameter:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:3508
|
||||
#: diff.c:3482
|
||||
#, c-format
|
||||
msgid "Failed to parse --submodule option parameter: '%s'"
|
||||
msgstr ""
|
||||
@ -676,27 +676,31 @@ msgstr ""
|
||||
msgid "Unable to write index."
|
||||
msgstr ""
|
||||
|
||||
#: parse-options.c:485
|
||||
#: parse-options.c:489
|
||||
msgid "..."
|
||||
msgstr ""
|
||||
|
||||
#: parse-options.c:503
|
||||
#: parse-options.c:507
|
||||
#, c-format
|
||||
msgid "usage: %s"
|
||||
msgstr ""
|
||||
|
||||
#. TRANSLATORS: the colon here should align with the
|
||||
#. one in "usage: %s" translation
|
||||
#: parse-options.c:507
|
||||
#: parse-options.c:511
|
||||
#, c-format
|
||||
msgid " or: %s"
|
||||
msgstr ""
|
||||
|
||||
#: parse-options.c:510
|
||||
#: parse-options.c:514
|
||||
#, c-format
|
||||
msgid " %s"
|
||||
msgstr ""
|
||||
|
||||
#: parse-options.c:548
|
||||
msgid "-NUM"
|
||||
msgstr ""
|
||||
|
||||
#: pathspec.c:83
|
||||
#, c-format
|
||||
msgid "Path '%s' is in submodule '%.*s'"
|
||||
@ -945,7 +949,7 @@ msgstr ""
|
||||
msgid "cannot abort from a branch yet to be born"
|
||||
msgstr ""
|
||||
|
||||
#: sequencer.c:821 builtin/apply.c:4020
|
||||
#: sequencer.c:821 builtin/apply.c:4056
|
||||
#, c-format
|
||||
msgid "cannot open %s: %s"
|
||||
msgstr ""
|
||||
@ -1163,7 +1167,7 @@ msgstr ""
|
||||
msgid "You have unmerged paths."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:792 wt-status.c:916
|
||||
#: wt-status.c:792 wt-status.c:944
|
||||
msgid " (fix conflicts and run \"git commit\")"
|
||||
msgstr ""
|
||||
|
||||
@ -1195,155 +1199,176 @@ msgstr ""
|
||||
msgid " (use \"git am --abort\" to restore the original branch)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:877 wt-status.c:887
|
||||
#: wt-status.c:879 wt-status.c:896
|
||||
#, c-format
|
||||
msgid "You are currently rebasing branch '%s' on '%s'."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:884 wt-status.c:901
|
||||
msgid "You are currently rebasing."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:880
|
||||
#: wt-status.c:887
|
||||
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:882
|
||||
#: wt-status.c:889
|
||||
msgid " (use \"git rebase --skip\" to skip this patch)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:884
|
||||
#: wt-status.c:891
|
||||
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:890
|
||||
#: wt-status.c:904
|
||||
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:892
|
||||
#: wt-status.c:908
|
||||
#, c-format
|
||||
msgid ""
|
||||
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:913
|
||||
msgid "You are currently splitting a commit during a rebase."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:895
|
||||
#: wt-status.c:916
|
||||
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:897
|
||||
#: wt-status.c:920
|
||||
#, c-format
|
||||
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:925
|
||||
msgid "You are currently editing a commit during a rebase."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:900
|
||||
#: wt-status.c:928
|
||||
msgid " (use \"git commit --amend\" to amend the current commit)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:902
|
||||
#: wt-status.c:930
|
||||
msgid ""
|
||||
" (use \"git rebase --continue\" once you are satisfied with your changes)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:912
|
||||
#: wt-status.c:940
|
||||
msgid "You are currently cherry-picking."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:919
|
||||
#: wt-status.c:947
|
||||
msgid " (all conflicts fixed: run \"git commit\")"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:928
|
||||
#: wt-status.c:958
|
||||
#, c-format
|
||||
msgid "You are currently bisecting branch '%s'."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:962
|
||||
msgid "You are currently bisecting."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:931
|
||||
#: wt-status.c:965
|
||||
msgid " (use \"git bisect reset\" to get back to the original branch)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:982
|
||||
#: wt-status.c:1064
|
||||
msgid "On branch "
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:989
|
||||
#: wt-status.c:1071
|
||||
msgid "Not currently on any branch."
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1001
|
||||
#: wt-status.c:1083
|
||||
msgid "Initial commit"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1015
|
||||
#: wt-status.c:1097
|
||||
msgid "Untracked files"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1017
|
||||
#: wt-status.c:1099
|
||||
msgid "Ignored files"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1019
|
||||
#: wt-status.c:1101
|
||||
#, c-format
|
||||
msgid "Untracked files not listed%s"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1021
|
||||
#: wt-status.c:1103
|
||||
msgid " (use -u option to show untracked files)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1027
|
||||
#: wt-status.c:1109
|
||||
msgid "No changes"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1032
|
||||
#: wt-status.c:1114
|
||||
#, c-format
|
||||
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1035
|
||||
#: wt-status.c:1117
|
||||
#, c-format
|
||||
msgid "no changes added to commit\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1038
|
||||
#: wt-status.c:1120
|
||||
#, c-format
|
||||
msgid ""
|
||||
"nothing added to commit but untracked files present (use \"git add\" to "
|
||||
"track)\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1041
|
||||
#: wt-status.c:1123
|
||||
#, c-format
|
||||
msgid "nothing added to commit but untracked files present\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1044
|
||||
#: wt-status.c:1126
|
||||
#, c-format
|
||||
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1047 wt-status.c:1052
|
||||
#: wt-status.c:1129 wt-status.c:1134
|
||||
#, c-format
|
||||
msgid "nothing to commit\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1050
|
||||
#: wt-status.c:1132
|
||||
#, c-format
|
||||
msgid "nothing to commit (use -u to show untracked files)\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1054
|
||||
#: wt-status.c:1136
|
||||
#, c-format
|
||||
msgid "nothing to commit, working directory clean\n"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1162
|
||||
#: wt-status.c:1244
|
||||
msgid "HEAD (no branch)"
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1168
|
||||
#: wt-status.c:1250
|
||||
msgid "Initial commit on "
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1183
|
||||
#: wt-status.c:1265
|
||||
msgid "behind "
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1186 wt-status.c:1189
|
||||
#: wt-status.c:1268 wt-status.c:1271
|
||||
msgid "ahead "
|
||||
msgstr ""
|
||||
|
||||
#: wt-status.c:1191
|
||||
#: wt-status.c:1273
|
||||
msgid ", behind "
|
||||
msgstr ""
|
||||
|
||||
@ -1416,7 +1441,7 @@ msgstr ""
|
||||
msgid "dry run"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19
|
||||
#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19
|
||||
#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
|
||||
#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
|
||||
msgid "be verbose"
|
||||
@ -1528,7 +1553,7 @@ msgstr ""
|
||||
msgid "index file corrupt"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370
|
||||
#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370
|
||||
msgid "Unable to write new index file"
|
||||
msgstr ""
|
||||
|
||||
@ -1774,224 +1799,224 @@ msgstr ""
|
||||
msgid "Checking patch %s..."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124
|
||||
#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3782
|
||||
#: builtin/apply.c:3818
|
||||
#, c-format
|
||||
msgid "unable to remove %s from index"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3810
|
||||
#: builtin/apply.c:3846
|
||||
#, c-format
|
||||
msgid "corrupt patch for subproject %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3814
|
||||
#: builtin/apply.c:3850
|
||||
#, c-format
|
||||
msgid "unable to stat newly created file '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3819
|
||||
#: builtin/apply.c:3855
|
||||
#, c-format
|
||||
msgid "unable to create backing store for newly created file %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3822 builtin/apply.c:3930
|
||||
#: builtin/apply.c:3858 builtin/apply.c:3966
|
||||
#, c-format
|
||||
msgid "unable to add cache entry for %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3855
|
||||
#: builtin/apply.c:3891
|
||||
#, c-format
|
||||
msgid "closing file '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3904
|
||||
#: builtin/apply.c:3940
|
||||
#, c-format
|
||||
msgid "unable to write file '%s' mode %o"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3991
|
||||
#: builtin/apply.c:4027
|
||||
#, c-format
|
||||
msgid "Applied patch %s cleanly."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:3999
|
||||
#: builtin/apply.c:4035
|
||||
msgid "internal error"
|
||||
msgstr ""
|
||||
|
||||
#. Say this even without --verbose
|
||||
#: builtin/apply.c:4002
|
||||
#: builtin/apply.c:4038
|
||||
#, c-format
|
||||
msgid "Applying patch %%s with %d reject..."
|
||||
msgid_plural "Applying patch %%s with %d rejects..."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: builtin/apply.c:4012
|
||||
#: builtin/apply.c:4048
|
||||
#, c-format
|
||||
msgid "truncating .rej filename to %.*s.rej"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4033
|
||||
#: builtin/apply.c:4069
|
||||
#, c-format
|
||||
msgid "Hunk #%d applied cleanly."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4036
|
||||
#: builtin/apply.c:4072
|
||||
#, c-format
|
||||
msgid "Rejected hunk #%d."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4186
|
||||
#: builtin/apply.c:4222
|
||||
msgid "unrecognized input"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4197
|
||||
#: builtin/apply.c:4233
|
||||
msgid "unable to read index file"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91
|
||||
#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91
|
||||
#: builtin/fetch.c:63
|
||||
msgid "path"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4317
|
||||
#: builtin/apply.c:4353
|
||||
msgid "don't apply changes matching the given path"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4320
|
||||
#: builtin/apply.c:4356
|
||||
msgid "apply changes matching the given path"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4322
|
||||
#: builtin/apply.c:4358
|
||||
msgid "num"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4323
|
||||
#: builtin/apply.c:4359
|
||||
msgid "remove <num> leading slashes from traditional diff paths"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4326
|
||||
#: builtin/apply.c:4362
|
||||
msgid "ignore additions made by the patch"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4328
|
||||
#: builtin/apply.c:4364
|
||||
msgid "instead of applying the patch, output diffstat for the input"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4332
|
||||
#: builtin/apply.c:4368
|
||||
msgid "show number of added and deleted lines in decimal notation"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4334
|
||||
#: builtin/apply.c:4370
|
||||
msgid "instead of applying the patch, output a summary for the input"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4336
|
||||
#: builtin/apply.c:4372
|
||||
msgid "instead of applying the patch, see if the patch is applicable"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4338
|
||||
#: builtin/apply.c:4374
|
||||
msgid "make sure the patch is applicable to the current index"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4340
|
||||
#: builtin/apply.c:4376
|
||||
msgid "apply a patch without touching the working tree"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4342
|
||||
#: builtin/apply.c:4378
|
||||
msgid "also apply the patch (use with --stat/--summary/--check)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4344
|
||||
#: builtin/apply.c:4380
|
||||
msgid "attempt three-way merge if a patch does not apply"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4346
|
||||
#: builtin/apply.c:4382
|
||||
msgid "build a temporary index based on embedded index information"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463
|
||||
#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463
|
||||
msgid "paths are separated with NUL character"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4351
|
||||
#: builtin/apply.c:4387
|
||||
msgid "ensure at least <n> lines of context match"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4352
|
||||
#: builtin/apply.c:4388
|
||||
msgid "action"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4353
|
||||
#: builtin/apply.c:4389
|
||||
msgid "detect new or modified lines that have whitespace errors"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4356 builtin/apply.c:4359
|
||||
#: builtin/apply.c:4392 builtin/apply.c:4395
|
||||
msgid "ignore changes in whitespace when finding context"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4362
|
||||
#: builtin/apply.c:4398
|
||||
msgid "apply the patch in reverse"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4364
|
||||
#: builtin/apply.c:4400
|
||||
msgid "don't expect at least one line of context"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4366
|
||||
#: builtin/apply.c:4402
|
||||
msgid "leave the rejected hunks in corresponding *.rej files"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4368
|
||||
#: builtin/apply.c:4404
|
||||
msgid "allow overlapping hunks"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4371
|
||||
#: builtin/apply.c:4407
|
||||
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4374
|
||||
#: builtin/apply.c:4410
|
||||
msgid "do not trust the line counts in the hunk headers"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4376
|
||||
#: builtin/apply.c:4412
|
||||
msgid "root"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4377
|
||||
#: builtin/apply.c:4413
|
||||
msgid "prepend <root> to all filenames"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4399
|
||||
#: builtin/apply.c:4435
|
||||
msgid "--3way outside a repository"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4407
|
||||
#: builtin/apply.c:4443
|
||||
msgid "--index outside a repository"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4410
|
||||
#: builtin/apply.c:4446
|
||||
msgid "--cached outside a repository"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4426
|
||||
#: builtin/apply.c:4462
|
||||
#, c-format
|
||||
msgid "can't open patch '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/apply.c:4440
|
||||
#: builtin/apply.c:4476
|
||||
#, c-format
|
||||
msgid "squelched %d whitespace error"
|
||||
msgid_plural "squelched %d whitespace errors"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: builtin/apply.c:4446 builtin/apply.c:4456
|
||||
#: builtin/apply.c:4482 builtin/apply.c:4492
|
||||
#, c-format
|
||||
msgid "%d line adds whitespace errors."
|
||||
msgid_plural "%d lines add whitespace errors."
|
||||
|
||||
Loading…
Reference in New Issue
Block a user