l10n: Update git.pot (76 new, 4 removed messages)
Generate po/git.pot from v1.7.12-rc1-16-g05a20, and there are 76 new, 4 removed l10n messages. * 76 new messages are added at lines: 230, 337-580, 4972, 4984, 4998, 5017, 5280-5378, 5654 * 4 old messages are deleted from the previous version at lines: 230, 4729, 4764, 5295 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin
parent
05a20c87ab
commit
3b6137f253
433
po/git.pot
433
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-30 09:18+0800\n"
|
||||
"POT-Creation-Date: 2012-08-02 09:26+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"
|
||||
@ -226,7 +226,7 @@ msgid ""
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:1400
|
||||
msgid " 0 files changed\n"
|
||||
msgid " 0 files changed"
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:1404
|
||||
@ -331,6 +331,258 @@ msgid_plural ""
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: merge-recursive.c:190
|
||||
#, c-format
|
||||
msgid "(bad commit)\n"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:206
|
||||
#, c-format
|
||||
msgid "addinfo_cache failed for path '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:268
|
||||
msgid "error building trees"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:497
|
||||
msgid "diff setup failed"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:627
|
||||
msgid "merge-recursive: disk full?"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:690
|
||||
#, c-format
|
||||
msgid "failed to create path '%s'%s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:701
|
||||
#, c-format
|
||||
msgid "Removing %s to make room for subdirectory\n"
|
||||
msgstr ""
|
||||
|
||||
#. something else exists
|
||||
#. .. but not some other error (who really cares what?)
|
||||
#: merge-recursive.c:715 merge-recursive.c:736
|
||||
msgid ": perhaps a D/F conflict?"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:726
|
||||
#, c-format
|
||||
msgid "refusing to lose untracked file at '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:766
|
||||
#, c-format
|
||||
msgid "cannot read object %s '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:768
|
||||
#, c-format
|
||||
msgid "blob expected for %s '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:791 builtin/clone.c:302
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:799
|
||||
#, c-format
|
||||
msgid "failed to symlink '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:802
|
||||
#, c-format
|
||||
msgid "do not know what to do with %06o %s '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:939
|
||||
msgid "Failed to execute internal merge"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:943
|
||||
#, c-format
|
||||
msgid "Unable to add %s to database"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:959
|
||||
msgid "unsupported object type in the tree"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1038 merge-recursive.c:1052
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
||||
"in tree."
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1044 merge-recursive.c:1057
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
||||
"in tree at %s."
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1098
|
||||
msgid "rename"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1098
|
||||
msgid "renamed"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1154
|
||||
#, c-format
|
||||
msgid "%s is a directory in %s adding as %s instead"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1176
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
||||
"\"->\"%s\" in \"%s\"%s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1181
|
||||
msgid " (left unresolved)"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1235
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1265
|
||||
#, c-format
|
||||
msgid "Renaming %s to %s and %s to %s instead"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1464
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1474
|
||||
#, c-format
|
||||
msgid "Adding merged %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1479 merge-recursive.c:1677
|
||||
#, c-format
|
||||
msgid "Adding as %s instead"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1530
|
||||
#, c-format
|
||||
msgid "cannot read object %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1533
|
||||
#, c-format
|
||||
msgid "object %s is not a blob"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1581
|
||||
msgid "modify"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1581
|
||||
msgid "modified"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1591
|
||||
msgid "content"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1598
|
||||
msgid "add/add"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1632
|
||||
#, c-format
|
||||
msgid "Skipped %s (merged same as existing)"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1646
|
||||
#, c-format
|
||||
msgid "Auto-merging %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1650 git-submodule.sh:844
|
||||
msgid "submodule"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1651
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): Merge conflict in %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1741
|
||||
#, c-format
|
||||
msgid "Removing %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1766
|
||||
msgid "file/directory"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1772
|
||||
msgid "directory/file"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1777
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1787
|
||||
#, c-format
|
||||
msgid "Adding %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1804
|
||||
msgid "Fatal merge failure, shouldn't happen."
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1823
|
||||
msgid "Already up-to-date!"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1832
|
||||
#, c-format
|
||||
msgid "merging of trees %s and %s failed"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1862
|
||||
#, c-format
|
||||
msgid "Unprocessed path??? %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1907
|
||||
msgid "Merging:"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1918
|
||||
#, c-format
|
||||
msgid "found %u common ancestor(s):"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1954
|
||||
msgid "merge returned no commit"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:2011
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:2023 builtin/merge.c:697
|
||||
msgid "Unable to write index."
|
||||
msgstr ""
|
||||
|
||||
#: parse-options.c:494
|
||||
msgid "..."
|
||||
msgstr ""
|
||||
@ -2021,11 +2273,6 @@ msgstr ""
|
||||
msgid "reference repository '%s' is not a local directory."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:302
|
||||
#, c-format
|
||||
msgid "failed to open '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/clone.c:306
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
@ -3424,10 +3671,6 @@ msgstr ""
|
||||
msgid "failed to read the cache"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/merge.c:697
|
||||
msgid "Unable to write index."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/merge.c:710
|
||||
msgid "Not handling anything other than two heads merge."
|
||||
msgstr ""
|
||||
@ -4723,9 +4966,9 @@ msgstr ""
|
||||
#: git-am.sh:105
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"When you have resolved this problem run \"$cmdline --resolved\".\n"
|
||||
"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
|
||||
"To restore the original branch and stop patching run \"$cmdline --abort\"."
|
||||
"When you have resolved this problem, run \"$cmdline --resolved\".\n"
|
||||
"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
|
||||
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:121
|
||||
@ -4736,6 +4979,10 @@ msgstr ""
|
||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:139
|
||||
msgid "Using index info to reconstruct a base tree..."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:154
|
||||
msgid ""
|
||||
"Did you hand edit your patch?\n"
|
||||
@ -4746,42 +4993,48 @@ msgstr ""
|
||||
msgid "Falling back to patching base and 3-way merge..."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:275
|
||||
#: git-am.sh:179
|
||||
msgid "Failed to merge in the changes."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:274
|
||||
msgid "Only one StGIT patch series can be applied at once"
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:362
|
||||
#: git-am.sh:361
|
||||
#, sh-format
|
||||
msgid "Patch format $patch_format is not supported."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:364
|
||||
#: git-am.sh:363
|
||||
msgid "Patch format detection failed."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:418
|
||||
msgid "-d option is no longer supported. Do not use."
|
||||
#: git-am.sh:389
|
||||
msgid ""
|
||||
"The -b/--binary option has been a no-op for long time, and\n"
|
||||
"it will be removed. Please do not use it anymore."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:481
|
||||
#: git-am.sh:477
|
||||
#, sh-format
|
||||
msgid "previous rebase directory $dotest still exists but mbox given."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:486
|
||||
#: git-am.sh:482
|
||||
msgid "Please make up your mind. --skip or --abort?"
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:513
|
||||
#: git-am.sh:509
|
||||
msgid "Resolve operation not in progress, we are not resuming."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:579
|
||||
#: git-am.sh:575
|
||||
#, sh-format
|
||||
msgid "Dirty index: cannot apply patches (dirty: $files)"
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:683
|
||||
#: git-am.sh:679
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"Patch is empty. Was it split wrong?\n"
|
||||
@ -4789,53 +5042,53 @@ msgid ""
|
||||
"To restore the original branch and stop patching run \"$cmdline --abort\"."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:710
|
||||
#: git-am.sh:706
|
||||
msgid "Patch does not have a valid e-mail address."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:757
|
||||
#: git-am.sh:753
|
||||
msgid "cannot be interactive without stdin connected to a terminal."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:761
|
||||
#: git-am.sh:757
|
||||
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:768
|
||||
#: git-am.sh:764
|
||||
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:804
|
||||
#: git-am.sh:800
|
||||
#, sh-format
|
||||
msgid "Applying: $FIRSTLINE"
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:825
|
||||
#: git-am.sh:821
|
||||
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:833
|
||||
#: git-am.sh:829
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index\n"
|
||||
"did you forget to use 'git add'?"
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:849
|
||||
#: git-am.sh:845
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:859
|
||||
#: git-am.sh:855
|
||||
#, sh-format
|
||||
msgid "Patch failed at $msgnum $FIRSTLINE"
|
||||
msgstr ""
|
||||
|
||||
#: git-am.sh:880
|
||||
#: git-am.sh:876
|
||||
msgid "applying to an empty history"
|
||||
msgstr ""
|
||||
|
||||
@ -5018,6 +5271,112 @@ msgstr ""
|
||||
msgid "Cannot rebase onto multiple branches"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:52
|
||||
msgid ""
|
||||
"When you have resolved this problem, run \"git rebase --continue\".\n"
|
||||
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
|
||||
"To check out the original branch and stop rebasing, run \"git rebase --abort"
|
||||
"\"."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:159
|
||||
msgid "The pre-rebase hook refused to rebase."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:164
|
||||
msgid "It looks like git-am is in progress. Cannot rebase."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:295
|
||||
msgid "The --exec option must be used with the --interactive option"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:300
|
||||
msgid "No rebase in progress?"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:313
|
||||
msgid "Cannot read HEAD"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:316
|
||||
msgid ""
|
||||
"You must edit all merge conflicts and then\n"
|
||||
"mark them as resolved using git add"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:334
|
||||
#, sh-format
|
||||
msgid "Could not move back to $head_name"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:350
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"It seems that there is already a $state_dir_base directory, and\n"
|
||||
"I wonder if you are in the middle of another rebase. If that is the\n"
|
||||
"case, please try\n"
|
||||
"\t$cmd_live_rebase\n"
|
||||
"If that is not the case, please\n"
|
||||
"\t$cmd_clear_stale_rebase\n"
|
||||
"and run me again. I am stopping in case you still have something\n"
|
||||
"valuable there."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:395
|
||||
#, sh-format
|
||||
msgid "invalid upstream $upstream_name"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:419
|
||||
#, sh-format
|
||||
msgid "$onto_name: there are more than one merge bases"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:422 git-rebase.sh:426
|
||||
#, sh-format
|
||||
msgid "$onto_name: there is no merge base"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:431
|
||||
#, sh-format
|
||||
msgid "Does not point to a valid commit: $onto_name"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:454
|
||||
#, sh-format
|
||||
msgid "fatal: no such branch: $branch_name"
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:474
|
||||
msgid "Please commit or stash them."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:492
|
||||
#, sh-format
|
||||
msgid "Current branch $branch_name is up to date."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:495
|
||||
#, sh-format
|
||||
msgid "Current branch $branch_name is up to date, rebase forced."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:506
|
||||
#, sh-format
|
||||
msgid "Changes from $mb to $onto:"
|
||||
msgstr ""
|
||||
|
||||
#. Detach HEAD and reset the tree
|
||||
#: git-rebase.sh:515
|
||||
msgid "First, rewinding head to replay your work on top of it..."
|
||||
msgstr ""
|
||||
|
||||
#: git-rebase.sh:523
|
||||
#, sh-format
|
||||
msgid "Fast-forwarded $branch_name to $onto_name."
|
||||
msgstr ""
|
||||
|
||||
#: git-stash.sh:51
|
||||
msgid "git stash clear with parameters is unimplemented"
|
||||
msgstr ""
|
||||
@ -5291,7 +5650,7 @@ msgid "Failed to recurse into submodule path '$sm_path'"
|
||||
msgstr ""
|
||||
|
||||
#: git-submodule.sh:754
|
||||
msgid "--cached cannot be used with --files"
|
||||
msgid "The --cached option cannot be used with the --files option"
|
||||
msgstr ""
|
||||
|
||||
#. unexpected type
|
||||
@ -5319,10 +5678,6 @@ msgstr ""
|
||||
msgid "blob"
|
||||
msgstr ""
|
||||
|
||||
#: git-submodule.sh:844
|
||||
msgid "submodule"
|
||||
msgstr ""
|
||||
|
||||
#: git-submodule.sh:881
|
||||
msgid "# Submodules changed but not updated:"
|
||||
msgstr ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user