mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-09 15:01:59 -05:00
Sync with git-svn and l10n updates
By Jiang Xin (3) and others via Junio C Hamano (5) and others * master: git-svn: clarify the referent of dcommit's optional argument git-svn: support rebase --preserve-merges l10n: de.po: translate 3 new messages l10n: zh_CN.po: translate 3 new messages l10n: pt_PT.po translate new messages l10n: Update git.pot (8 new, 4 removed messages) l10n: Update git.pot (3 new, 2 removed messages)
This commit is contained in:
Junio C Hamano
@@ -189,18 +189,16 @@ and have no uncommitted changes.
|
||||
last fetched commit from the upstream SVN.
|
||||
|
||||
'dcommit'::
|
||||
Commit each diff from a specified head directly to the SVN
|
||||
Commit each diff from the current branch directly to the SVN
|
||||
repository, and then rebase or reset (depending on whether or
|
||||
not there is a diff between SVN and head). This will create
|
||||
a revision in SVN for each commit in git.
|
||||
It is recommended that you run 'git svn' fetch and rebase (not
|
||||
pull or merge) your commits against the latest changes in the
|
||||
SVN repository.
|
||||
An optional revision or branch argument may be specified, and
|
||||
causes 'git svn' to do all work on that revision/branch
|
||||
instead of HEAD.
|
||||
This is advantageous over 'set-tree' (below) because it produces
|
||||
cleaner, more linear history.
|
||||
+
|
||||
When an optional git branch name (or a git commit object name)
|
||||
is specified as an argument, the subcommand works on the specified
|
||||
branch, not on the current branch.
|
||||
+
|
||||
Use of 'dcommit' is preferred to 'set-tree' (below).
|
||||
+
|
||||
--no-rebase;;
|
||||
After committing, do not rebase or reset.
|
||||
@@ -572,6 +570,8 @@ config key: svn.repackflags
|
||||
--merge::
|
||||
-s<strategy>::
|
||||
--strategy=<strategy>::
|
||||
-p::
|
||||
--preserve-merges::
|
||||
These are only used with the 'dcommit' and 'rebase' commands.
|
||||
+
|
||||
Passed directly to 'git rebase' when using 'dcommit' if a
|
||||
@@ -800,18 +800,19 @@ have each person clone that repository with 'git clone':
|
||||
|
||||
REBASE VS. PULL/MERGE
|
||||
---------------------
|
||||
Prefer to use 'git svn rebase' or 'git rebase', rather than
|
||||
'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn'
|
||||
branch. Doing so will keep the history of unintegrated commits linear with
|
||||
respect to the upstream SVN repository and allow the use of the preferred
|
||||
'git svn dcommit' subcommand to push unintegrated commits back into SVN.
|
||||
|
||||
Originally, 'git svn' recommended that the 'remotes/git-svn' branch be
|
||||
pulled or merged from. This is because the author favored
|
||||
Originally, 'git svn' recommended that developers pulled or merged from
|
||||
the 'git svn' branch. This was because the author favored
|
||||
`git svn set-tree B` to commit a single head rather than the
|
||||
`git svn set-tree A..B` notation to commit multiple commits.
|
||||
|
||||
If you use `git svn set-tree A..B` to commit several diffs and you do
|
||||
not have the latest remotes/git-svn merged into my-branch, you should
|
||||
use `git svn rebase` to update your work branch instead of `git pull` or
|
||||
`git merge`. `pull`/`merge` can cause non-linear history to be flattened
|
||||
when committing into SVN, which can lead to merge commits reversing
|
||||
previous commits in SVN.
|
||||
`git svn set-tree A..B` notation to commit multiple commits. Use of
|
||||
'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear
|
||||
history to be flattened when committing into SVN and this can lead to merge
|
||||
commits unexpectedly reversing previous commits in SVN.
|
||||
|
||||
MERGE TRACKING
|
||||
--------------
|
||||
|
||||
@@ -106,7 +106,7 @@ my ($_stdin, $_help, $_edit,
|
||||
$_message, $_file, $_branch_dest,
|
||||
$_template, $_shared,
|
||||
$_version, $_fetch_all, $_no_rebase, $_fetch_parent,
|
||||
$_merge, $_strategy, $_dry_run, $_local,
|
||||
$_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,
|
||||
$_prefix, $_no_checkout, $_url, $_verbose,
|
||||
$_git_format, $_commit_url, $_tag, $_merge_info, $_interactive);
|
||||
$Git::SVN::_follow_parent = 1;
|
||||
@@ -255,6 +255,7 @@ my %cmd = (
|
||||
'local|l' => \$_local,
|
||||
'fetch-all|all' => \$_fetch_all,
|
||||
'dry-run|n' => \$_dry_run,
|
||||
'preserve-merges|p' => \$_preserve_merges,
|
||||
%fc_opts } ],
|
||||
'commit-diff' => [ \&cmd_commit_diff,
|
||||
'Commit a diff between two trees',
|
||||
@@ -1592,6 +1593,7 @@ sub rebase_cmd {
|
||||
push @cmd, '-v' if $_verbose;
|
||||
push @cmd, qw/--merge/ if $_merge;
|
||||
push @cmd, "--strategy=$_strategy" if $_strategy;
|
||||
push @cmd, "--preserve-merges" if $_preserve_merges;
|
||||
@cmd;
|
||||
}
|
||||
|
||||
|
||||
138
po/de.po
138
po/de.po
@@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: git 1.7.10\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2012-05-08 15:45+0800\n"
|
||||
"POT-Creation-Date: 2012-05-15 06:31+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"
|
||||
@@ -111,7 +111,7 @@ msgid_plural ", %d deletions(-)"
|
||||
msgstr[0] ", %d Zeile entfernt(-)"
|
||||
msgstr[1] ", %d Zeilen entfernt(-)"
|
||||
|
||||
#: diff.c:3435
|
||||
#: diff.c:3439
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Failed to parse --dirstat/-X option parameter:\n"
|
||||
@@ -2035,23 +2035,19 @@ msgstr ""
|
||||
msgid "Invalid %s: '%s'"
|
||||
msgstr "Ungültiger %s: '%s'"
|
||||
|
||||
#: builtin/gc.c:78
|
||||
msgid "Too many options specified"
|
||||
msgstr "Zu viele Optionen angegeben"
|
||||
|
||||
#: builtin/gc.c:103
|
||||
#: builtin/gc.c:90
|
||||
#, c-format
|
||||
msgid "insanely long object directory %.*s"
|
||||
msgstr "zu langes Objekt-Verzeichnis %.*s"
|
||||
|
||||
#: builtin/gc.c:223
|
||||
#: builtin/gc.c:221
|
||||
#, c-format
|
||||
msgid "Auto packing the repository for optimum performance.\n"
|
||||
msgstr ""
|
||||
"Die Datenbank des Projektarchivs wird für eine optimale Performance "
|
||||
"komprimiert.\n"
|
||||
|
||||
#: builtin/gc.c:226
|
||||
#: builtin/gc.c:224
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Auto packing the repository for optimum performance. You may also\n"
|
||||
@@ -2061,7 +2057,7 @@ msgstr ""
|
||||
"komprimiert. Du kannst auch \"git gc\" manuell ausführen. Siehe \"git help gc"
|
||||
"\" für weitere Informationen.\n"
|
||||
|
||||
#: builtin/gc.c:256
|
||||
#: builtin/gc.c:251
|
||||
msgid ""
|
||||
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
||||
msgstr ""
|
||||
@@ -2876,22 +2872,22 @@ msgstr "Objekt %s hat keine Notiz\n"
|
||||
msgid "Unknown subcommand: %s"
|
||||
msgstr "Unbekanntes Unterkommando: %s"
|
||||
|
||||
#: builtin/pack-objects.c:2310
|
||||
#: builtin/pack-objects.c:2315
|
||||
#, c-format
|
||||
msgid "unsupported index version %s"
|
||||
msgstr "Nicht unterstützte Bereitstellungsversion %s"
|
||||
|
||||
#: builtin/pack-objects.c:2314
|
||||
#: builtin/pack-objects.c:2319
|
||||
#, c-format
|
||||
msgid "bad index version '%s'"
|
||||
msgstr "Ungültige Bereitstellungsversion '%s'"
|
||||
|
||||
#: builtin/pack-objects.c:2322
|
||||
#: builtin/pack-objects.c:2342
|
||||
#, c-format
|
||||
msgid "option %s does not accept negative form"
|
||||
msgstr "Option %s akzeptiert keine negative Form"
|
||||
|
||||
#: builtin/pack-objects.c:2326
|
||||
#: builtin/pack-objects.c:2346
|
||||
#, c-format
|
||||
msgid "unable to parse value '%s' for option %s"
|
||||
msgstr "konnte Wert '%s' für Option %s nicht parsen"
|
||||
@@ -2964,10 +2960,10 @@ msgid ""
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Aktualisierungen wurden zurückgewiesen, weil die Spitze deines aktuellen\n"
|
||||
"Zweiges hinter seinem entfernten Gegenstück ist. Führe die entfernten\n"
|
||||
"Änderungen zusammen (z.B. 'git pull') bevor du erneut versendest.\n"
|
||||
"Siehe auch die 'Note about fast-forwards' Sektion von 'git push --help'\n"
|
||||
"für weitere Details."
|
||||
"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Führe die\n"
|
||||
"externen Änderungen zusammen (z.B. 'git pull') bevor du erneut versendest.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für\n"
|
||||
"weitere Details."
|
||||
|
||||
#: builtin/push.c:144
|
||||
msgid ""
|
||||
@@ -2977,10 +2973,10 @@ msgid ""
|
||||
"variable to 'current' or 'upstream' to push only the current branch."
|
||||
msgstr ""
|
||||
"Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n"
|
||||
"Zweiges hinter seinem entfernten Gegenstück ist. Wenn du nicht beabsichtigt\n"
|
||||
"hast, diesen Zweig zu versenden, kannst du auch den zu versendenden Zweig\n"
|
||||
"spezifizieren oder die Konfigurationsvariable 'push.default' zu 'current'\n"
|
||||
"oder 'upstream' setze, um nur den aktuellen Zweig zu versenden."
|
||||
"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Wenn du nicht\n"
|
||||
"beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu versendenden\n"
|
||||
"Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu 'current'\n"
|
||||
"oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden."
|
||||
|
||||
#: builtin/push.c:150
|
||||
msgid ""
|
||||
@@ -2990,10 +2986,10 @@ msgid ""
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n"
|
||||
"Zweiges hinter seinem entfernten Gegenstück ist. Checke diesen Zweig aus\n"
|
||||
"und führe die entfernten Änderungen zusammen (z.B. 'git pull') bevor du\n"
|
||||
"erneut versendest.\n"
|
||||
"Sie auch die 'Note about fast-forwards' Sektion von 'git push --help'\n"
|
||||
"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Checke diesen\n"
|
||||
"Zweig aus und führe die externen Änderungen zusammen (z.B. 'git pull')\n"
|
||||
"bevor du erneut versendest.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
|
||||
"für weitere Details."
|
||||
|
||||
#: builtin/push.c:190
|
||||
@@ -3006,20 +3002,7 @@ msgstr "Versende nach %s\n"
|
||||
msgid "failed to push some refs to '%s'"
|
||||
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
|
||||
|
||||
#: builtin/push.c:159
|
||||
#, c-format
|
||||
msgid ""
|
||||
"To prevent you from losing history, non-fast-forward updates were rejected\n"
|
||||
"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
|
||||
"'Note about fast-forwards' section of 'git push --help' for details.\n"
|
||||
msgstr ""
|
||||
"Um dich vor Verlust von Historie zu bewahren, wurden nicht vorzuspulende "
|
||||
"Aktualisierungen zurückgewiesen.\n"
|
||||
"Führe die externen Änderungen zusammen (z.B. 'git pull') bevor du erneut "
|
||||
"versendest. Siehe auch die 'Note about fast-forwards' Sektion von \n"
|
||||
"'git push --help' für weitere Details.\n"
|
||||
|
||||
#: builtin/push.c:176
|
||||
#: builtin/push.c:226
|
||||
#, c-format
|
||||
msgid "bad repository '%s'"
|
||||
msgstr "ungültiges Projektarchiv '%s'"
|
||||
@@ -3066,11 +3049,11 @@ msgstr "--mirror kann nicht mit Referenzspezifikationen kombiniert werden"
|
||||
msgid "--all and --mirror are incompatible"
|
||||
msgstr "--all und --mirror sind inkompatibel"
|
||||
|
||||
#: builtin/push.c:342
|
||||
#: builtin/push.c:334
|
||||
msgid "--delete is incompatible with --all, --mirror and --tags"
|
||||
msgstr "--delete ist inkompatibel mit --all, --mirror und --tags"
|
||||
|
||||
#: builtin/push.c:344
|
||||
#: builtin/push.c:336
|
||||
msgid "--delete doesn't make sense without any refs"
|
||||
msgstr "--delete macht ohne irgendeine Referenz keinen Sinn"
|
||||
|
||||
@@ -3165,11 +3148,11 @@ msgstr "%s: %s kann nicht mit %s benutzt werden"
|
||||
msgid "program error"
|
||||
msgstr "Programmfehler"
|
||||
|
||||
#: builtin/revert.c:212
|
||||
#: builtin/revert.c:213
|
||||
msgid "revert failed"
|
||||
msgstr "\"revert\" fehlgeschlagen"
|
||||
|
||||
#: builtin/revert.c:227
|
||||
#: builtin/revert.c:228
|
||||
msgid "cherry-pick failed"
|
||||
msgstr "\"cherry-pick\" fehlgeschlagen"
|
||||
|
||||
@@ -3692,68 +3675,68 @@ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
|
||||
msgstr ""
|
||||
"Git-Verzeichnis '$a' ist Teil des Unterprojekt-Pfades '$b', oder umgekehrt"
|
||||
|
||||
#: git-submodule.sh:249
|
||||
#: git-submodule.sh:248
|
||||
#, sh-format
|
||||
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
||||
msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
|
||||
|
||||
#: git-submodule.sh:266
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists in the index"
|
||||
msgstr "'$sm_path' existiert bereits in der Bereitstellung"
|
||||
#: git-submodule.sh:265
|
||||
#, sh-format
|
||||
msgid "'$path' already exists in the index"
|
||||
msgstr "'$path' existiert bereits in der Bereitstellung"
|
||||
|
||||
#: git-submodule.sh:283
|
||||
#: git-submodule.sh:282
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists and is not a valid git repo"
|
||||
msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Projektarchiv"
|
||||
|
||||
#: git-submodule.sh:297
|
||||
#: git-submodule.sh:296
|
||||
#, sh-format
|
||||
msgid "Unable to checkout submodule '$sm_path'"
|
||||
msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken"
|
||||
|
||||
#: git-submodule.sh:302
|
||||
#: git-submodule.sh:301
|
||||
#, sh-format
|
||||
msgid "Failed to add submodule '$sm_path'"
|
||||
msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen"
|
||||
|
||||
#: git-submodule.sh:307
|
||||
#: git-submodule.sh:306
|
||||
#, sh-format
|
||||
msgid "Failed to register submodule '$sm_path'"
|
||||
msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen"
|
||||
|
||||
#: git-submodule.sh:349
|
||||
#: git-submodule.sh:348
|
||||
#, sh-format
|
||||
msgid "Entering '$prefix$sm_path'"
|
||||
msgstr "Betrete '$prefix$sm_path'"
|
||||
|
||||
#: git-submodule.sh:363
|
||||
#: git-submodule.sh:360
|
||||
#, sh-format
|
||||
msgid "Stopping at '$sm_path'; script returned non-zero status."
|
||||
msgstr "Stoppe bei '$sm_path'; Skript gab nicht-Null Status zurück."
|
||||
|
||||
#: git-submodule.sh:405
|
||||
#: git-submodule.sh:402
|
||||
#, sh-format
|
||||
msgid "No url found for submodule path '$sm_path' in .gitmodules"
|
||||
msgstr "Keine URL für Unterprojekt-Pfad '$sm_path' in .gitmodules gefunden"
|
||||
|
||||
#: git-submodule.sh:414
|
||||
#: git-submodule.sh:411
|
||||
#, sh-format
|
||||
msgid "Failed to register url for submodule path '$sm_path'"
|
||||
msgstr "Registrierung der URL für Unterprojekt-Pfad '$sm_path' fehlgeschlagen"
|
||||
|
||||
#: git-submodule.sh:422
|
||||
#: git-submodule.sh:419
|
||||
#, sh-format
|
||||
msgid "Failed to register update mode for submodule path '$sm_path'"
|
||||
msgstr "Registrierung des Aktualisierungsmodus für Unterprojekt-Pfad "
|
||||
"'$sm_path' fehlgeschlagen"
|
||||
|
||||
#: git-submodule.sh:424
|
||||
#: git-submodule.sh:421
|
||||
#, sh-format
|
||||
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
|
||||
msgstr "Unterprojekt '$name' ($url) ist für Pfad '$sm_path' registriert"
|
||||
|
||||
#: git-submodule.sh:523
|
||||
#: git-submodule.sh:520
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"Submodule path '$sm_path' not initialized\n"
|
||||
@@ -3762,81 +3745,84 @@ msgstr ""
|
||||
"Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n"
|
||||
"Vielleicht möchtest du 'update --init' benutzen?"
|
||||
|
||||
#: git-submodule.sh:536
|
||||
#: git-submodule.sh:533
|
||||
#, sh-format
|
||||
msgid "Unable to find current revision in submodule path '$sm_path'"
|
||||
msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden"
|
||||
|
||||
#: git-submodule.sh:555
|
||||
#: git-submodule.sh:552
|
||||
#, sh-format
|
||||
msgid "Unable to fetch in submodule path '$sm_path'"
|
||||
msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern"
|
||||
|
||||
#: git-submodule.sh:569
|
||||
#: git-submodule.sh:566
|
||||
#, sh-format
|
||||
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
|
||||
msgstr "Neuaufbau von '$sha1' in Unterprojekt-Pfad '$sm_path' nicht möglich"
|
||||
|
||||
#: git-submodule.sh:570
|
||||
#: git-submodule.sh:567
|
||||
#, sh-format
|
||||
msgid "Submodule path '$sm_path': rebased into '$sha1'"
|
||||
msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'"
|
||||
|
||||
#: git-submodule.sh:575
|
||||
#: git-submodule.sh:572
|
||||
#, sh-format
|
||||
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
|
||||
msgstr ""
|
||||
"Zusammenführung von '$sha1' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen"
|
||||
|
||||
#: git-submodule.sh:576
|
||||
#: git-submodule.sh:573
|
||||
#, sh-format
|
||||
msgid "Submodule path '$sm_path': merged in '$sha1'"
|
||||
msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'"
|
||||
|
||||
#: git-submodule.sh:581
|
||||
#: git-submodule.sh:578
|
||||
#, sh-format
|
||||
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
|
||||
msgstr "Konnte '$sha1' in Unterprojekt-Pfad '$sm_path' nicht auschecken."
|
||||
|
||||
#: git-submodule.sh:582
|
||||
#: git-submodule.sh:579
|
||||
#, sh-format
|
||||
msgid "Submodule path '$sm_path': checked out '$sha1'"
|
||||
msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt"
|
||||
|
||||
#: git-submodule.sh:604 git-submodule.sh:927
|
||||
#: git-submodule.sh:601 git-submodule.sh:924
|
||||
#, sh-format
|
||||
msgid "Failed to recurse into submodule path '$sm_path'"
|
||||
msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:712
|
||||
#: git-submodule.sh:709
|
||||
msgid "--"
|
||||
msgstr "--"
|
||||
|
||||
#: git-submodule.sh:770
|
||||
#: git-submodule.sh:767
|
||||
#, sh-format
|
||||
msgid " Warn: $name doesn't contain commit $sha1_src"
|
||||
msgstr " Warnung: $name beinhaltet nicht Version $sha1_src"
|
||||
|
||||
#: git-submodule.sh:773
|
||||
#: git-submodule.sh:770
|
||||
#, sh-format
|
||||
msgid " Warn: $name doesn't contain commit $sha1_dst"
|
||||
msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst"
|
||||
|
||||
#: git-submodule.sh:776
|
||||
#: git-submodule.sh:773
|
||||
#, sh-format
|
||||
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
|
||||
msgstr ""
|
||||
" Warnung: $name beinhaltet nicht die Versionen $sha1_src und $sha1_dst"
|
||||
|
||||
#: git-submodule.sh:801
|
||||
#: git-submodule.sh:798
|
||||
msgid "blob"
|
||||
msgstr "Blob"
|
||||
|
||||
#: git-submodule.sh:802
|
||||
#: git-submodule.sh:799
|
||||
msgid "submodule"
|
||||
msgstr "Unterprojekt"
|
||||
|
||||
#: git-submodule.sh:973
|
||||
#: git-submodule.sh:970
|
||||
#, sh-format
|
||||
msgid "Synchronizing submodule url for '$name'"
|
||||
msgstr "Synchronisiere Unterprojekt-URL für '$name'"
|
||||
|
||||
#~ msgid "Too many options specified"
|
||||
#~ msgstr "Zu viele Optionen angegeben"
|
||||
|
||||
472
po/git.pot
472
po/git.pot
File diff suppressed because it is too large
Load Diff
2561
po/pt_PT.po
2561
po/pt_PT.po
File diff suppressed because it is too large
Load Diff
108
po/zh_CN.po
108
po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2012-04-28 20:17+0800\n"
|
||||
"POT-Creation-Date: 2012-05-15 06:31+0800\n"
|
||||
"PO-Revision-Date: 2012-01-30 00:00+0800\n"
|
||||
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
|
||||
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
|
||||
@@ -113,7 +113,7 @@ msgid ", %d deletion(-)"
|
||||
msgid_plural ", %d deletions(-)"
|
||||
msgstr[0] "，删除 %d 行(-)"
|
||||
|
||||
#: diff.c:3435
|
||||
#: diff.c:3439
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Failed to parse --dirstat/-X option parameter:\n"
|
||||
@@ -2010,21 +2010,17 @@ msgstr "获取组并指定引用表达式没有意义"
|
||||
msgid "Invalid %s: '%s'"
|
||||
msgstr "无效的 %s：'%s'"
|
||||
|
||||
#: builtin/gc.c:78
|
||||
msgid "Too many options specified"
|
||||
msgstr "指定了太多的选项"
|
||||
|
||||
#: builtin/gc.c:103
|
||||
#: builtin/gc.c:90
|
||||
#, c-format
|
||||
msgid "insanely long object directory %.*s"
|
||||
msgstr "不正常的长对象目录 %.*s"
|
||||
|
||||
#: builtin/gc.c:223
|
||||
#: builtin/gc.c:221
|
||||
#, c-format
|
||||
msgid "Auto packing the repository for optimum performance.\n"
|
||||
msgstr "自动打包版本库以求最佳性能。\n"
|
||||
|
||||
#: builtin/gc.c:226
|
||||
#: builtin/gc.c:224
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Auto packing the repository for optimum performance. You may also\n"
|
||||
@@ -2033,7 +2029,7 @@ msgstr ""
|
||||
"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
|
||||
"参见 \"git help gc\" 以获取更多信息。\n"
|
||||
|
||||
#: builtin/gc.c:256
|
||||
#: builtin/gc.c:251
|
||||
msgid ""
|
||||
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
||||
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
|
||||
@@ -2825,22 +2821,22 @@ msgstr "对象 %s 没有注解\n"
|
||||
msgid "Unknown subcommand: %s"
|
||||
msgstr "未知子命令：%s"
|
||||
|
||||
#: builtin/pack-objects.c:2310
|
||||
#: builtin/pack-objects.c:2315
|
||||
#, c-format
|
||||
msgid "unsupported index version %s"
|
||||
msgstr "不支持的索引版本 %s"
|
||||
|
||||
#: builtin/pack-objects.c:2314
|
||||
#: builtin/pack-objects.c:2319
|
||||
#, c-format
|
||||
msgid "bad index version '%s'"
|
||||
msgstr "坏的索引版本 '%s'"
|
||||
|
||||
#: builtin/pack-objects.c:2322
|
||||
#: builtin/pack-objects.c:2342
|
||||
#, c-format
|
||||
msgid "option %s does not accept negative form"
|
||||
msgstr "选项 %s 不接受否定格式"
|
||||
|
||||
#: builtin/pack-objects.c:2326
|
||||
#: builtin/pack-objects.c:2346
|
||||
#, c-format
|
||||
msgid "unable to parse value '%s' for option %s"
|
||||
msgstr "不能解析值 '%s' 针对于选项 %s"
|
||||
@@ -2907,9 +2903,9 @@ msgid ""
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒绝，因为您当前分支落后于对应的远程分支。再次推送前先与远程变更\n"
|
||||
"合并（如 'git pull'）。\n"
|
||||
"详见 'git push --help' 中的 'Note about fast-forwards' 的内容。"
|
||||
"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
|
||||
"再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
|
||||
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
|
||||
#: builtin/push.c:144
|
||||
msgid ""
|
||||
@@ -2918,9 +2914,10 @@ msgid ""
|
||||
"specify branches to push or set the 'push.default' configuration\n"
|
||||
"variable to 'current' or 'upstream' to push only the current branch."
|
||||
msgstr ""
|
||||
"更新被拒绝，因为推送的一个分支落后于对应的远程分支。如果您并非有意推送\n"
|
||||
"该分支，您可以指定要推送的分支或者设置 'push.default' 配置变量为\n"
|
||||
"'current' 或 'upstream' 以便只推送当前分支。"
|
||||
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
|
||||
"如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
|
||||
"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送"
|
||||
"当前分支。"
|
||||
|
||||
#: builtin/push.c:150
|
||||
msgid ""
|
||||
@@ -2929,9 +2926,9 @@ msgid ""
|
||||
"(e.g. 'git pull') before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒绝，因为推送的一个分支落后于对应的远程分支。检出该分支并在再次\n"
|
||||
"推送之前与远程变更合并（如 'git pull'）。\n"
|
||||
"详见 'git push --help' 中的 'Note about fast-forwards' 的内容。"
|
||||
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
|
||||
"检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
|
||||
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
|
||||
#: builtin/push.c:190
|
||||
#, c-format
|
||||
@@ -2989,11 +2986,11 @@ msgstr "--mirror 不能和引用表达式共用"
|
||||
msgid "--all and --mirror are incompatible"
|
||||
msgstr "--all 和 --mirror 不兼容"
|
||||
|
||||
#: builtin/push.c:342
|
||||
#: builtin/push.c:334
|
||||
msgid "--delete is incompatible with --all, --mirror and --tags"
|
||||
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
|
||||
|
||||
#: builtin/push.c:344
|
||||
#: builtin/push.c:336
|
||||
msgid "--delete doesn't make sense without any refs"
|
||||
msgstr "--delete 未接任何引用没有意义"
|
||||
|
||||
@@ -3601,67 +3598,67 @@ msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
|
||||
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
|
||||
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
|
||||
|
||||
#: git-submodule.sh:249
|
||||
#: git-submodule.sh:248
|
||||
#, sh-format
|
||||
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
||||
msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
|
||||
|
||||
#: git-submodule.sh:266
|
||||
#: git-submodule.sh:265
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists in the index"
|
||||
msgstr "'$sm_path' 已经存在于索引中"
|
||||
|
||||
#: git-submodule.sh:283
|
||||
#: git-submodule.sh:282
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists and is not a valid git repo"
|
||||
msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
|
||||
|
||||
#: git-submodule.sh:297
|
||||
#: git-submodule.sh:296
|
||||
#, sh-format
|
||||
msgid "Unable to checkout submodule '$sm_path'"
|
||||
msgstr "不能检出子模组 '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:302
|
||||
#: git-submodule.sh:301
|
||||
#, sh-format
|
||||
msgid "Failed to add submodule '$sm_path'"
|
||||
msgstr "无法添加子模组 '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:307
|
||||
#: git-submodule.sh:306
|
||||
#, sh-format
|
||||
msgid "Failed to register submodule '$sm_path'"
|
||||
msgstr "无法注册子模组 '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:349
|
||||
#: git-submodule.sh:348
|
||||
#, sh-format
|
||||
msgid "Entering '$prefix$sm_path'"
|
||||
msgstr "正在进入 '$prefix$sm_path'"
|
||||
|
||||
#: git-submodule.sh:363
|
||||
#: git-submodule.sh:360
|
||||
#, sh-format
|
||||
msgid "Stopping at '$sm_path'; script returned non-zero status."
|
||||
msgstr "停止于 '$sm_path'，脚本返回非零值。"
|
||||
|
||||
#: git-submodule.sh:405
|
||||
#: git-submodule.sh:402
|
||||
#, sh-format
|
||||
msgid "No url found for submodule path '$sm_path' in .gitmodules"
|
||||
msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
|
||||
|
||||
#: git-submodule.sh:414
|
||||
#: git-submodule.sh:411
|
||||
#, sh-format
|
||||
msgid "Failed to register url for submodule path '$sm_path'"
|
||||
msgstr "无法为子模组路径 '$sm_path' 注册 url"
|
||||
|
||||
#: git-submodule.sh:422
|
||||
#: git-submodule.sh:419
|
||||
#, sh-format
|
||||
msgid "Failed to register update mode for submodule path '$sm_path'"
|
||||
msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
|
||||
|
||||
#: git-submodule.sh:424
|
||||
#: git-submodule.sh:421
|
||||
#, sh-format
|
||||
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
|
||||
msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
|
||||
|
||||
#: git-submodule.sh:523
|
||||
#: git-submodule.sh:520
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"Submodule path '$sm_path' not initialized\n"
|
||||
@@ -3670,82 +3667,85 @@ msgstr ""
|
||||
"子模组路径 '$sm_path' 没有初始化\n"
|
||||
"也许您想用 'update --init'？"
|
||||
|
||||
#: git-submodule.sh:536
|
||||
#: git-submodule.sh:533
|
||||
#, sh-format
|
||||
msgid "Unable to find current revision in submodule path '$sm_path'"
|
||||
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
|
||||
|
||||
#: git-submodule.sh:555
|
||||
#: git-submodule.sh:552
|
||||
#, sh-format
|
||||
msgid "Unable to fetch in submodule path '$sm_path'"
|
||||
msgstr "无法在子模组路径 '$sm_path' 中获取"
|
||||
|
||||
#: git-submodule.sh:569
|
||||
#: git-submodule.sh:566
|
||||
#, sh-format
|
||||
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
|
||||
msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
|
||||
|
||||
#: git-submodule.sh:570
|
||||
#: git-submodule.sh:567
|
||||
#, sh-format
|
||||
msgid "Submodule path '$sm_path': rebased into '$sha1'"
|
||||
msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
|
||||
|
||||
#: git-submodule.sh:575
|
||||
#: git-submodule.sh:572
|
||||
#, sh-format
|
||||
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
|
||||
msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
|
||||
|
||||
#: git-submodule.sh:576
|
||||
#: git-submodule.sh:573
|
||||
#, sh-format
|
||||
msgid "Submodule path '$sm_path': merged in '$sha1'"
|
||||
msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
|
||||
|
||||
#: git-submodule.sh:581
|
||||
#: git-submodule.sh:578
|
||||
#, sh-format
|
||||
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
|
||||
msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
|
||||
|
||||
#: git-submodule.sh:582
|
||||
#: git-submodule.sh:579
|
||||
#, sh-format
|
||||
msgid "Submodule path '$sm_path': checked out '$sha1'"
|
||||
msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
|
||||
|
||||
#: git-submodule.sh:604 git-submodule.sh:927
|
||||
#: git-submodule.sh:601 git-submodule.sh:924
|
||||
#, sh-format
|
||||
msgid "Failed to recurse into submodule path '$sm_path'"
|
||||
msgstr "无法递归进子模组路径 '$sm_path'"
|
||||
|
||||
#: git-submodule.sh:712
|
||||
#: git-submodule.sh:709
|
||||
msgid "--"
|
||||
msgstr "--"
|
||||
|
||||
# 译者：注意保持前导空格
|
||||
#: git-submodule.sh:770
|
||||
#: git-submodule.sh:767
|
||||
#, sh-format
|
||||
msgid " Warn: $name doesn't contain commit $sha1_src"
|
||||
msgstr " 警告：$name 未包含提交 $sha1_src"
|
||||
|
||||
# 译者：注意保持前导空格
|
||||
#: git-submodule.sh:773
|
||||
#: git-submodule.sh:770
|
||||
#, sh-format
|
||||
msgid " Warn: $name doesn't contain commit $sha1_dst"
|
||||
msgstr " 警告：$name 未包含提交 $sha1_dst"
|
||||
|
||||
# 译者：注意保持前导空格
|
||||
#: git-submodule.sh:776
|
||||
#: git-submodule.sh:773
|
||||
#, sh-format
|
||||
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
|
||||
msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
|
||||
|
||||
#: git-submodule.sh:801
|
||||
#: git-submodule.sh:798
|
||||
msgid "blob"
|
||||
msgstr "blob"
|
||||
|
||||
#: git-submodule.sh:802
|
||||
#: git-submodule.sh:799
|
||||
msgid "submodule"
|
||||
msgstr "子模组"
|
||||
|
||||
#: git-submodule.sh:973
|
||||
#: git-submodule.sh:970
|
||||
#, sh-format
|
||||
msgid "Synchronizing submodule url for '$name'"
|
||||
msgstr "为 '$name' 同步子模组 url"
|
||||
|
||||
#~ msgid "Too many options specified"
|
||||
#~ msgstr "指定了太多的选项"
|
||||
|
||||
Reference in New Issue
Block a user