@matheusbsbs / matheus-bagliano / commits / 7256fd7c80

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

Extract messages marked by shell gettext wrappers which are ignored before. See: * http://thread.gmane.org/gmane.comp.version-control.git/199112 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jun 8, 2012 at 10:40 UTC 7256fd7c8024e3886556d9a19e84a8d20ded1a17
1 file changed +166 -4
po/git.pot
+166 -4
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2012-06-02 07:03+0800\n"
11 +"POT-Creation-Date: 2012-06-08 10:20+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4590,6 +4590,24 @@ msgstr ""
4590 msgid "You need to set your committer info first"
4591 msgstr ""
4592
4593 +#: git-am.sh:95
4594 +msgid ""
4595 +"You seem to have moved HEAD since the last 'am' failure.\n"
4596 +"Not rewinding to ORIG_HEAD"
4597 +msgstr ""
4598 +
4599 +#: git-am.sh:105
4600 +#, sh-format
4601 +msgid ""
4602 +"When you have resolved this problem run \"$cmdline --resolved\".\n"
4603 +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4604 +"To restore the original branch and stop patching run \"$cmdline --abort\"."
4605 +msgstr ""
4606 +
4607 +#: git-am.sh:121
4608 +msgid "Cannot fall back to three-way merge."
4609 +msgstr ""
4610 +
4611 #: git-am.sh:137
4612 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4613 msgstr ""
@@ -4639,10 +4657,26 @@ msgstr ""
4657 msgid "Dirty index: cannot apply patches (dirty: $files)"
4658 msgstr ""
4659
4660 +#: git-am.sh:671
4661 +#, sh-format
4662 +msgid ""
4663 +"Patch is empty. Was it split wrong?\n"
4664 +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4665 +"To restore the original branch and stop patching run \"$cmdline --abort\"."
4666 +msgstr ""
4667 +
4668 +#: git-am.sh:708
4669 +msgid "Patch does not have a valid e-mail address."
4670 +msgstr ""
4671 +
4672 #: git-am.sh:755
4673 msgid "cannot be interactive without stdin connected to a terminal."
4674 msgstr ""
4675
4676 +#: git-am.sh:759
4677 +msgid "Commit Body is:"
4678 +msgstr ""
4679 +
4680 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4681 #. in your translation. The program will only accept English
4682 #. input at this point.
@@ -4655,14 +4689,36 @@ msgstr ""
4689 msgid "Applying: $FIRSTLINE"
4690 msgstr ""
4691
4692 +#: git-am.sh:823
4693 +msgid ""
4694 +"No changes - did you forget to use 'git add'?\n"
4695 +"If there is nothing left to stage, chances are that something else\n"
4696 +"already introduced the same changes; you might want to skip this patch."
4697 +msgstr ""
4698 +
4699 +#: git-am.sh:831
4700 +msgid ""
4701 +"You still have unmerged paths in your index\n"
4702 +"did you forget to use 'git add'?"
4703 +msgstr ""
4704 +
4705 #: git-am.sh:847
4706 msgid "No changes -- Patch already applied."
4707 msgstr ""
4708
4709 +#: git-am.sh:857
4710 +#, sh-format
4711 +msgid "Patch failed at $msgnum $FIRSTLINE"
4712 +msgstr ""
4713 +
4714 #: git-am.sh:873
4715 msgid "applying to an empty history"
4716 msgstr ""
4717
4718 +#: git-bisect.sh:48
4719 +msgid "You need to start by \"git bisect start\""
4720 +msgstr ""
4721 +
4722 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4723 #. translation. The program will only accept English input
4724 #. at this point.
@@ -4721,6 +4777,12 @@ msgstr ""
4777 msgid "'git bisect bad' can take only one argument."
4778 msgstr ""
4779
4780 +#. have bad but not good. we could bisect although
4781 +#. this is less optimum.
4782 +#: git-bisect.sh:273
4783 +msgid "Warning: bisecting only with a bad commit."
4784 +msgstr ""
4785 +
4786 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4787 #. translation. The program will only accept English input
4788 #. at this point.
@@ -4728,6 +4790,23 @@ msgstr ""
4790 msgid "Are you sure [Y/n]? "
4791 msgstr ""
4792
4793 +#: git-bisect.sh:289
4794 +msgid ""
4795 +"You need to give me at least one good and one bad revisions.\n"
4796 +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
4797 +msgstr ""
4798 +
4799 +#: git-bisect.sh:292
4800 +msgid ""
4801 +"You need to start by \"git bisect start\".\n"
4802 +"You then need to give me at least one good and one bad revisions.\n"
4803 +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
4804 +msgstr ""
4805 +
4806 +#: git-bisect.sh:347 git-bisect.sh:474
4807 +msgid "We are not bisecting."
4808 +msgstr ""
4809 +
4810 #: git-bisect.sh:354
4811 #, sh-format
4812 msgid "'$invalid' is not a valid commit"
@@ -4753,8 +4832,31 @@ msgstr ""
4832 msgid "?? what are you talking about?"
4833 msgstr ""
4834
4756 -#: git-bisect.sh:474
4757 -msgid "We are not bisecting."
4835 +#: git-bisect.sh:420
4836 +#, sh-format
4837 +msgid "running $command"
4838 +msgstr ""
4839 +
4840 +#: git-bisect.sh:427
4841 +#, sh-format
4842 +msgid ""
4843 +"bisect run failed:\n"
4844 +"exit code $res from '$command' is < 0 or >= 128"
4845 +msgstr ""
4846 +
4847 +#: git-bisect.sh:453
4848 +msgid "bisect run cannot continue any more"
4849 +msgstr ""
4850 +
4851 +#: git-bisect.sh:459
4852 +#, sh-format
4853 +msgid ""
4854 +"bisect run failed:\n"
4855 +"'bisect_state $state' exited with error code $res"
4856 +msgstr ""
4857 +
4858 +#: git-bisect.sh:466
4859 +msgid "bisect run success"
4860 msgstr ""
4861
4862 #: git-pull.sh:21
@@ -4772,6 +4874,18 @@ msgstr ""
4874 msgid "updating an unborn branch with changes added to the index"
4875 msgstr ""
4876
4877 +#. The fetch involved updating the current branch.
4878 +#. The working tree and the index file is still based on the
4879 +#. $orig_head commit, but we are merging into $curr_head.
4880 +#. First update the working tree to match $curr_head.
4881 +#: git-pull.sh:228
4882 +#, sh-format
4883 +msgid ""
4884 +"Warning: fetch updated the current branch head.\n"
4885 +"Warning: fast-forwarding your working tree from\n"
4886 +"Warning: commit $orig_head."
4887 +msgstr ""
4888 +
4889 #: git-pull.sh:253
4890 msgid "Cannot merge multiple branches into empty head"
4891 msgstr ""
@@ -4808,6 +4922,23 @@ msgstr ""
4922 msgid "Cannot record working tree state"
4923 msgstr ""
4924
4925 +#. TRANSLATORS: $option is an invalid option, like
4926 +#. `--blah-blah'. The 7 spaces at the beginning of the
4927 +#. second line correspond to "error: ". So you should line
4928 +#. up the second line with however many characters the
4929 +#. translation of "error: " takes in your language. E.g. in
4930 +#. English this is:
4931 +#.
4932 +#. $ git stash save --blah-blah 2>&1 | head -n 2
4933 +#. error: unknown option for 'stash save': --blah-blah
4934 +#. To provide a message, use git stash save -- '--blah-blah'
4935 +#: git-stash.sh:202
4936 +#, sh-format
4937 +msgid ""
4938 +"error: unknown option for 'stash save': $option\n"
4939 +" To provide a message, use git stash save -- '$option'"
4940 +msgstr ""
4941 +
4942 #: git-stash.sh:223
4943 msgid "No local changes to save"
4944 msgstr ""
@@ -4868,6 +4999,10 @@ msgstr ""
4999 msgid "Cannot unstage modified files"
5000 msgstr ""
5001
5002 +#: git-stash.sh:474
5003 +msgid "Index was not unstashed."
5004 +msgstr ""
5005 +
5006 #: git-stash.sh:491
5007 #, sh-format
5008 msgid "Dropped ${REV} ($s)"
@@ -4916,6 +5051,19 @@ msgstr ""
5051 msgid "'$sm_path' already exists in the index"
5052 msgstr ""
5053
5054 +#: git-submodule.sh:270
5055 +#, sh-format
5056 +msgid ""
5057 +"The following path is ignored by one of your .gitignore files:\n"
5058 +"$sm_path\n"
5059 +"Use -f if you really want to add it."
5060 +msgstr ""
5061 +
5062 +#: git-submodule.sh:281
5063 +#, sh-format
5064 +msgid "Adding existing repo at '$sm_path' to the index"
5065 +msgstr ""
5066 +
5067 #: git-submodule.sh:283
5068 #, sh-format
5069 msgid "'$sm_path' already exists and is not a valid git repo"
@@ -5019,7 +5167,13 @@ msgid "Failed to recurse into submodule path '$sm_path'"
5167 msgstr ""
5168
5169 #: git-submodule.sh:713
5022 -msgid "--"
5170 +msgid "--cached cannot be used with --files"
5171 +msgstr ""
5172 +
5173 +#. unexpected type
5174 +#: git-submodule.sh:753
5175 +#, sh-format
5176 +msgid "unexpected mode $mod_dst"
5177 msgstr ""
5178
5179 #: git-submodule.sh:771
@@ -5045,6 +5199,14 @@ msgstr ""
5199 msgid "submodule"
5200 msgstr ""
5201
5202 +#: git-submodule.sh:840
5203 +msgid "# Submodules changed but not updated:"
5204 +msgstr ""
5205 +
5206 +#: git-submodule.sh:842
5207 +msgid "# Submodule changes to be committed:"
5208 +msgstr ""
5209 +
5210 #: git-submodule.sh:974
5211 #, sh-format
5212 msgid "Synchronizing submodule url for '$name'"