зеркало из https://github.com/microsoft/git.git
Merge git://github.com/git-l10n/git-po
Updates to German, Vietnamese and simplified Chinese translation. * git://github.com/git-l10n/git-po: l10n: de.po: translate 27 new messages l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb l10n: zh_CN.po: translate 27 new messages l10n: Update git.pot (27 new, 1 removed messages)
This commit is contained in:
Junio C Hamano
Коммит
3a2c13551e
216
po/de.po
216
po/de.po
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git 1.7.11\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: 2012-03-28 18:46+0200\n"
|
||||
"Last-Translator: Ralf Thielow <ralf.thielow@googlemail.com>\n"
|
||||
"Language-Team: German\n"
|
||||
|
|
@ -4929,6 +4929,32 @@ msgstr ""
|
|||
msgid "You need to set your committer info first"
|
||||
msgstr "Du musst zuerst die Informationen des Eintragenden setzen."
|
||||
|
||||
#: git-am.sh:95
|
||||
msgid ""
|
||||
"You seem to have moved HEAD since the last 'am' failure.\n"
|
||||
"Not rewinding to ORIG_HEAD"
|
||||
msgstr ""
|
||||
"Du scheinst seit dem letzten gescheiterten 'am' die Zweigspitze (HEAD)\n"
|
||||
"geändert zu haben.\n"
|
||||
"Keine Zurücksetzung zu ORIG_HEAD."
|
||||
|
||||
#: 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 ""
|
||||
"Wenn du das Problem aufgelöst hast, führe \"$cmdline --resolved\" aus.\n"
|
||||
"Falls du diesen Patch auslassen möchtest, führe stattdessen "
|
||||
"\"$cmdline --skip\" aus.\n"
|
||||
"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der Patches\n"
|
||||
"abzubrechen, führe \"$cmdline --abort\" aus."
|
||||
|
||||
#: git-am.sh:121
|
||||
msgid "Cannot fall back to three-way merge."
|
||||
msgstr "Kann nicht zu 3-Wege-Zusammenführung zurückfallen."
|
||||
|
||||
#: git-am.sh:137
|
||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
||||
msgstr ""
|
||||
|
|
@ -4985,12 +5011,33 @@ msgid "Dirty index: cannot apply patches (dirty: $files)"
|
|||
msgstr ""
|
||||
"Unsaubere Bereitstellung: kann Patches nicht anwenden (unsauber: $files)"
|
||||
|
||||
#: 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 ""
|
||||
"Patch ist leer. Wurde er falsch aufgeteilt?\n"
|
||||
"Wenn du diesen Patch auslassen möchtest, führe stattdessen "
|
||||
"\"$cmdline --skip\" aus.\n"
|
||||
"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der Patches\n"
|
||||
"abzubrechen, führe \"$cmdline --abort\" aus."
|
||||
|
||||
#: git-am.sh:708
|
||||
msgid "Patch does not have a valid e-mail address."
|
||||
msgstr "Patch enthält keine gültige eMail-Adresse."
|
||||
|
||||
#: git-am.sh:755
|
||||
msgid "cannot be interactive without stdin connected to a terminal."
|
||||
msgstr ""
|
||||
"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
|
||||
"Terminal verbunden ist."
|
||||
|
||||
#: git-am.sh:759
|
||||
msgid "Commit Body is:"
|
||||
msgstr "Beschreibung der Eintragung ist:"
|
||||
|
||||
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
||||
#. in your translation. The program will only accept English
|
||||
#. input at this point.
|
||||
|
|
@ -5003,14 +5050,42 @@ msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
|||
msgid "Applying: $FIRSTLINE"
|
||||
msgstr "Wende an: $FIRSTLINE"
|
||||
|
||||
#: 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 ""
|
||||
"Keine Änderungen - hast du vergessen 'git add' zu benutzen?\n"
|
||||
"Wenn keine Änderungen mehr zum Bereitstellen vorhanden sind, könnten\n"
|
||||
"diese bereits anderweitig eingefügt worden sein; du könntest diesen Patch\n"
|
||||
"auslassen."
|
||||
|
||||
#: git-am.sh:831
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index\n"
|
||||
"did you forget to use 'git add'?"
|
||||
msgstr ""
|
||||
"Du hast immer noch nicht zusammengeführte Pfade in der Bereitstellung.\n"
|
||||
"Hast du vergessen 'git add' zu benutzen?"
|
||||
|
||||
#: git-am.sh:847
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr "Keine Änderungen -- Patches bereits angewendet."
|
||||
|
||||
#: git-am.sh:857
|
||||
#, sh-format
|
||||
msgid "Patch failed at $msgnum $FIRSTLINE"
|
||||
msgstr "Anwendung des Patches fehlgeschlagen bei $msgnum $FIRSTLINE"
|
||||
|
||||
#: git-am.sh:873
|
||||
msgid "applying to an empty history"
|
||||
msgstr "wende zu leerer Historie an"
|
||||
|
||||
#: git-bisect.sh:48
|
||||
msgid "You need to start by \"git bisect start\""
|
||||
msgstr "Du musst mit \"git bisect start\" beginnen."
|
||||
|
||||
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
||||
#. translation. The program will only accept English input
|
||||
#. at this point.
|
||||
|
|
@ -5071,6 +5146,12 @@ msgstr "Ungültige Referenz-Eingabe: $rev"
|
|||
msgid "'git bisect bad' can take only one argument."
|
||||
msgstr "'git bisect bad' kann nur ein Argument entgegennehmen."
|
||||
|
||||
#. 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 "Warnung: halbiere nur mit einer fehlerhaften Version"
|
||||
|
||||
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
||||
#. translation. The program will only accept English input
|
||||
#. at this point.
|
||||
|
|
@ -5078,6 +5159,29 @@ msgstr "'git bisect bad' kann nur ein Argument entgegennehmen."
|
|||
msgid "Are you sure [Y/n]? "
|
||||
msgstr "Bist du sicher [Y/n]? "
|
||||
|
||||
#: 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 ""
|
||||
"Du musst mindestens eine korrekte und eine fehlerhafte Version angeben.\n"
|
||||
"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)"
|
||||
|
||||
#: 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 ""
|
||||
"Du musst mit \"git bisect start\" beginnen.\n"
|
||||
"Danach musst du mindestens eine korrekte und eine fehlerhafte Version "
|
||||
"angeben.\n"
|
||||
"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)"
|
||||
|
||||
#: git-bisect.sh:347 git-bisect.sh:474
|
||||
msgid "We are not bisecting."
|
||||
msgstr "Wir sind nicht beim Halbieren."
|
||||
|
||||
#: git-bisect.sh:354
|
||||
#, sh-format
|
||||
msgid "'$invalid' is not a valid commit"
|
||||
|
|
@ -5105,9 +5209,36 @@ msgstr "kann $file nicht für das Abspielen lesen"
|
|||
msgid "?? what are you talking about?"
|
||||
msgstr "?? Was redest du da?"
|
||||
|
||||
#: git-bisect.sh:474
|
||||
msgid "We are not bisecting."
|
||||
msgstr "Wir sind nicht beim Halbieren."
|
||||
#: git-bisect.sh:420
|
||||
#, sh-format
|
||||
msgid "running $command"
|
||||
msgstr "führe $command aus"
|
||||
|
||||
#: git-bisect.sh:427
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"bisect run failed:\n"
|
||||
"exit code $res from '$command' is < 0 or >= 128"
|
||||
msgstr ""
|
||||
"Ausführung der Halbierung fehlgeschlagen:\n"
|
||||
"Rückkehrwert $res von '$command' ist < 0 oder >= 128"
|
||||
|
||||
#: git-bisect.sh:453
|
||||
msgid "bisect run cannot continue any more"
|
||||
msgstr "Ausführung der Halbierung kann nicht mehr fortgesetzt werden"
|
||||
|
||||
#: git-bisect.sh:459
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"bisect run failed:\n"
|
||||
"'bisect_state $state' exited with error code $res"
|
||||
msgstr ""
|
||||
"Ausführung der Halbierung fehlgeschlagen:\n"
|
||||
"'bisect_state $state' wurde mit Fehlerwert $res beendet"
|
||||
|
||||
#: git-bisect.sh:466
|
||||
msgid "bisect run success"
|
||||
msgstr "Halbierung erfolgreich ausgeführt"
|
||||
|
||||
#: git-pull.sh:21
|
||||
msgid ""
|
||||
|
|
@ -5130,6 +5261,20 @@ msgstr ""
|
|||
"Aktualisiere eine ungeborenen Zweig mit Änderungen, die zur Bereitstellung "
|
||||
"hinzugefügt wurden"
|
||||
|
||||
#. 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 ""
|
||||
"Warnung: Die Anforderung aktualisierte die Spitze des aktuellen Zweiges.\n"
|
||||
"Warnung: Spule deinen Arbeitszweig von Version $orig_head vor."
|
||||
|
||||
#: git-pull.sh:253
|
||||
msgid "Cannot merge multiple branches into empty head"
|
||||
msgstr "Kann nicht mehrere Zweige in einen ungeborenen Zweig zusammenführen"
|
||||
|
|
@ -5166,6 +5311,26 @@ msgstr "Kann temporäre Bereitstellung nicht entfernen (kann nicht passieren)"
|
|||
msgid "Cannot record working tree state"
|
||||
msgstr "Kann Zustand des Arbeitsbaumes nicht aufzeichnen"
|
||||
|
||||
#. 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 ""
|
||||
"Fehler: unbekannte Option für 'stash save': $option\n"
|
||||
" Um eine Beschreibung anzugeben, benutze \"git stash save -- "
|
||||
"'$option'\""
|
||||
|
||||
#: git-stash.sh:223
|
||||
msgid "No local changes to save"
|
||||
msgstr "Keine lokalen Änderungen zum Speichern"
|
||||
|
|
@ -5227,6 +5392,10 @@ msgstr "Konnte Bereitstellungsbaum nicht speichern"
|
|||
msgid "Cannot unstage modified files"
|
||||
msgstr "Kann geänderte Dateien nicht aus der Bereitstellung herausnehmen"
|
||||
|
||||
#: git-stash.sh:474
|
||||
msgid "Index was not unstashed."
|
||||
msgstr "Bereitstellung wurde nicht ausgelagert."
|
||||
|
||||
#: git-stash.sh:491
|
||||
#, sh-format
|
||||
msgid "Dropped ${REV} ($s)"
|
||||
|
|
@ -5277,6 +5446,24 @@ msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
|
|||
msgid "'$sm_path' already exists in the index"
|
||||
msgstr "'$sm_path' existiert bereits in der Bereitstellung"
|
||||
|
||||
#: 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 ""
|
||||
"Der folgende Pfad wird durch eine deiner \".gitignore\" Dateien "
|
||||
"ignoriert:\n"
|
||||
"$sm_path\n"
|
||||
"Benutze -f wenn du diesen wirklich hinzufügen möchtest."
|
||||
|
||||
#: git-submodule.sh:281
|
||||
#, sh-format
|
||||
msgid "Adding existing repo at '$sm_path' to the index"
|
||||
msgstr "Füge existierendes Projektarchiv in '$sm_path' der Bereitstellung "
|
||||
"hinzu."
|
||||
|
||||
#: git-submodule.sh:283
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists and is not a valid git repo"
|
||||
|
|
@ -5385,8 +5572,14 @@ msgid "Failed to recurse into submodule path '$sm_path'"
|
|||
msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:713
|
||||
msgid "--"
|
||||
msgstr "--"
|
||||
msgid "--cached cannot be used with --files"
|
||||
msgstr "--cached kann nicht mit --files benutzt werden"
|
||||
|
||||
#. unexpected type
|
||||
#: git-submodule.sh:753
|
||||
#, sh-format
|
||||
msgid "unexpected mode $mod_dst"
|
||||
msgstr "unerwarteter Modus $mod_dst"
|
||||
|
||||
#: git-submodule.sh:771
|
||||
#, sh-format
|
||||
|
|
@ -5412,11 +5605,22 @@ msgstr "Blob"
|
|||
msgid "submodule"
|
||||
msgstr "Unterprojekt"
|
||||
|
||||
#: git-submodule.sh:840
|
||||
msgid "# Submodules changed but not updated:"
|
||||
msgstr "# Unterprojekte geändert, aber nicht aktualisiert:"
|
||||
|
||||
#: git-submodule.sh:842
|
||||
msgid "# Submodule changes to be committed:"
|
||||
msgstr "# Änderungen in Unterprojekt zum Eintragen:"
|
||||
|
||||
#: git-submodule.sh:974
|
||||
#, sh-format
|
||||
msgid "Synchronizing submodule url for '$name'"
|
||||
msgstr "Synchronisiere Unterprojekt-URL für '$name'"
|
||||
|
||||
#~ msgid "--"
|
||||
#~ msgstr "--"
|
||||
|
||||
#~ msgid "Could not extract email from committer identity."
|
||||
#~ msgstr "Konnte E-Mail-Adresse des Einreichers nicht extrahieren."
|
||||
|
||||
|
|
|
|||
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'"
|
||||
|
|
|
|||
212
po/vi.po
212
po/vi.po
|
|
@ -5,10 +5,10 @@
|
|||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: git-1.7.11-rc0-100-g5498c\n"
|
||||
"Project-Id-Version: git-1.7.11.rc2.2.gb694fbb\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2012-06-02 07:03+0800\n"
|
||||
"PO-Revision-Date: 2012-06-03 07:13+0700\n"
|
||||
"POT-Creation-Date: 2012-06-08 10:20+0800\n"
|
||||
"PO-Revision-Date: 2012-06-09 14:08+0700\n"
|
||||
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
|
||||
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -4887,6 +4887,29 @@ msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ (tag
|
|||
msgid "You need to set your committer info first"
|
||||
msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã"
|
||||
|
||||
#: git-am.sh:95
|
||||
msgid ""
|
||||
"You seem to have moved HEAD since the last 'am' failure.\n"
|
||||
"Not rewinding to ORIG_HEAD"
|
||||
msgstr ""
|
||||
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần 'am' thất bại cuối cùng.\n"
|
||||
"Không thể chuyển tới ORIG_HEAD"
|
||||
|
||||
#: 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 ""
|
||||
"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --resolved\".\n"
|
||||
"Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"$cmdline --skip\".\n"
|
||||
"Để phục hồi lại thành nhánh nguyên bản và dừng việc vá lại thì chạy \"$cmdline --abort\"."
|
||||
|
||||
#: git-am.sh:121
|
||||
msgid "Cannot fall back to three-way merge."
|
||||
msgstr "Đang trở lại để hòa trộn kiểu 'three-way'."
|
||||
|
||||
#: git-am.sh:137
|
||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
||||
msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên '3-way merge'."
|
||||
|
|
@ -4938,10 +4961,29 @@ msgstr "Thao tác phân giải không đang được tiến hành, chúng ta kh
|
|||
msgid "Dirty index: cannot apply patches (dirty: $files)"
|
||||
msgstr "Bảng mục lục sai: không thể áp dụng các miếng vá (sai: $files)"
|
||||
|
||||
#: 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 ""
|
||||
"Miếng vá trống rỗng. Nó đã bị chia cắt sai phải không?\n"
|
||||
"Nếu bạn thích bỏ qua miếng vá này, hãy chạy lệnh sau để thay thế \"$cmdline --skip\".\n"
|
||||
"Để phục hồi lại nhánh nguyên bản và dừng vá lại hãy chạy lệnh \"$cmdline --abort\"."
|
||||
|
||||
#: git-am.sh:708
|
||||
msgid "Patch does not have a valid e-mail address."
|
||||
msgstr "Miếng vá không có địa chỉ e-mail hợp lệ."
|
||||
|
||||
#: git-am.sh:755
|
||||
msgid "cannot be interactive without stdin connected to a terminal."
|
||||
msgstr "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
|
||||
|
||||
#: git-am.sh:759
|
||||
msgid "Commit Body is:"
|
||||
msgstr "Thân của lần chuyển giao (commit) là:"
|
||||
|
||||
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
||||
#. in your translation. The program will only accept English
|
||||
#. input at this point.
|
||||
|
|
@ -4954,14 +4996,41 @@ msgstr "Áp dụng? đồng ý [y]/không [n]/chỉnh sửa [e]/hiển thị mi
|
|||
msgid "Applying: $FIRSTLINE"
|
||||
msgstr "Đang áp dụng (miếng vá): $FIRSTLINE"
|
||||
|
||||
#: 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 ""
|
||||
"Không có thay đổi nào - bạn đã quên sử dụng lệnh 'git add' à?\n"
|
||||
"Nếu ở đây không có gì còn lại stage, tình cờ là có một số thứ khác\n"
|
||||
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng vá này."
|
||||
|
||||
#: git-am.sh:831
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index\n"
|
||||
"did you forget to use 'git add'?"
|
||||
msgstr ""
|
||||
"Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình\n"
|
||||
"bạn đã quên sử dụng lệnh 'git add' à?"
|
||||
|
||||
#: git-am.sh:847
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
|
||||
|
||||
#: git-am.sh:857
|
||||
#, sh-format
|
||||
msgid "Patch failed at $msgnum $FIRSTLINE"
|
||||
msgstr "Vá gặp lỗi tại $msgnum $FIRSTLINE"
|
||||
|
||||
#: git-am.sh:873
|
||||
msgid "applying to an empty history"
|
||||
msgstr "áp dụng vào một lịch sử trống rỗng"
|
||||
|
||||
#: git-bisect.sh:48
|
||||
msgid "You need to start by \"git bisect start\""
|
||||
msgstr "Bạn cần khởi đầu bằng \"git bisect start\""
|
||||
|
||||
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
||||
#. translation. The program will only accept English input
|
||||
#. at this point.
|
||||
|
|
@ -5019,6 +5088,12 @@ msgstr "Đầu vào rev sai: $rev"
|
|||
msgid "'git bisect bad' can take only one argument."
|
||||
msgstr "'git bisect bad' có thể lấy chỉ một đối số."
|
||||
|
||||
#. 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 "Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao (commit) sai."
|
||||
|
||||
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
||||
#. translation. The program will only accept English input
|
||||
#. at this point.
|
||||
|
|
@ -5026,6 +5101,29 @@ msgstr "'git bisect bad' có thể lấy chỉ một đối số."
|
|||
msgid "Are you sure [Y/n]? "
|
||||
msgstr "Bạn có chắc chắn chưa [Y/n]?"
|
||||
|
||||
#: 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 ""
|
||||
"Bạn phải chỉ cho tôi ít nhất một điểm xét duyệt tốt và một điểm sai.\n"
|
||||
"(Bạn có thể sử dụng \"git bisect bad\" và \"git bisect good\" cho cái đó.)"
|
||||
|
||||
#: 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 ""
|
||||
"Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n"
|
||||
"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt đúng và một điểm sai.\n"
|
||||
"(Bạn có thể sử dụng \"git bisect bad\" và \"git bisect good\" cho chúng.)"
|
||||
|
||||
#: git-bisect.sh:347
|
||||
#: git-bisect.sh:474
|
||||
msgid "We are not bisecting."
|
||||
msgstr "Chúng tôi không bisect."
|
||||
|
||||
#: git-bisect.sh:354
|
||||
#, sh-format
|
||||
msgid "'$invalid' is not a valid commit"
|
||||
|
|
@ -5053,9 +5151,36 @@ msgstr "không thể đọc $file để thao diễn lại"
|
|||
msgid "?? what are you talking about?"
|
||||
msgstr "?? bạn đang nói gì thế?"
|
||||
|
||||
#: git-bisect.sh:474
|
||||
msgid "We are not bisecting."
|
||||
msgstr "Chúng tôi không bisect."
|
||||
#: git-bisect.sh:420
|
||||
#, sh-format
|
||||
msgid "running $command"
|
||||
msgstr "đang chạy lệnh $command"
|
||||
|
||||
#: git-bisect.sh:427
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"bisect run failed:\n"
|
||||
"exit code $res from '$command' is < 0 or >= 128"
|
||||
msgstr ""
|
||||
"chạy bisect gặp lỗi:\n"
|
||||
"mã trả về $res từ lệnh '$command' là < 0 hoặc >= 128"
|
||||
|
||||
#: git-bisect.sh:453
|
||||
msgid "bisect run cannot continue any more"
|
||||
msgstr "bisect không thể tiếp tục thêm được nữa"
|
||||
|
||||
#: git-bisect.sh:459
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"bisect run failed:\n"
|
||||
"'bisect_state $state' exited with error code $res"
|
||||
msgstr ""
|
||||
"chạy bisect gặp lỗi:\n"
|
||||
"'bisect_state $state' đã thoát ra với mã lỗi $res"
|
||||
|
||||
#: git-bisect.sh:466
|
||||
msgid "bisect run success"
|
||||
msgstr "bisect chạy thành công"
|
||||
|
||||
#: git-pull.sh:21
|
||||
msgid ""
|
||||
|
|
@ -5075,6 +5200,21 @@ msgstr "Full là không thể thực hiện bởi vì bạn có những tập ti
|
|||
msgid "updating an unborn branch with changes added to the index"
|
||||
msgstr "đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào bảng mục lục"
|
||||
|
||||
#. 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 ""
|
||||
"Cảnh báo: fetch đã cập nhật head nhánh hiện tại.\n"
|
||||
"Cảnh báo: đang fast-forward cây làm việc của bạn từ\n"
|
||||
"Cảnh báo: commit $orig_head."
|
||||
|
||||
#: git-pull.sh:253
|
||||
msgid "Cannot merge multiple branches into empty head"
|
||||
msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống rỗng"
|
||||
|
|
@ -5112,6 +5252,25 @@ msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể x
|
|||
msgid "Cannot record working tree state"
|
||||
msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
|
||||
|
||||
#. 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 ""
|
||||
"lỗi: không hiểu tùy chọn cho 'stash save': $option\n"
|
||||
" Để cung cấp một thông điệp, sử dụng git stash save -- '$option'"
|
||||
|
||||
#: git-stash.sh:223
|
||||
msgid "No local changes to save"
|
||||
msgstr "Không có thay đổi nội bộ nào được ghi lại"
|
||||
|
|
@ -5172,6 +5331,10 @@ msgstr "Không thể ghi lại cây chỉ mục"
|
|||
msgid "Cannot unstage modified files"
|
||||
msgstr "Không thể bỏ trạng thía của các tập tin đã được sửa chữa"
|
||||
|
||||
#: git-stash.sh:474
|
||||
msgid "Index was not unstashed."
|
||||
msgstr "Bảng mục lục đã không được bỏ stash."
|
||||
|
||||
#: git-stash.sh:491
|
||||
#, sh-format
|
||||
msgid "Dropped ${REV} ($s)"
|
||||
|
|
@ -5220,6 +5383,22 @@ msgstr "repo URL: '$repo' phải là đường dẫn tuyệt đối hoặc là b
|
|||
msgid "'$sm_path' already exists in the index"
|
||||
msgstr "'$sm_path' thực sự đã tồn tại ở bảng mục lục rồi"
|
||||
|
||||
#: 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 ""
|
||||
"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore của bạn:\n"
|
||||
"$sm_path\n"
|
||||
"Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
|
||||
|
||||
#: git-submodule.sh:281
|
||||
#, sh-format
|
||||
msgid "Adding existing repo at '$sm_path' to the index"
|
||||
msgstr "Đang thêm repo có sẵn tại '$sm_path' vào bảng mục lục"
|
||||
|
||||
#: git-submodule.sh:283
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists and is not a valid git repo"
|
||||
|
|
@ -5326,8 +5505,14 @@ msgid "Failed to recurse into submodule path '$sm_path'"
|
|||
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:713
|
||||
msgid "--"
|
||||
msgstr "--"
|
||||
msgid "--cached cannot be used with --files"
|
||||
msgstr "--cached không thể được sử dụng cùng với --files"
|
||||
|
||||
#. unexpected type
|
||||
#: git-submodule.sh:753
|
||||
#, sh-format
|
||||
msgid "unexpected mode $mod_dst"
|
||||
msgstr "chế độ không như mong chờ $mod_dst"
|
||||
|
||||
#: git-submodule.sh:771
|
||||
#, sh-format
|
||||
|
|
@ -5352,11 +5537,22 @@ msgstr "blob"
|
|||
msgid "submodule"
|
||||
msgstr "mô-đun con"
|
||||
|
||||
#: git-submodule.sh:840
|
||||
msgid "# Submodules changed but not updated:"
|
||||
msgstr "# Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
|
||||
|
||||
#: git-submodule.sh:842
|
||||
msgid "# Submodule changes to be committed:"
|
||||
msgstr "# Những thay đổi mô-đun-con được chuyển giao (commit):"
|
||||
|
||||
#: git-submodule.sh:974
|
||||
#, sh-format
|
||||
msgid "Synchronizing submodule url for '$name'"
|
||||
msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'"
|
||||
|
||||
#~ msgid "--"
|
||||
#~ msgstr "--"
|
||||
|
||||
#~ msgid "Could not extract email from committer identity."
|
||||
#~ msgstr ""
|
||||
#~ "Không thể rút trích địa chỉ thư điện tử từ định danh người chuyển giao"
|
||||
|
|
|
|||
217
po/zh_CN.po
217
po/zh_CN.po
|
|
@ -12,8 +12,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2012-06-02 07:03+0800\n"
|
||||
"PO-Revision-Date: 2012-06-02 17:05+0800\n"
|
||||
"POT-Creation-Date: 2012-06-08 10:20+0800\n"
|
||||
"PO-Revision-Date: 2012-06-08 12:24+0800\n"
|
||||
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
|
||||
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
|
||||
"Language: zh_CN\n"
|
||||
|
|
@ -4806,6 +4806,28 @@ msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
|
|||
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 ""
|
||||
"您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
|
||||
|
||||
#: 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 ""
|
||||
"当您解决了此问题后，执行 \"$cmdline --resolved\"。\n"
|
||||
"如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
|
||||
"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
|
||||
|
||||
#: 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 "版本库缺乏必要的 blob 数据以进行三路合并。"
|
||||
|
|
@ -4820,7 +4842,7 @@ msgstr ""
|
|||
|
||||
#: git-am.sh:163
|
||||
msgid "Falling back to patching base and 3-way merge..."
|
||||
msgstr "回退到补丁基础版本并使用三路合并..."
|
||||
msgstr "转而在基础版本上打补丁及进行三路合并..."
|
||||
|
||||
#: git-am.sh:275
|
||||
msgid "Only one StGIT patch series can be applied at once"
|
||||
|
|
@ -4857,10 +4879,29 @@ msgstr "解决操作未进行，我们不会继续。"
|
|||
msgid "Dirty index: cannot apply patches (dirty: $files)"
|
||||
msgstr "脏的索引：不能应用补丁（脏文件：$files）"
|
||||
|
||||
#: 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 ""
|
||||
"补丁为空。是不是切分错误？\n"
|
||||
"如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"
|
||||
"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
|
||||
|
||||
#: 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
|
||||
|
|
@ -4874,14 +4915,40 @@ msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
|||
msgid "Applying: $FIRSTLINE"
|
||||
msgstr "正应用：$FIRSTLINE"
|
||||
|
||||
#: 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 add'？\n"
|
||||
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
|
||||
"您也许想要跳过这个补丁。"
|
||||
|
||||
#: git-am.sh:831
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index\n"
|
||||
"did you forget to use 'git add'?"
|
||||
msgstr ""
|
||||
"您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
|
||||
|
||||
#: git-am.sh:847
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr "没有变更 -- 补丁已经应用过。"
|
||||
|
||||
#: git-am.sh:857
|
||||
#, sh-format
|
||||
msgid "Patch failed at $msgnum $FIRSTLINE"
|
||||
msgstr "补丁失败于 $msgnum $FIRSTLINE"
|
||||
|
||||
#: 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 "您需要执行 \"git bisect start\" 来开始"
|
||||
|
||||
# 译者：注意保持句尾空格
|
||||
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
||||
#. translation. The program will only accept English input
|
||||
|
|
@ -4941,6 +5008,12 @@ msgstr "输入坏的版本：$rev"
|
|||
msgid "'git bisect bad' can take only one argument."
|
||||
msgstr "'git bisect bad' 只能带一个参数。"
|
||||
|
||||
#. 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
|
||||
|
|
@ -4949,6 +5022,28 @@ msgstr "'git bisect bad' 只能带一个参数。"
|
|||
msgid "Are you sure [Y/n]? "
|
||||
msgstr "您确认么[Y/n]？ "
|
||||
|
||||
#: 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 ""
|
||||
"您需要给我至少一个好版本和一个坏版本。\n"
|
||||
"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"
|
||||
|
||||
#: 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 start\" 来开始。\n"
|
||||
"然后需要提供我至少一个好版本和一个坏版本。\n"
|
||||
"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"
|
||||
|
||||
#: 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"
|
||||
|
|
@ -4976,9 +5071,36 @@ msgstr "不能读取 $file 来重放"
|
|||
msgid "?? what are you talking about?"
|
||||
msgstr "?? 您在说什么?"
|
||||
|
||||
#: git-bisect.sh:474
|
||||
msgid "We are not bisecting."
|
||||
msgstr "我们没有在二分查找。"
|
||||
#: git-bisect.sh:420
|
||||
#, sh-format
|
||||
msgid "running $command"
|
||||
msgstr "运行 $command"
|
||||
|
||||
#: git-bisect.sh:427
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"bisect run failed:\n"
|
||||
"exit code $res from '$command' is < 0 or >= 128"
|
||||
msgstr ""
|
||||
"二分查找运行失败：\n"
|
||||
"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128"
|
||||
|
||||
#: 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 ""
|
||||
"二分查找运行失败：\n"
|
||||
"'bisect_state $state' 退出码为 $res"
|
||||
|
||||
#: git-bisect.sh:466
|
||||
msgid "bisect run success"
|
||||
msgstr "二分查找运行成功"
|
||||
|
||||
#: git-pull.sh:21
|
||||
msgid ""
|
||||
|
|
@ -4998,6 +5120,20 @@ msgstr "Pull 不可用，因为您尚有未合并的文件。"
|
|||
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 ""
|
||||
"警告：fetch 更新了当前的分支。您的工作区\n"
|
||||
"警告：从原提交 $orig_head 快进。"
|
||||
|
||||
#: git-pull.sh:253
|
||||
msgid "Cannot merge multiple branches into empty head"
|
||||
msgstr "无法将多个分支合并到空分支"
|
||||
|
|
@ -5034,6 +5170,25 @@ 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 ""
|
||||
"错误：'stash save' 的未知选项：$option\n"
|
||||
" 要提供一个描述信息，使用 git stash save -- '$option'"
|
||||
|
||||
#: git-stash.sh:223
|
||||
msgid "No local changes to save"
|
||||
msgstr "没有要保存的本地修改"
|
||||
|
|
@ -5094,6 +5249,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)"
|
||||
|
|
@ -5142,6 +5301,22 @@ msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
|
|||
msgid "'$sm_path' already exists in the index"
|
||||
msgstr "'$sm_path' 已经存在于索引中"
|
||||
|
||||
#: 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 ""
|
||||
"以下路径被您的一个 .gitignore 文件所忽略：\n"
|
||||
"$sm_path\n"
|
||||
"如果您确实想添加它，使用 -f 参数。"
|
||||
|
||||
#: git-submodule.sh:281
|
||||
#, sh-format
|
||||
msgid "Adding existing repo at '$sm_path' to the index"
|
||||
msgstr "添加位于 '$sm_path' 的现存版本库到索引"
|
||||
|
||||
#: git-submodule.sh:283
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists and is not a valid git repo"
|
||||
|
|
@ -5247,8 +5422,14 @@ msgid "Failed to recurse into submodule path '$sm_path'"
|
|||
msgstr "无法递归进子模组路径 '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:713
|
||||
msgid "--"
|
||||
msgstr "--"
|
||||
msgid "--cached cannot be used with --files"
|
||||
msgstr "--cached 不能和 --files 共用"
|
||||
|
||||
#. unexpected type
|
||||
#: git-submodule.sh:753
|
||||
#, sh-format
|
||||
msgid "unexpected mode $mod_dst"
|
||||
msgstr "意外的模式 $mod_dst"
|
||||
|
||||
# 译者：注意保持前导空格
|
||||
#: git-submodule.sh:771
|
||||
|
|
@ -5276,19 +5457,15 @@ msgstr "blob"
|
|||
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'"
|
||||
msgstr "为 '$name' 同步子模组 url"
|
||||
|
||||
#~ msgid "Could not extract email from committer identity."
|
||||
#~ msgstr "不能从提交者身份中提取邮件地址。"
|
||||
|
||||
#~ msgid "cherry-pick"
|
||||
#~ msgstr "拣选"
|
||||
|
||||
#~ msgid "Please enter the commit message for your changes."
|
||||
#~ msgstr "请为您的修改输入提交说明。"
|
||||
|
||||
#~ msgid "Too many options specified"
|
||||
#~ msgstr "指定了太多的选项"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче