l10n: Update git.pot (12 new messages)

Update file 'po/git.pot' to v1.7.9.2-315-g25a78 (Merge branch 'maint'),
with 12 new string additions.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

diff --git a/po/git.pot b/po/git.pot
index 7621e77092855da9d65c67e17f80ae1e6cce8a4a..efcda39705705509b4ed721a926c1387953b3a0a 100644 (file)
--- 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-02-13 14:24+0800\n"
+"POT-Creation-Date: 2012-02-28 09:17+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"
@@ -73,14 +73,39 @@ msgstr ""
 msgid "  Unknown dirstat parameter '%.*s'\n"
 msgstr ""
 
-#: diff.c:208
+#: diff.c:205
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 
-#: diff.c:3308
+#: diff.c:1331
+msgid " 0 files changed\n"
+msgstr ""
+
+#: diff.c:1335
+#, c-format
+msgid " %d file changed"
+msgid_plural " %d files changed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: diff.c:1352
+#, c-format
+msgid ", %d insertion(+)"
+msgid_plural ", %d insertions(+)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: diff.c:1363
+#, c-format
+msgid ", %d deletion(-)"
+msgid_plural ", %d deletions(-)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: diff.c:3364
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -99,21 +124,36 @@ msgstr ""
 msgid "gpg failed to sign the data"
 msgstr ""
 
-#: help.c:309
+#: grep.c:1285
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr ""
+
+#: grep.c:1302
+#, c-format
+msgid "'%s': %s"
+msgstr ""
+
+#: grep.c:1313
+#, c-format
+msgid "'%s': short read %s"
+msgstr ""
+
+#: help.c:287
 #, 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 ""
 
-#: remote.c:1576
+#: remote.c:1607
 #, 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:1582
+#: remote.c:1613
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -121,7 +161,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:1590
+#: remote.c:1621
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -850,7 +890,7 @@ msgstr ""
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
-#: builtin/branch.c:747 builtin/clone.c:570
+#: builtin/branch.c:747 builtin/clone.c:558
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
@@ -915,7 +955,7 @@ msgstr ""
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:595
+#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
 #: builtin/merge.c:809
 msgid "unable to write new index file"
 msgstr ""
@@ -1017,72 +1057,72 @@ msgstr ""
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:961
+#: builtin/checkout.c:972
 msgid "-B cannot be used with -b"
 msgstr ""
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:981
 msgid "--patch is incompatible with all other options"
 msgstr ""
 
-#: builtin/checkout.c:973
+#: builtin/checkout.c:984
 msgid "--detach cannot be used with -b/-B/--orphan"
 msgstr ""
 
-#: builtin/checkout.c:975
+#: builtin/checkout.c:986
 msgid "--detach cannot be used with -t"
 msgstr ""
 
-#: builtin/checkout.c:981
+#: builtin/checkout.c:992
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:988
+#: builtin/checkout.c:999
 msgid "Missing branch name; try -b"
 msgstr ""
 
-#: builtin/checkout.c:994
+#: builtin/checkout.c:1005
 msgid "--orphan and -b|-B are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:996
+#: builtin/checkout.c:1007
 msgid "--orphan cannot be used with -t"
 msgstr ""
 
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1017
 msgid "git checkout: -f and -m are incompatible"
 msgstr ""
 
-#: builtin/checkout.c:1040
+#: builtin/checkout.c:1051
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1048
+#: builtin/checkout.c:1059
 #, 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:1050
+#: builtin/checkout.c:1061
 msgid "git checkout: updating paths is incompatible with switching branches."
 msgstr ""
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1066
 msgid "git checkout: --detach does not take a path argument"
 msgstr ""
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1069
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1088
 msgid "Cannot switch branch to a non-commit."
 msgstr ""
 
-#: builtin/checkout.c:1080
+#: builtin/checkout.c:1091
 msgid "--ours/--theirs is incompatible with switching branches."
 msgstr ""
 
@@ -1126,128 +1166,128 @@ msgstr ""
 msgid "Not removing %s\n"
 msgstr ""
 
-#: builtin/clone.c:246
+#: builtin/clone.c:243
 #, c-format
 msgid "reference repository '%s' is not a local directory."
 msgstr ""
 
-#: builtin/clone.c:313
+#: builtin/clone.c:302
 #, c-format
 msgid "failed to open '%s'"
 msgstr ""
 
-#: builtin/clone.c:317
+#: builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/clone.c:319 builtin/diff.c:75
+#: builtin/clone.c:308 builtin/diff.c:75
 #, c-format
 msgid "failed to stat '%s'"
 msgstr ""
 
-#: builtin/clone.c:321
+#: builtin/clone.c:310
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
-#: builtin/clone.c:335
+#: builtin/clone.c:324
 #, c-format
 msgid "failed to stat %s\n"
 msgstr ""
 
-#: builtin/clone.c:352
+#: builtin/clone.c:341
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
 
-#: builtin/clone.c:357
+#: builtin/clone.c:346
 #, c-format
 msgid "failed to create link '%s'"
 msgstr ""
 
-#: builtin/clone.c:361
+#: builtin/clone.c:350
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr ""
 
-#: builtin/clone.c:384
+#: builtin/clone.c:373
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: builtin/clone.c:451
+#: builtin/clone.c:440
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
-#: builtin/clone.c:561
+#: builtin/clone.c:549
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
-#: builtin/clone.c:651
+#: builtin/clone.c:639
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:655
+#: builtin/clone.c:643
 msgid "You must specify a repository to clone."
 msgstr ""
 
-#: builtin/clone.c:666
+#: builtin/clone.c:654
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
-#: builtin/clone.c:680
+#: builtin/clone.c:668
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:685
+#: builtin/clone.c:673
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:695
+#: builtin/clone.c:683
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:705
+#: builtin/clone.c:693
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:718 builtin/clone.c:732
+#: builtin/clone.c:706 builtin/clone.c:720
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 
-#: builtin/clone.c:721
+#: builtin/clone.c:709
 #, c-format
 msgid "could not create work tree dir '%s'."
 msgstr ""
 
-#: builtin/clone.c:740
+#: builtin/clone.c:728
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:742
+#: builtin/clone.c:730
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:798
+#: builtin/clone.c:786
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr ""
 
-#: builtin/clone.c:847
+#: builtin/clone.c:835
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
-#: builtin/clone.c:854
+#: builtin/clone.c:842
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
@@ -1423,7 +1463,7 @@ msgstr ""
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:895 builtin/tag.c:324
+#: builtin/commit.c:895 builtin/tag.c:357
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
@@ -1483,7 +1523,7 @@ msgstr ""
 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
 msgstr ""
 
-#: builtin/commit.c:1096 builtin/tag.c:500
+#: builtin/commit.c:1096 builtin/tag.c:556
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
@@ -1845,77 +1885,62 @@ msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 
-#: builtin/grep.c:275
+#: builtin/grep.c:216
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
-#: builtin/grep.c:390
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr ""
-
-#: builtin/grep.c:441
-#, c-format
-msgid "'%s': %s"
-msgstr ""
-
-#: builtin/grep.c:452
-#, c-format
-msgid "'%s': short read %s"
-msgstr ""
-
-#: builtin/grep.c:514
+#: builtin/grep.c:402
 #, c-format
 msgid "Failed to chdir: %s"
 msgstr ""
 
-#: builtin/grep.c:590 builtin/grep.c:624
+#: builtin/grep.c:478 builtin/grep.c:512
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
-#: builtin/grep.c:638
+#: builtin/grep.c:526
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/grep.c:696
+#: builtin/grep.c:584
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/grep.c:713
+#: builtin/grep.c:601
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:889
 msgid "no pattern given."
 msgstr ""
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:903
 #, c-format
 msgid "bad object %s"
 msgstr ""
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:944
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:967
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:972
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 
-#: builtin/grep.c:1089
+#: builtin/grep.c:975
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:983
 msgid "both --cached and trees are given."
 msgstr ""
 
@@ -2370,51 +2395,51 @@ msgstr ""
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1382
+#: builtin/merge.c:1383
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1420
+#: builtin/merge.c:1421
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1427
+#: builtin/merge.c:1428
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1459
+#: builtin/merge.c:1460
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
-#: builtin/merge.c:1482 builtin/merge.c:1559
+#: builtin/merge.c:1483 builtin/merge.c:1560
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1486
+#: builtin/merge.c:1487
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1551
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1552
+#: builtin/merge.c:1553
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1561
+#: builtin/merge.c:1562
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/merge.c:1572
+#: builtin/merge.c:1573
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -2500,7 +2525,7 @@ msgstr ""
 msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 
-#: builtin/notes.c:175 builtin/tag.c:310
+#: builtin/notes.c:175 builtin/tag.c:343
 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
@@ -2523,12 +2548,12 @@ msgstr ""
 msgid "The note contents has been left in %s"
 msgstr ""
 
-#: builtin/notes.c:251 builtin/tag.c:465
+#: builtin/notes.c:251 builtin/tag.c:521
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: builtin/notes.c:253 builtin/tag.c:468
+#: builtin/notes.c:253 builtin/tag.c:524
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
@@ -2536,7 +2561,7 @@ msgstr ""
 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
-#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:481
+#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
@@ -2633,6 +2658,26 @@ msgstr ""
 msgid "Unknown subcommand: %s"
 msgstr ""
 
+#: builtin/pack-objects.c:2310
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2314
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:2322
+#, c-format
+msgid "option %s does not accept negative form"
+msgstr ""
+
+#: builtin/pack-objects.c:2326
+#, c-format
+msgid "unable to parse value '%s' for option %s"
+msgstr ""
+
 #: builtin/push.c:44
 msgid "tag shorthand without <tag>"
 msgstr ""
@@ -2726,11 +2771,11 @@ msgstr ""
 msgid "--all and --mirror are incompatible"
 msgstr ""
 
-#: builtin/push.c:272
+#: builtin/push.c:274
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
-#: builtin/push.c:274
+#: builtin/push.c:276
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
@@ -2866,27 +2911,32 @@ msgstr ""
 msgid "Missing author: %s"
 msgstr ""
 
-#: builtin/tag.c:172
+#: builtin/tag.c:58
+#, c-format
+msgid "malformed object at '%s'"
+msgstr ""
+
+#: builtin/tag.c:205
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr ""
 
-#: builtin/tag.c:177
+#: builtin/tag.c:210
 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 
-#: builtin/tag.c:192
+#: builtin/tag.c:225
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/tag.c:204
+#: builtin/tag.c:237
 #, c-format
 msgid "could not verify the tag '%s'"
 msgstr ""
 
-#: builtin/tag.c:214
+#: builtin/tag.c:247
 msgid ""
 "\n"
 "#\n"
@@ -2895,7 +2945,7 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: builtin/tag.c:221
+#: builtin/tag.c:254
 msgid ""
 "\n"
 "#\n"
@@ -2905,68 +2955,81 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: builtin/tag.c:261
+#: builtin/tag.c:294
 msgid "unable to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:263
+#: builtin/tag.c:296
 msgid "unable to write tag file"
 msgstr ""
 
-#: builtin/tag.c:288
+#: builtin/tag.c:321
 msgid "bad object type."
 msgstr ""
 
-#: builtin/tag.c:301
+#: builtin/tag.c:334
 msgid "tag header too big."
 msgstr ""
 
-#: builtin/tag.c:333
+#: builtin/tag.c:366
 msgid "no tag message?"
 msgstr ""
 
-#: builtin/tag.c:339
+#: builtin/tag.c:372
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
-#: builtin/tag.c:448
+#: builtin/tag.c:421
+msgid "switch 'points-at' requires an object"
+msgstr ""
+
+#: builtin/tag.c:423
+#, c-format
+msgid "malformed object name '%s'"
+msgstr ""
+
+#: builtin/tag.c:502
 msgid "-n option is only allowed with -l."
 msgstr ""
 
-#: builtin/tag.c:450
+#: builtin/tag.c:504
 msgid "--contains option is only allowed with -l."
 msgstr ""
 
-#: builtin/tag.c:458
+#: builtin/tag.c:506
+msgid "--points-at option is only allowed with -l."
+msgstr ""
+
+#: builtin/tag.c:514
 msgid "only one -F or -m option is allowed."
 msgstr ""
 
-#: builtin/tag.c:478
+#: builtin/tag.c:534
 msgid "too many params"
 msgstr ""
 
-#: builtin/tag.c:484
+#: builtin/tag.c:540
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:489
+#: builtin/tag.c:545
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:507
+#: builtin/tag.c:563
 #, c-format
 msgid "%s: cannot lock the ref"
 msgstr ""
 
-#: builtin/tag.c:509
+#: builtin/tag.c:565
 #, c-format
 msgid "%s: cannot update the ref"
 msgstr ""
 
-#: builtin/tag.c:511
+#: builtin/tag.c:567
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
@@ -3153,15 +3216,15 @@ msgstr ""
 msgid "Pull is not possible because you have unmerged files."
 msgstr ""
 
-#: git-pull.sh:193
+#: git-pull.sh:197
 msgid "updating an unborn branch with changes added to the index"
 msgstr ""
 
-#: git-pull.sh:249
+#: git-pull.sh:253
 msgid "Cannot merge multiple branches into empty head"
 msgstr ""
 
-#: git-pull.sh:253
+#: git-pull.sh:257
 msgid "Cannot rebase onto multiple branches"
 msgstr ""