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>maint
							parent
							
								
									a1a031d935
								
							
						
					
					
						commit
						7256fd7c80
					
				
							
								
								
									
										170
									
								
								po/git.pot
								
								
								
								
							
							
						
						
									
										170
									
								
								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-06-02 07:03+0800\n"
 | 
			
		||||
"POT-Creation-Date: 2012-06-08 10:20+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"
 | 
			
		||||
| 
						 | 
				
			
			@ -4590,6 +4590,24 @@ msgstr ""
 | 
			
		|||
msgid "You need to set your committer info first"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:95
 | 
			
		||||
msgid ""
 | 
			
		||||
"You seem to have moved HEAD since the last 'am' failure.\n"
 | 
			
		||||
"Not rewinding to ORIG_HEAD"
 | 
			
		||||
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\"."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:121
 | 
			
		||||
msgid "Cannot fall back to three-way merge."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:137
 | 
			
		||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -4639,10 +4657,26 @@ msgstr ""
 | 
			
		|||
msgid "Dirty index: cannot apply patches (dirty: $files)"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:671
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid ""
 | 
			
		||||
"Patch is empty.  Was it split wrong?\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\"."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:708
 | 
			
		||||
msgid "Patch does not have a valid e-mail address."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:755
 | 
			
		||||
msgid "cannot be interactive without stdin connected to a terminal."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:759
 | 
			
		||||
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.
 | 
			
		||||
| 
						 | 
				
			
			@ -4655,14 +4689,36 @@ msgstr ""
 | 
			
		|||
msgid "Applying: $FIRSTLINE"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:823
 | 
			
		||||
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:831
 | 
			
		||||
msgid ""
 | 
			
		||||
"You still have unmerged paths in your index\n"
 | 
			
		||||
"did you forget to use 'git add'?"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:847
 | 
			
		||||
msgid "No changes -- Patch already applied."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:857
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid "Patch failed at $msgnum $FIRSTLINE"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-am.sh:873
 | 
			
		||||
msgid "applying to an empty history"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:48
 | 
			
		||||
msgid "You need to start by \"git bisect start\""
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#. TRANSLATORS: Make sure to include [Y] and [n] in your
 | 
			
		||||
#. translation. The program will only accept English input
 | 
			
		||||
#. at this point.
 | 
			
		||||
| 
						 | 
				
			
			@ -4721,6 +4777,12 @@ msgstr ""
 | 
			
		|||
msgid "'git bisect bad' can take only one argument."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#. have bad but not good.  we could bisect although
 | 
			
		||||
#. this is less optimum.
 | 
			
		||||
#: git-bisect.sh:273
 | 
			
		||||
msgid "Warning: bisecting only with a bad commit."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#. TRANSLATORS: Make sure to include [Y] and [n] in your
 | 
			
		||||
#. translation. The program will only accept English input
 | 
			
		||||
#. at this point.
 | 
			
		||||
| 
						 | 
				
			
			@ -4728,6 +4790,23 @@ msgstr ""
 | 
			
		|||
msgid "Are you sure [Y/n]? "
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:289
 | 
			
		||||
msgid ""
 | 
			
		||||
"You need to give me at least one good and one bad revisions.\n"
 | 
			
		||||
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:292
 | 
			
		||||
msgid ""
 | 
			
		||||
"You need to start by \"git bisect start\".\n"
 | 
			
		||||
"You then need to give me at least one good and one bad revisions.\n"
 | 
			
		||||
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:347 git-bisect.sh:474
 | 
			
		||||
msgid "We are not bisecting."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:354
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid "'$invalid' is not a valid commit"
 | 
			
		||||
| 
						 | 
				
			
			@ -4753,8 +4832,31 @@ msgstr ""
 | 
			
		|||
msgid "?? what are you talking about?"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:474
 | 
			
		||||
msgid "We are not bisecting."
 | 
			
		||||
#: git-bisect.sh:420
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid "running $command"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:427
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid ""
 | 
			
		||||
"bisect run failed:\n"
 | 
			
		||||
"exit code $res from '$command' is < 0 or >= 128"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:453
 | 
			
		||||
msgid "bisect run cannot continue any more"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:459
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid ""
 | 
			
		||||
"bisect run failed:\n"
 | 
			
		||||
"'bisect_state $state' exited with error code $res"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-bisect.sh:466
 | 
			
		||||
msgid "bisect run success"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-pull.sh:21
 | 
			
		||||
| 
						 | 
				
			
			@ -4772,6 +4874,18 @@ msgstr ""
 | 
			
		|||
msgid "updating an unborn branch with changes added to the index"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#. The fetch involved updating the current branch.
 | 
			
		||||
#. The working tree and the index file is still based on the
 | 
			
		||||
#. $orig_head commit, but we are merging into $curr_head.
 | 
			
		||||
#. First update the working tree to match $curr_head.
 | 
			
		||||
#: git-pull.sh:228
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid ""
 | 
			
		||||
"Warning: fetch updated the current branch head.\n"
 | 
			
		||||
"Warning: fast-forwarding your working tree from\n"
 | 
			
		||||
"Warning: commit $orig_head."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-pull.sh:253
 | 
			
		||||
msgid "Cannot merge multiple branches into empty head"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -4808,6 +4922,23 @@ msgstr ""
 | 
			
		|||
msgid "Cannot record working tree state"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#. TRANSLATORS: $option is an invalid option, like
 | 
			
		||||
#. `--blah-blah'. The 7 spaces at the beginning of the
 | 
			
		||||
#. second line correspond to "error: ". So you should line
 | 
			
		||||
#. up the second line with however many characters the
 | 
			
		||||
#. translation of "error: " takes in your language. E.g. in
 | 
			
		||||
#. English this is:
 | 
			
		||||
#.
 | 
			
		||||
#. $ git stash save --blah-blah 2>&1 | head -n 2
 | 
			
		||||
#. error: unknown option for 'stash save': --blah-blah
 | 
			
		||||
#. To provide a message, use git stash save -- '--blah-blah'
 | 
			
		||||
#: git-stash.sh:202
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid ""
 | 
			
		||||
"error: unknown option for 'stash save': $option\n"
 | 
			
		||||
"       To provide a message, use git stash save -- '$option'"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-stash.sh:223
 | 
			
		||||
msgid "No local changes to save"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -4868,6 +4999,10 @@ msgstr ""
 | 
			
		|||
msgid "Cannot unstage modified files"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-stash.sh:474
 | 
			
		||||
msgid "Index was not unstashed."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-stash.sh:491
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid "Dropped ${REV} ($s)"
 | 
			
		||||
| 
						 | 
				
			
			@ -4916,6 +5051,19 @@ msgstr ""
 | 
			
		|||
msgid "'$sm_path' already exists in the index"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:270
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid ""
 | 
			
		||||
"The following path is ignored by one of your .gitignore files:\n"
 | 
			
		||||
"$sm_path\n"
 | 
			
		||||
"Use -f if you really want to add it."
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:281
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid "Adding existing repo at '$sm_path' to the index"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:283
 | 
			
		||||
#, sh-format
 | 
			
		||||
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'"
 | 
			
		|||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:713
 | 
			
		||||
msgid "--"
 | 
			
		||||
msgid "--cached cannot be used with --files"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#. unexpected type
 | 
			
		||||
#: git-submodule.sh:753
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid "unexpected mode $mod_dst"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:771
 | 
			
		||||
| 
						 | 
				
			
			@ -5045,6 +5199,14 @@ msgstr ""
 | 
			
		|||
msgid "submodule"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:840
 | 
			
		||||
msgid "# Submodules changed but not updated:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:842
 | 
			
		||||
msgid "# Submodule changes to be committed:"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: git-submodule.sh:974
 | 
			
		||||
#, sh-format
 | 
			
		||||
msgid "Synchronizing submodule url for '$name'"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue