Permalink
Browse files

Merge git://github.com/git-l10n/git-po

By Jiang Xin (3) and others
via Jiang Xin (3) and Ralf Thielow (1)
* git://github.com/git-l10n/git-po:
  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)
  • Loading branch information...
2 parents c0b5c62 + 154ca11 commit 9de96815493b577ae791d5113a3e354142ffbcae @gitster gitster committed May 17, 2012
Showing with 2,367 additions and 976 deletions.
  1. +62 −76 po/de.po
  2. +246 −226 po/git.pot
  3. +2,005 −620 po/pt_PT.po
  4. +54 −54 po/zh_CN.po
View
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"
View
472 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-05-08 16:06+0800\n"
+"POT-Creation-Date: 2012-05-15 06:42+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"
@@ -45,7 +45,7 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:753
+#: bundle.c:89 builtin/commit.c:697
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -557,7 +557,7 @@ msgstr ""
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:788 builtin/apply.c:3682
+#: sequencer.c:788 builtin/apply.c:3689
#, c-format
msgid "cannot open %s: %s"
msgstr ""
@@ -842,7 +842,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:67 builtin/commit.c:282
+#: builtin/add.c:67 builtin/commit.c:226
msgid "updating files failed"
msgstr ""
@@ -932,12 +932,12 @@ msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:342 builtin/mv.c:82
+#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:476 builtin/apply.c:4093 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr ""
@@ -966,32 +966,37 @@ msgstr ""
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:934
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:937
+#: builtin/apply.c:941
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+
+#: builtin/apply.c:942
#, c-format
-msgid "git apply: bad git-diff - inconsistent %s filename on line %d"
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:944
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1387
+#: builtin/apply.c:1394
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1444
+#: builtin/apply.c:1451
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1461
+#: builtin/apply.c:1468
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1002,278 +1007,278 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1621
+#: builtin/apply.c:1628
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1623
+#: builtin/apply.c:1630
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1649
+#: builtin/apply.c:1656
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1685
+#: builtin/apply.c:1692
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1687
+#: builtin/apply.c:1694
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1690
+#: builtin/apply.c:1697
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1836
+#: builtin/apply.c:1843
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1865
+#: builtin/apply.c:1872
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:1951
+#: builtin/apply.c:1958
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2041
+#: builtin/apply.c:2048
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2045
+#: builtin/apply.c:2052
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2116
+#: builtin/apply.c:2123
msgid "oops"
msgstr ""
-#: builtin/apply.c:2638
+#: builtin/apply.c:2645
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2756
+#: builtin/apply.c:2763
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:2768
+#: builtin/apply.c:2775
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2774
+#: builtin/apply.c:2781
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2793
+#: builtin/apply.c:2800
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:2896
+#: builtin/apply.c:2903
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:2902
+#: builtin/apply.c:2909
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:2923
+#: builtin/apply.c:2930
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3038
+#: builtin/apply.c:3045
#, c-format
msgid "patch %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3045 builtin/apply.c:3062
+#: builtin/apply.c:3052 builtin/apply.c:3069
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3077
+#: builtin/apply.c:3084
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3098
+#: builtin/apply.c:3105
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3136
+#: builtin/apply.c:3143
#, c-format
msgid "%s: has been deleted/renamed"
msgstr ""
-#: builtin/apply.c:3141 builtin/apply.c:3172
+#: builtin/apply.c:3148 builtin/apply.c:3179
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3152
+#: builtin/apply.c:3159
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3166
+#: builtin/apply.c:3173
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3183
+#: builtin/apply.c:3190
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3185
+#: builtin/apply.c:3192
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3240
+#: builtin/apply.c:3247
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3259
+#: builtin/apply.c:3266
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
msgstr ""
-#: builtin/apply.c:3265
+#: builtin/apply.c:3272
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3278
+#: builtin/apply.c:3285
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3333 builtin/checkout.c:212 builtin/reset.c:158
+#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:3476
+#: builtin/apply.c:3483
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:3503
+#: builtin/apply.c:3510
#, c-format
msgid "corrupt patch for subproject %s"
msgstr ""
-#: builtin/apply.c:3507
+#: builtin/apply.c:3514
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:3512
+#: builtin/apply.c:3519
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:3515
+#: builtin/apply.c:3522
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:3548
+#: builtin/apply.c:3555
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:3597
+#: builtin/apply.c:3604
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:3653
+#: builtin/apply.c:3660
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:3661
+#: builtin/apply.c:3668
msgid "internal error"
msgstr ""
#. Say this even without --verbose
-#: builtin/apply.c:3664
+#: builtin/apply.c:3671
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:3674
+#: builtin/apply.c:3681
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:3695
+#: builtin/apply.c:3702
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:3698
+#: builtin/apply.c:3705
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:3829
+#: builtin/apply.c:3836
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:3840
+#: builtin/apply.c:3847
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4035
+#: builtin/apply.c:4042
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4038
+#: builtin/apply.c:4045
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4054
+#: builtin/apply.c:4061
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4068
+#: builtin/apply.c:4075
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4074 builtin/apply.c:4084
+#: builtin/apply.c:4081 builtin/apply.c:4091
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -1395,77 +1400,92 @@ msgstr ""
#: builtin/branch.c:409
#, c-format
-msgid "behind %d] "
+msgid "[%s: behind %d]"
msgstr ""
#: builtin/branch.c:411
#, c-format
-msgid "ahead %d] "
+msgid "[behind %d]"
+msgstr ""
+
+#: builtin/branch.c:415
+#, c-format
+msgid "[%s: ahead %d]"
+msgstr ""
+
+#: builtin/branch.c:417
+#, c-format
+msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:413
+#: builtin/branch.c:420
#, c-format
-msgid "ahead %d, behind %d] "
+msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:521
+#: builtin/branch.c:423
+#, c-format
+msgid "[ahead %d, behind %d]"
+msgstr ""
+
+#: builtin/branch.c:535
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:586
+#: builtin/branch.c:600
msgid "some refs could not be read"
msgstr ""
-#: builtin/branch.c:599
+#: builtin/branch.c:613
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:609
+#: builtin/branch.c:623
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:624
+#: builtin/branch.c:638
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:628
+#: builtin/branch.c:642
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:632
+#: builtin/branch.c:646
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:639
+#: builtin/branch.c:653
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:668
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: builtin/branch.c:678
+#: builtin/branch.c:692
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:769
+#: builtin/branch.c:783
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:774 builtin/clone.c:558
+#: builtin/branch.c:788 builtin/clone.c:558
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:794
+#: builtin/branch.c:808
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:843
+#: builtin/branch.c:857
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
@@ -1599,96 +1619,96 @@ msgid ""
"\n"
msgstr ""
-#: builtin/checkout.c:693
+#: builtin/checkout.c:694
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:697
+#: builtin/checkout.c:698
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:723
+#: builtin/checkout.c:724
msgid "You are on a branch yet to be born"
msgstr ""
#. case (1)
-#: builtin/checkout.c:854
+#: builtin/checkout.c:855
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
-#: builtin/checkout.c:893
+#: builtin/checkout.c:894
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:973
+#: builtin/checkout.c:974
msgid "-B cannot be used with -b"
msgstr ""
-#: builtin/checkout.c:982
+#: builtin/checkout.c:983
msgid "--patch is incompatible with all other options"
msgstr ""
-#: builtin/checkout.c:985
+#: builtin/checkout.c:986
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr ""
-#: builtin/checkout.c:987
+#: builtin/checkout.c:988
msgid "--detach cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:993
+#: builtin/checkout.c:994
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1000
+#: builtin/checkout.c:1001
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1007
msgid "--orphan and -b|-B are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1008
+#: builtin/checkout.c:1009
msgid "--orphan cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1019
msgid "git checkout: -f and -m are incompatible"
msgstr ""
-#: builtin/checkout.c:1052
+#: builtin/checkout.c:1053
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1061
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1063
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr ""
-#: builtin/checkout.c:1067
+#: builtin/checkout.c:1068
msgid "git checkout: --detach does not take a path argument"
msgstr ""
-#: builtin/checkout.c:1070
+#: builtin/checkout.c:1071
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1089
+#: builtin/checkout.c:1090
msgid "Cannot switch branch to a non-commit."
msgstr ""
-#: builtin/checkout.c:1092
+#: builtin/checkout.c:1093
msgid "--ours/--theirs is incompatible with switching branches."
msgstr ""
@@ -1892,93 +1912,93 @@ msgid ""
"Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:309
+#: builtin/commit.c:253
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:351
+#: builtin/commit.c:295
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:357
+#: builtin/commit.c:301
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:390 builtin/commit.c:411 builtin/commit.c:461
+#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:442
+#: builtin/commit.c:386
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:444
+#: builtin/commit.c:388
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:454
+#: builtin/commit.c:398
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:474
+#: builtin/commit.c:418
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:549 builtin/commit.c:555
+#: builtin/commit.c:493 builtin/commit.c:499
#, c-format
msgid "invalid commit: %s"
msgstr ""
-#: builtin/commit.c:578
+#: builtin/commit.c:522
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:639
+#: builtin/commit.c:583
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:677 builtin/commit.c:710 builtin/commit.c:1024
+#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:689 builtin/shortlog.c:296
+#: builtin/commit.c:633 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:691
+#: builtin/commit.c:635
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:695
+#: builtin/commit.c:639
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:701
+#: builtin/commit.c:645
msgid "commit has empty message"
msgstr ""
-#: builtin/commit.c:717
+#: builtin/commit.c:661
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:721
+#: builtin/commit.c:665
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:725
+#: builtin/commit.c:669
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:777
+#: builtin/commit.c:721
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:788
+#: builtin/commit.c:732
#, c-format
msgid ""
"\n"
@@ -1988,7 +2008,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:793
+#: builtin/commit.c:737
#, c-format
msgid ""
"\n"
@@ -1998,171 +2018,171 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:805
+#: builtin/commit.c:749
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:810
+#: builtin/commit.c:754
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:823
+#: builtin/commit.c:767
#, c-format
msgid "%sAuthor: %s"
msgstr ""
-#: builtin/commit.c:830
+#: builtin/commit.c:774
#, c-format
msgid "%sCommitter: %s"
msgstr ""
-#: builtin/commit.c:850
+#: builtin/commit.c:794
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:887
+#: builtin/commit.c:831
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:902 builtin/tag.c:361
+#: builtin/commit.c:846 builtin/tag.c:361
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:999
+#: builtin/commit.c:943
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:1014 builtin/commit.c:1214
+#: builtin/commit.c:958 builtin/commit.c:1158
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1054
+#: builtin/commit.c:998
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1065
+#: builtin/commit.c:1009
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1068
+#: builtin/commit.c:1012
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1070
+#: builtin/commit.c:1014
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1073
+#: builtin/commit.c:1017
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1083
+#: builtin/commit.c:1027
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1085
+#: builtin/commit.c:1029
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1093
+#: builtin/commit.c:1037
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1110
+#: builtin/commit.c:1054
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1112
+#: builtin/commit.c:1056
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1114
+#: builtin/commit.c:1058
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1116
+#: builtin/commit.c:1060
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1126 builtin/tag.c:577
+#: builtin/commit.c:1070 builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1131
+#: builtin/commit.c:1075
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1315
+#: builtin/commit.c:1258
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1317
+#: builtin/commit.c:1260
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1358
+#: builtin/commit.c:1301
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1360
+#: builtin/commit.c:1303
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1450
+#: builtin/commit.c:1447
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1487 builtin/merge.c:509
+#: builtin/commit.c:1485 builtin/merge.c:509
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1494
+#: builtin/commit.c:1492
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1501
+#: builtin/commit.c:1499
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1520
+#: builtin/commit.c:1518
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1534
+#: builtin/commit.c:1532
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1539
+#: builtin/commit.c:1537
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
+#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1575
+#: builtin/commit.c:1573
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1579
+#: builtin/commit.c:1577
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1590
+#: builtin/commit.c:1588
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
@@ -2587,237 +2607,237 @@ msgstr ""
msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/index-pack.c:84
+#: builtin/index-pack.c:169
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:104
+#: builtin/index-pack.c:189
msgid "object of unexpected type"
msgstr ""
-#: builtin/index-pack.c:141
+#: builtin/index-pack.c:226
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:151
+#: builtin/index-pack.c:236
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:237
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:164
+#: builtin/index-pack.c:249
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:171
+#: builtin/index-pack.c:256
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:187
+#: builtin/index-pack.c:272
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:192
+#: builtin/index-pack.c:277
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:206
+#: builtin/index-pack.c:291
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:311
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr ""
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:405
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:450
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:353
+#: builtin/index-pack.c:458
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:361
+#: builtin/index-pack.c:466
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:390
+#: builtin/index-pack.c:495
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:392
+#: builtin/index-pack.c:497
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:510
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:476
+#: builtin/index-pack.c:583
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:586
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:488
+#: builtin/index-pack.c:598
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:500
+#: builtin/index-pack.c:610
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:502
+#: builtin/index-pack.c:612
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:504
+#: builtin/index-pack.c:614
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:576 builtin/index-pack.c:602
+#: builtin/index-pack.c:687 builtin/index-pack.c:713
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:706
+#: builtin/index-pack.c:850
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:706
+#: builtin/index-pack.c:850
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:728
+#: builtin/index-pack.c:872
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:733
+#: builtin/index-pack.c:877
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:736
+#: builtin/index-pack.c:880
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:754
+#: builtin/index-pack.c:903
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:787
+#: builtin/index-pack.c:954
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:973
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:998
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:866
+#: builtin/index-pack.c:1077
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:890
+#: builtin/index-pack.c:1101
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:903
+#: builtin/index-pack.c:1114
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:911
+#: builtin/index-pack.c:1122
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:924
+#: builtin/index-pack.c:1135
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:935
+#: builtin/index-pack.c:1146
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1024
+#: builtin/index-pack.c:1247
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1026
+#: builtin/index-pack.c:1249
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1073
+#: builtin/index-pack.c:1296
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1080
+#: builtin/index-pack.c:1303
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1107
+#: builtin/index-pack.c:1330
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1140 builtin/index-pack.c:1143
-#: builtin/index-pack.c:1155 builtin/index-pack.c:1159
+#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
+#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1173
+#: builtin/index-pack.c:1407
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1177 builtin/index-pack.c:1187
+#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1430
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1220
-msgid "confusion beyond insanity"
-msgstr ""
-
-#: builtin/index-pack.c:1239
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
#: builtin/init-db.c:35
#, c-format
msgid "Could not make %s writable by group"
View
2,625 po/pt_PT.po
2,005 additions, 620 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
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 "指定了太多的选项"

0 comments on commit 9de9681

Please sign in to comment.