diff --git a/po/de.po b/po/de.po
index 70d8418f734..0cbcd64a7e1 100644
--- a/po/de.po
+++ b/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-08 10:20+0800\n"
+"POT-Creation-Date: 2012-07-03 10:23+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"
@@ -57,8 +57,8 @@ msgstr "Konnte '%s' nicht öffnen"
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Projektarchiv fehlen folgende vorrausgesetzte Versionen:"
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
-#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
+#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
+#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
@@ -71,44 +71,48 @@ msgstr[0] "Das Paket enthält %d Referenz"
msgstr[1] "Das Paket enthält %d Referenzen"
#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "Das Paket speichert eine komplette Historie."
+
+#: bundle.c:195
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
msgstr[0] "Das Paket benötigt diese Referenz"
msgstr[1] "Das Paket benötigt diese %d Referenzen"
-#: bundle.c:290
+#: bundle.c:294
msgid "rev-list died"
msgstr "\"rev-list\" abgebrochen"
-#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
-#: bundle.c:331
+#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:376
+#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: bundle.c:394
+#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr "Konnte Paketobjekte nicht erstellen"
-#: bundle.c:412
+#: bundle.c:416
msgid "pack-objects died"
msgstr "Erstellung der Paketobjekte abgebrochen"
-#: bundle.c:415
+#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
-#: bundle.c:437
+#: bundle.c:441
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
@@ -288,16 +292,16 @@ msgstr "'%s': %s"
msgid "'%s': short read %s"
msgstr "'%s': read() zu kurz %s"
-#: help.c:207
+#: help.c:208
#, c-format
msgid "available git commands in '%s'"
msgstr "Vorhandene Git-Kommandos in '%s'"
-#: help.c:214
+#: help.c:215
msgid "git commands available from elsewhere on your $PATH"
msgstr "Vorhandene Git-Kommandos irgendwo in deinem $PATH"
-#: help.c:270
+#: help.c:271
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -306,11 +310,11 @@ msgstr ""
"'%s' scheint ein git-Kommando zu sein, konnte aber\n"
"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
-#: help.c:327
+#: help.c:328
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Uh oh. Keine Git-Kommandos auf deinem System vorhanden."
-#: help.c:349
+#: help.c:350
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -319,17 +323,17 @@ msgstr ""
"Warnung: Du hast das nicht existierende Git-Kommando '%s' ausgeführt.\n"
"Setze fort unter der Annahme das du '%s' gemeint hast"
-#: help.c:354
+#: help.c:355
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "automatisch in %0.1f Sekunden..."
-#: help.c:361
+#: help.c:362
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' ist kein Git-Kommando. Siehe 'git --help'."
-#: help.c:365
+#: help.c:366
msgid ""
"\n"
"Did you mean this?"
@@ -673,243 +677,351 @@ msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s"
msgid "no such user"
msgstr "kein solcher Benutzer"
-#: wt-status.c:135
+#: wt-status.c:141
msgid "Unmerged paths:"
msgstr "Nicht zusammengeführte Pfade:"
-#: wt-status.c:141 wt-status.c:158
+#: wt-status.c:168 wt-status.c:195
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
" (benutze \"git reset %s <Datei>...\" zum Herausnehmen aus der "
"Bereitstellung)"
-#: wt-status.c:143 wt-status.c:160
+#: wt-status.c:170 wt-status.c:197
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (benutze \"git rm --cached <Datei>...\" zum Herausnehmen aus der "
"Bereitstellung)"
-#: wt-status.c:144
+#: wt-status.c:174
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)"
+
+#: wt-status.c:176 wt-status.c:180
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (benutze \"git add/rm <Datei>...\" um die Auflösung entsprechend zu "
"markieren)"
-#: wt-status.c:152
+#: wt-status.c:178
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)"
+
+#: wt-status.c:189
msgid "Changes to be committed:"
msgstr "zum Eintragen bereitgestellte Änderungen:"
-#: wt-status.c:170
+#: wt-status.c:207
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Eintragen bereitgestellt sind:"
-#: wt-status.c:174
+#: wt-status.c:211
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (benutze \"git add <Datei>...\" zum Bereitstellen)"
-#: wt-status.c:176
+#: wt-status.c:213
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (benutze \"git add/rm <Datei>...\" zum Bereitstellen)"
-#: wt-status.c:177
+#: wt-status.c:214
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (benutze \"git checkout -- <Datei>...\" um die Änderungen im "
"Arbeitsverzeichnis zu verwerfen)"
-#: wt-status.c:179
+#: wt-status.c:216
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (trage ein oder verwerfe den unbeobachteten oder geänderten Inhalt in den "
"Unterprojekten)"
-#: wt-status.c:188
+#: wt-status.c:225
#, c-format
msgid "%s files:"
msgstr "%s Dateien:"
-#: wt-status.c:191
+#: wt-status.c:228
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (benutze \"git %s <Datei>...\" zum Einfügen in die Eintragung)"
-#: wt-status.c:208
+#: wt-status.c:245
msgid "bug"
msgstr "Fehler"
-#: wt-status.c:213
+#: wt-status.c:250
msgid "both deleted:"
msgstr "beide gelöscht:"
-#: wt-status.c:214
+#: wt-status.c:251
msgid "added by us:"
msgstr "von uns hinzugefügt:"
-#: wt-status.c:215
+#: wt-status.c:252
msgid "deleted by them:"
msgstr "von denen gelöscht:"
-#: wt-status.c:216
+#: wt-status.c:253
msgid "added by them:"
msgstr "von denen hinzugefügt:"
-#: wt-status.c:217
+#: wt-status.c:254
msgid "deleted by us:"
msgstr "von uns gelöscht:"
-#: wt-status.c:218
+#: wt-status.c:255
msgid "both added:"
msgstr "von beiden hinzugefügt:"
-#: wt-status.c:219
+#: wt-status.c:256
msgid "both modified:"
msgstr "von beiden geändert:"
-#: wt-status.c:249
+#: wt-status.c:286
msgid "new commits, "
msgstr "neue Versionen, "
-#: wt-status.c:251
+#: wt-status.c:288
msgid "modified content, "
msgstr "geänderter Inhalt, "
-#: wt-status.c:253
+#: wt-status.c:290
msgid "untracked content, "
msgstr "unbeobachteter Inhalt, "
-#: wt-status.c:267
+#: wt-status.c:304
#, c-format
msgid "new file: %s"
msgstr "neue Datei: %s"
-#: wt-status.c:270
+#: wt-status.c:307
#, c-format
msgid "copied: %s -> %s"
msgstr "kopiert: %s -> %s"
-#: wt-status.c:273
+#: wt-status.c:310
#, c-format
msgid "deleted: %s"
msgstr "gelöscht: %s"
-#: wt-status.c:276
+#: wt-status.c:313
#, c-format
msgid "modified: %s"
msgstr "geändert: %s"
-#: wt-status.c:279
+#: wt-status.c:316
#, c-format
msgid "renamed: %s -> %s"
msgstr "umbenannt: %s -> %s"
-#: wt-status.c:282
+#: wt-status.c:319
#, c-format
msgid "typechange: %s"
msgstr "Typänderung: %s"
-#: wt-status.c:285
+#: wt-status.c:322
#, c-format
msgid "unknown: %s"
msgstr "unbekannt: %s"
-#: wt-status.c:288
+#: wt-status.c:325
#, c-format
msgid "unmerged: %s"
msgstr "nicht zusammengeführt: %s"
-#: wt-status.c:291
+#: wt-status.c:328
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "Fehler: unbehandelter Differenz-Status %c"
-#: wt-status.c:737
+#: wt-status.c:786
+msgid "You have unmerged paths."
+msgstr "Du hast nicht zusammengeführte Pfade."
+
+#: wt-status.c:789 wt-status.c:913
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (behebe die Konflikte und führe \"git commit\" aus)"
+
+#: wt-status.c:792
+msgid "All conflicts fixed but you are still merging."
+msgstr "Alle Konflikte sind behoben, aber du bist immer noch beim "
+"Zusammenführen."
+
+#: wt-status.c:795
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (benutze \"git commit\" um die Zusammenführung abzuschließen)"
+
+#: wt-status.c:805
+msgid "You are in the middle of an am session."
+msgstr "Eine \"am\"-Sitzung ist im Gange."
+
+#: wt-status.c:808
+msgid "The current patch is empty."
+msgstr "Der aktuelle Patch ist leer."
+
+#: wt-status.c:812
+msgid " (fix conflicts and then run \"git am --resolved\")"
+msgstr " (behebe die Konflikte und führe dann \"git am --resolved\" aus)"
+
+#: wt-status.c:814
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (benutze \"git am --skip\" um diesen Patch auszulassen)"
+
+#: wt-status.c:816
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (benutze \"git am --abort\" um den ursprünglichen Zweig "
+"wiederherzustellen)"
+
+#: wt-status.c:874 wt-status.c:884
+msgid "You are currently rebasing."
+msgstr "Du bist gerade beim Neuaufbau."
+
+#: wt-status.c:877
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (behebe die Konflikte und führe dann \"git rebase --continue\" aus)"
+
+#: wt-status.c:879
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (benutze \"git rebase --skip\" um diesen Patch auszulassen)"
+
+#: wt-status.c:881
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (benutze \"git rebase --abort\" um den ursprünglichen Zweig "
+"auszuchecken)"
+
+#: wt-status.c:887
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (alle Konflikte behoben: führe \"git rebase --continue\" aus)"
+
+#: wt-status.c:889
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf."
+
+#: wt-status.c:892
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " (Sobald dein Arbeitsverzeichnis sauber ist, führe "
+"\"git rebase --continue\" aus)"
+
+#: wt-status.c:894
+msgid "You are currently editing a commit during a rebase."
+msgstr "Du editierst gerade eine Version während eines Neuaufbaus."
+
+#: wt-status.c:897
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (benutze \"git commit --amend\" um die aktuelle Version "
+"nachzubessern)"
+
+#: wt-status.c:899
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (benutze \"git rebase --continue\" sobald deine Änderungen "
+"abgeschlossen sind)"
+
+#: wt-status.c:909
+msgid "You are currently cherry-picking."
+msgstr "Du führst gerade \"cherry-pick\" aus."
+
+#: wt-status.c:916
+msgid " (all conflicts fixed: run \"git commit\")"
+msgstr " (alle Konflikte behoben: führe \"git commit\" aus)"
+
+#: wt-status.c:925
+msgid "You are currently bisecting."
+msgstr "Du bist gerade beim Halbieren."
+
+#: wt-status.c:928
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (benutze \"git bisect reset\" um zum ursprünglichen Zweig "
+"zurückzukehren)"
+
+#: wt-status.c:979
msgid "On branch "
msgstr "Auf Zweig "
-#: wt-status.c:744
+#: wt-status.c:986
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Zweig."
-#: wt-status.c:755
+#: wt-status.c:998
msgid "Initial commit"
msgstr "Initiale Version"
-#: wt-status.c:769
+#: wt-status.c:1012
msgid "Untracked"
msgstr "Unbeobachtete"
-#: wt-status.c:771
+#: wt-status.c:1014
msgid "Ignored"
msgstr "Ignorierte"
-#: wt-status.c:773
+#: wt-status.c:1016
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unbeobachtete Dateien nicht aufgelistet%s"
-#: wt-status.c:775
+#: wt-status.c:1018
msgid " (use -u option to show untracked files)"
msgstr " (benutze die Option -u um unbeobachteten Dateien anzuzeigen)"
-#: wt-status.c:781
+#: wt-status.c:1024
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:785
+#: wt-status.c:1028
#, c-format
msgid "no changes added to commit%s\n"
msgstr "keine Änderungen zum Eintragen hinzugefügt%s\n"
-#: wt-status.c:787
+#: wt-status.c:1030
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr " (benutze \"git add\" und/oder \"git commit -a\")"
-#: wt-status.c:789
+#: wt-status.c:1032
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr ""
"nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien%s\n"
-#: wt-status.c:791
+#: wt-status.c:1034
msgid " (use \"git add\" to track)"
msgstr " (benutze \"git add\" zum Beobachten)"
-#: wt-status.c:793 wt-status.c:796 wt-status.c:799
+#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
#, c-format
msgid "nothing to commit%s\n"
msgstr "nichts zum Eintragen%s\n"
-#: wt-status.c:794
+#: wt-status.c:1037
msgid " (create/copy files and use \"git add\" to track)"
msgstr " (Erstelle/Kopiere Dateien und benutze \"git add\" zum Beobachten)"
-#: wt-status.c:797
+#: wt-status.c:1040
msgid " (use -u to show untracked files)"
msgstr " (benutze die Option -u um unbeobachtete Dateien anzuzeigen)"
-#: wt-status.c:800
+#: wt-status.c:1043
msgid " (working directory clean)"
msgstr " (Arbeitsverzeichnis sauber)"
-#: wt-status.c:908
+#: wt-status.c:1151
msgid "HEAD (no branch)"
msgstr "HEAD (kein Zweig)"
-#: wt-status.c:914
+#: wt-status.c:1157
msgid "Initial commit on "
msgstr "Initiale Version auf "
-#: wt-status.c:929
+#: wt-status.c:1172
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:932 wt-status.c:935
+#: wt-status.c:1175 wt-status.c:1178
msgid "ahead "
msgstr "voraus "
-#: wt-status.c:937
+#: wt-status.c:1180
msgid ", behind "
msgstr ", hinterher "
@@ -937,7 +1049,7 @@ msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht bereitgestellte Änderungen nach Aktualisierung der Bereitstellung:"
-#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
+#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
@@ -1017,7 +1129,7 @@ msgstr "Wolltest du vielleicht 'git add .' sagen?\n"
msgid "index file corrupt"
msgstr "Bereitstellungsdatei beschädigt"
-#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr "Konnte neue Bereitstellungsdatei nicht schreiben."
@@ -2608,22 +2720,22 @@ msgstr "Ungültige Option: %s"
msgid "Not a git repository"
msgstr "Kein Git-Projektarchiv"
-#: builtin/diff.c:347
+#: builtin/diff.c:341
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
-#: builtin/diff.c:352
+#: builtin/diff.c:346
#, c-format
msgid "more than %d trees given: '%s'"
msgstr "Mehr als %d Zweige angegeben: '%s'"
-#: builtin/diff.c:362
+#: builtin/diff.c:356
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
-#: builtin/diff.c:370
+#: builtin/diff.c:364
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
@@ -2882,30 +2994,30 @@ msgstr ""
msgid "both --cached and trees are given."
msgstr "sowohl --cached als auch Zweige gegeben"
-#: builtin/help.c:59
+#: builtin/help.c:63
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nicht erkanntes Hilfeformat: %s"
-#: builtin/help.c:87
+#: builtin/help.c:91
msgid "Failed to start emacsclient."
msgstr "Konnte emacsclient nicht starten."
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to parse emacsclient version."
msgstr "Konnte Version des emacsclient nicht parsen."
-#: builtin/help.c:108
+#: builtin/help.c:112
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
-#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
#, c-format
msgid "failed to exec '%s': %s"
msgstr "Fehler beim Ausführen von '%s': %s"
-#: builtin/help.c:211
+#: builtin/help.c:215
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -2914,7 +3026,7 @@ msgstr ""
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Du könntest stattdessen 'man.<Werkzeug>.cmd' benutzen."
-#: builtin/help.c:223
+#: builtin/help.c:227
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -2923,267 +3035,278 @@ msgstr ""
"'%s': Kommando für unterstützten Handbuchbetrachter.\n"
"Du könntest stattdessen 'man.<Werkzeug>.path' benutzen."
-#: builtin/help.c:287
+#: builtin/help.c:291
msgid "The most commonly used git commands are:"
msgstr "Die allgemein verwendeten Git-Kommandos sind:"
-#: builtin/help.c:355
+#: builtin/help.c:359
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
-#: builtin/help.c:372
+#: builtin/help.c:376
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:380
+#: builtin/help.c:384
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:391
+#: builtin/help.c:395
#, c-format
msgid "'%s': not a documentation directory."
msgstr "'%s' ist kein Dokumentationsverzeichnis"
-#: builtin/help.c:432 builtin/help.c:439
+#: builtin/help.c:436 builtin/help.c:443
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
-#: builtin/help.c:453
+#: builtin/help.c:459
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "für `git %s' wurde der Alias `%s' angelegt"
-#: builtin/index-pack.c:169
+#: builtin/index-pack.c:170
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:189
+#: builtin/index-pack.c:190
msgid "object of unexpected type"
msgstr "Objekt hat unerwarteten Typ"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kann %d Byte nicht lesen"
msgstr[1] "kann %d Bytes nicht lesen"
-#: builtin/index-pack.c:236
+#: builtin/index-pack.c:237
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:237
+#: builtin/index-pack.c:238
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:250
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:257
msgid "pack too large for current definition of off_t"
msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273
#, c-format
msgid "unable to create '%s'"
msgstr "konnte '%s' nicht erstellen"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "Paket hat ein ungültiges Objekt bei Versatz %lu: %s"
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:434
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:450
+#: builtin/index-pack.c:483
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:458
+#: builtin/index-pack.c:491
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:499
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:495
+#: builtin/index-pack.c:531
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:497
+#: builtin/index-pack.c:533
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %lu Byte"
msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %lu Bytes"
-#: builtin/index-pack.c:510
+#: builtin/index-pack.c:555
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:583
-#, c-format
-msgid "cannot read existing object %s"
-msgstr "Kann existierendes Objekt %s nicht lesen."
-
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
+#: builtin/index-pack.c:709 builtin/index-pack.c:718
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:598
+#: builtin/index-pack.c:649 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:262
+#, c-format
+msgid "unable to read %s"
+msgstr "kann %s nicht lesen"
+
+#: builtin/index-pack.c:715
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "Kann existierendes Objekt %s nicht lesen."
+
+#: builtin/index-pack.c:729
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:610
+#: builtin/index-pack.c:744
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:746
msgid "Error in object"
msgstr "Fehler in Objekt"
-#: builtin/index-pack.c:614
+#: builtin/index-pack.c:748
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:687 builtin/index-pack.c:713
+#: builtin/index-pack.c:818 builtin/index-pack.c:844
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:872
+#: builtin/index-pack.c:1009
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:877
+#: builtin/index-pack.c:1014
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:880
+#: builtin/index-pack.c:1017
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:903
+#: builtin/index-pack.c:1028
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
+
+#: builtin/index-pack.c:1051
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:954
+#: builtin/index-pack.c:1102
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:973
+#: builtin/index-pack.c:1121
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelöste Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:998
+#: builtin/index-pack.c:1146
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1225
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1101
+#: builtin/index-pack.c:1249
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1114
+#: builtin/index-pack.c:1262
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
-#: builtin/index-pack.c:1122
+#: builtin/index-pack.c:1270
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1283
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1294
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1395
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1397
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1444
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1451
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
-#: builtin/index-pack.c:1330
+#: builtin/index-pack.c:1478
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
-#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
-#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
+#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
+#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1555
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kann nicht ohne --stdin benutzt werden"
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
+#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1578
msgid "--verify with no packfile name given"
msgstr "--verify ohne Name der Paketdatei angegeben"
@@ -3331,94 +3454,94 @@ msgstr "Kann nicht auf aktuelles Arbeitsverzeichnis zugreifen."
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsbaum '%s' zugreifen."
-#: builtin/log.c:188
+#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:401 builtin/log.c:489
+#: builtin/log.c:402 builtin/log.c:490
#, c-format
msgid "Could not read object %s"
msgstr "Kann Objekt %s nicht lesen."
-#: builtin/log.c:513
+#: builtin/log.c:514
#, c-format
msgid "Unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:602
+#: builtin/log.c:603
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:676
+#: builtin/log.c:677
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:687
+#: builtin/log.c:688
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:701
+#: builtin/log.c:702
msgid "Need exactly one range."
msgstr "Brauche genau einen Versionsbereich."
-#: builtin/log.c:709
+#: builtin/log.c:710
msgid "Not a range."
msgstr "Kein Versionsbereich."
-#: builtin/log.c:786
+#: builtin/log.c:787
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:859
+#: builtin/log.c:860
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:932
+#: builtin/log.c:933
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1153
+#: builtin/log.c:1154
#, c-format
msgid "bogus committer info %s"
msgstr "unechte Einreicher-Informationen %s"
-#: builtin/log.c:1198
+#: builtin/log.c:1199
msgid "-n and -k are mutually exclusive."
msgstr "-n und -k schliessen sich gegenseitig aus"
-#: builtin/log.c:1200
+#: builtin/log.c:1201
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix und -k schliessen sich gegenseitig aus"
-#: builtin/log.c:1208
+#: builtin/log.c:1209
msgid "--name-only does not make sense"
msgstr "--name-only macht keinen Sinn"
-#: builtin/log.c:1210
+#: builtin/log.c:1211
msgid "--name-status does not make sense"
msgstr "--name-status macht keinen Sinn"
-#: builtin/log.c:1212
+#: builtin/log.c:1213
msgid "--check does not make sense"
msgstr "--check macht keinen Sinn"
-#: builtin/log.c:1235
+#: builtin/log.c:1236
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1237
+#: builtin/log.c:1238
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1390
+#: builtin/log.c:1391
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1494
+#: builtin/log.c:1495
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -3426,7 +3549,7 @@ msgstr ""
"Konnte gefolgten, externen Zweig nicht finden, bitte gebe <upstream> manuell "
"an.\n"
-#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
+#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
#, c-format
msgid "Unknown commit %s"
msgstr "Unbekannte Version %s"
@@ -3926,22 +4049,27 @@ msgstr "Objekt %s hat keine Notiz\n"
msgid "Unknown subcommand: %s"
msgstr "Unbekanntes Unterkommando: %s"
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#, c-format
+msgid "deflate error (%d)"
+msgstr "Fehler beim Komprimieren (%d)"
+
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Bereitstellungsversion %s"
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Bereitstellungsversion '%s'"
-#: builtin/pack-objects.c:2364
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "Option %s akzeptiert keine negative Form"
-#: builtin/pack-objects.c:2368
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "konnte Wert '%s' für Option %s nicht parsen"
@@ -4946,9 +5074,10 @@ msgid ""
"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"
+"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
@@ -5019,9 +5148,10 @@ msgid ""
"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"
+"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
@@ -5414,109 +5544,108 @@ msgstr "Kein Zweigname spezifiziert"
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung gebe \"git stash apply\" ein)"
-#: git-submodule.sh:56
+#: git-submodule.sh:88
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren"
-#: git-submodule.sh:109
+#: git-submodule.sh:145
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
"Keine Unterprojekt-Zuordnung in .gitmodules für Pfad '$sm_path' gefunden"
-#: git-submodule.sh:150
+#: git-submodule.sh:186
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "Klonen von '$url' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:160
+#: git-submodule.sh:196
#, sh-format
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:285
#, 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
+#: git-submodule.sh:302
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existiert bereits in der Bereitstellung"
-#: git-submodule.sh:270
+#: git-submodule.sh:306
#, 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"
+"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
+#: git-submodule.sh:317
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Füge existierendes Projektarchiv in '$sm_path' der Bereitstellung "
-"hinzu."
+msgstr ""
+"Füge existierendes Projektarchiv in '$sm_path' der Bereitstellung hinzu."
-#: git-submodule.sh:283
+#: git-submodule.sh:319
#, 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:333
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken"
-#: git-submodule.sh:302
+#: git-submodule.sh:338
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:307
+#: git-submodule.sh:343
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:349
+#: git-submodule.sh:385
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr "Betrete '$prefix$sm_path'"
-#: git-submodule.sh:363
+#: git-submodule.sh:399
#, 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:406
+#: git-submodule.sh:442
#, 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:415
+#: git-submodule.sh:451
#, 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:417
+#: git-submodule.sh:453
#, 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:425
+#: git-submodule.sh:461
#, 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:524
+#: git-submodule.sh:560
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
@@ -5525,95 +5654,95 @@ msgstr ""
"Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n"
"Vielleicht möchtest du 'update --init' benutzen?"
-#: git-submodule.sh:537
+#: git-submodule.sh:573
#, 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:556
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern"
-#: git-submodule.sh:570
+#: git-submodule.sh:606
#, 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:571
+#: git-submodule.sh:607
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'"
-#: git-submodule.sh:576
+#: git-submodule.sh:612
#, 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:577
+#: git-submodule.sh:613
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'"
-#: git-submodule.sh:582
+#: git-submodule.sh:618
#, 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:583
+#: git-submodule.sh:619
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt"
-#: git-submodule.sh:605 git-submodule.sh:928
+#: git-submodule.sh:641 git-submodule.sh:964
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'"
-#: git-submodule.sh:713
+#: git-submodule.sh:749
msgid "--cached cannot be used with --files"
msgstr "--cached kann nicht mit --files benutzt werden"
#. unexpected type
-#: git-submodule.sh:753
+#: git-submodule.sh:789
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:771
+#: git-submodule.sh:807
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr " Warnung: $name beinhaltet nicht Version $sha1_src"
-#: git-submodule.sh:774
+#: git-submodule.sh:810
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst"
-#: git-submodule.sh:777
+#: git-submodule.sh:813
#, 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:802
+#: git-submodule.sh:838
msgid "blob"
msgstr "Blob"
-#: git-submodule.sh:803
+#: git-submodule.sh:839
msgid "submodule"
msgstr "Unterprojekt"
-#: git-submodule.sh:840
+#: git-submodule.sh:876
msgid "# Submodules changed but not updated:"
msgstr "# Unterprojekte geändert, aber nicht aktualisiert:"
-#: git-submodule.sh:842
+#: git-submodule.sh:878
msgid "# Submodule changes to be committed:"
msgstr "# Änderungen in Unterprojekt zum Eintragen:"
-#: git-submodule.sh:974
+#: git-submodule.sh:1022
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr "Synchronisiere Unterprojekt-URL für '$name'"
diff --git a/po/git.pot b/po/git.pot
index b6665060de2..3d9ae759ea3 100644
--- a/po/git.pot
+++ b/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-08 10:20+0800\n"
+"POT-Creation-Date: 2012-07-03 10:23+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"
@@ -54,8 +54,8 @@ msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
-#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
+#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
+#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
@@ -68,44 +68,48 @@ msgstr[0] ""
msgstr[1] ""
#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr ""
+
+#: bundle.c:195
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:290
+#: bundle.c:294
msgid "rev-list died"
msgstr ""
-#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:331
+#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:376
+#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:394
+#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:412
+#: bundle.c:416
msgid "pack-objects died"
msgstr ""
-#: bundle.c:415
+#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:437
+#: bundle.c:441
msgid "index-pack died"
msgstr ""
@@ -280,44 +284,44 @@ msgstr ""
msgid "'%s': short read %s"
msgstr ""
-#: help.c:207
+#: help.c:208
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:214
+#: help.c:215
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:270
+#: help.c:271
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:327
+#: help.c:328
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:349
+#: help.c:350
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
-#: help.c:354
+#: help.c:355
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:361
+#: help.c:362
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:365
+#: help.c:366
msgid ""
"\n"
"Did you mean this?"
@@ -638,232 +642,333 @@ msgstr ""
msgid "no such user"
msgstr ""
-#: wt-status.c:135
+#: wt-status.c:141
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:141 wt-status.c:158
+#: wt-status.c:168 wt-status.c:195
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:143 wt-status.c:160
+#: wt-status.c:170 wt-status.c:197
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:144
+#: wt-status.c:174
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+
+#: wt-status.c:176 wt-status.c:180
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:152
+#: wt-status.c:178
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+
+#: wt-status.c:189
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:170
+#: wt-status.c:207
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:174
+#: wt-status.c:211
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:176
+#: wt-status.c:213
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:177
+#: wt-status.c:214
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:179
+#: wt-status.c:216
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:188
+#: wt-status.c:225
#, c-format
msgid "%s files:"
msgstr ""
-#: wt-status.c:191
+#: wt-status.c:228
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:208
+#: wt-status.c:245
msgid "bug"
msgstr ""
-#: wt-status.c:213
+#: wt-status.c:250
msgid "both deleted:"
msgstr ""
-#: wt-status.c:214
+#: wt-status.c:251
msgid "added by us:"
msgstr ""
-#: wt-status.c:215
+#: wt-status.c:252
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:216
+#: wt-status.c:253
msgid "added by them:"
msgstr ""
-#: wt-status.c:217
+#: wt-status.c:254
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:218
+#: wt-status.c:255
msgid "both added:"
msgstr ""
-#: wt-status.c:219
+#: wt-status.c:256
msgid "both modified:"
msgstr ""
-#: wt-status.c:249
+#: wt-status.c:286
msgid "new commits, "
msgstr ""
-#: wt-status.c:251
+#: wt-status.c:288
msgid "modified content, "
msgstr ""
-#: wt-status.c:253
+#: wt-status.c:290
msgid "untracked content, "
msgstr ""
-#: wt-status.c:267
+#: wt-status.c:304
#, c-format
msgid "new file: %s"
msgstr ""
-#: wt-status.c:270
+#: wt-status.c:307
#, c-format
msgid "copied: %s -> %s"
msgstr ""
-#: wt-status.c:273
+#: wt-status.c:310
#, c-format
msgid "deleted: %s"
msgstr ""
-#: wt-status.c:276
+#: wt-status.c:313
#, c-format
msgid "modified: %s"
msgstr ""
-#: wt-status.c:279
+#: wt-status.c:316
#, c-format
msgid "renamed: %s -> %s"
msgstr ""
-#: wt-status.c:282
+#: wt-status.c:319
#, c-format
msgid "typechange: %s"
msgstr ""
-#: wt-status.c:285
+#: wt-status.c:322
#, c-format
msgid "unknown: %s"
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:325
#, c-format
msgid "unmerged: %s"
msgstr ""
-#: wt-status.c:291
+#: wt-status.c:328
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:737
+#: wt-status.c:786
+msgid "You have unmerged paths."
+msgstr ""
+
+#: wt-status.c:789 wt-status.c:913
+msgid " (fix conflicts and run \"git commit\")"
+msgstr ""
+
+#: wt-status.c:792
+msgid "All conflicts fixed but you are still merging."
+msgstr ""
+
+#: wt-status.c:795
+msgid " (use \"git commit\" to conclude merge)"
+msgstr ""
+
+#: wt-status.c:805
+msgid "You are in the middle of an am session."
+msgstr ""
+
+#: wt-status.c:808
+msgid "The current patch is empty."
+msgstr ""
+
+#: wt-status.c:812
+msgid " (fix conflicts and then run \"git am --resolved\")"
+msgstr ""
+
+#: wt-status.c:814
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:816
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr ""
+
+#: wt-status.c:874 wt-status.c:884
+msgid "You are currently rebasing."
+msgstr ""
+
+#: wt-status.c:877
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr ""
+
+#: wt-status.c:879
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:881
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+
+#: wt-status.c:887
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+
+#: wt-status.c:889
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+
+#: wt-status.c:892
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+
+#: wt-status.c:894
+msgid "You are currently editing a commit during a rebase."
+msgstr ""
+
+#: wt-status.c:897
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+
+#: wt-status.c:899
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+
+#: wt-status.c:909
+msgid "You are currently cherry-picking."
+msgstr ""
+
+#: wt-status.c:916
+msgid " (all conflicts fixed: run \"git commit\")"
+msgstr ""
+
+#: wt-status.c:925
+msgid "You are currently bisecting."
+msgstr ""
+
+#: wt-status.c:928
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+
+#: wt-status.c:979
msgid "On branch "
msgstr ""
-#: wt-status.c:744
+#: wt-status.c:986
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:755
+#: wt-status.c:998
msgid "Initial commit"
msgstr ""
-#: wt-status.c:769
+#: wt-status.c:1012
msgid "Untracked"
msgstr ""
-#: wt-status.c:771
+#: wt-status.c:1014
msgid "Ignored"
msgstr ""
-#: wt-status.c:773
+#: wt-status.c:1016
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:775
+#: wt-status.c:1018
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:781
+#: wt-status.c:1024
msgid "No changes"
msgstr ""
-#: wt-status.c:785
+#: wt-status.c:1028
#, c-format
msgid "no changes added to commit%s\n"
msgstr ""
-#: wt-status.c:787
+#: wt-status.c:1030
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr ""
-#: wt-status.c:789
+#: wt-status.c:1032
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr ""
-#: wt-status.c:791
+#: wt-status.c:1034
msgid " (use \"git add\" to track)"
msgstr ""
-#: wt-status.c:793 wt-status.c:796 wt-status.c:799
+#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
#, c-format
msgid "nothing to commit%s\n"
msgstr ""
-#: wt-status.c:794
+#: wt-status.c:1037
msgid " (create/copy files and use \"git add\" to track)"
msgstr ""
-#: wt-status.c:797
+#: wt-status.c:1040
msgid " (use -u to show untracked files)"
msgstr ""
-#: wt-status.c:800
+#: wt-status.c:1043
msgid " (working directory clean)"
msgstr ""
-#: wt-status.c:908
+#: wt-status.c:1151
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:914
+#: wt-status.c:1157
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:929
+#: wt-status.c:1172
msgid "behind "
msgstr ""
-#: wt-status.c:932 wt-status.c:935
+#: wt-status.c:1175 wt-status.c:1178
msgid "ahead "
msgstr ""
-#: wt-status.c:937
+#: wt-status.c:1180
msgid ", behind "
msgstr ""
@@ -890,7 +995,7 @@ msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
+#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
@@ -967,7 +1072,7 @@ msgstr ""
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr ""
@@ -2432,22 +2537,22 @@ msgstr ""
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:347
+#: builtin/diff.c:341
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:352
+#: builtin/diff.c:346
#, c-format
msgid "more than %d trees given: '%s'"
msgstr ""
-#: builtin/diff.c:362
+#: builtin/diff.c:356
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:370
+#: builtin/diff.c:364
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
@@ -2689,303 +2794,314 @@ msgstr ""
msgid "both --cached and trees are given."
msgstr ""
-#: builtin/help.c:59
+#: builtin/help.c:63
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:87
+#: builtin/help.c:91
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:108
+#: builtin/help.c:112
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
#, c-format
msgid "failed to exec '%s': %s"
msgstr ""
-#: builtin/help.c:211
+#: builtin/help.c:215
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:223
+#: builtin/help.c:227
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:287
+#: builtin/help.c:291
msgid "The most commonly used git commands are:"
msgstr ""
-#: builtin/help.c:355
+#: builtin/help.c:359
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:372
+#: builtin/help.c:376
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:380
+#: builtin/help.c:384
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:391
+#: builtin/help.c:395
#, c-format
msgid "'%s': not a documentation directory."
msgstr ""
-#: builtin/help.c:432 builtin/help.c:439
+#: builtin/help.c:436 builtin/help.c:443
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:453
+#: builtin/help.c:459
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/index-pack.c:169
+#: builtin/index-pack.c:170
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:189
+#: builtin/index-pack.c:190
msgid "object of unexpected type"
msgstr ""
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:236
+#: builtin/index-pack.c:237
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:237
+#: builtin/index-pack.c:238
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:250
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:257
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr ""
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:434
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:450
+#: builtin/index-pack.c:483
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:458
+#: builtin/index-pack.c:491
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:499
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:495
+#: builtin/index-pack.c:531
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:497
+#: builtin/index-pack.c:533
#, 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:510
+#: builtin/index-pack.c:555
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:583
-#, c-format
-msgid "cannot read existing object %s"
-msgstr ""
-
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
+#: builtin/index-pack.c:709 builtin/index-pack.c:718
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:598
+#: builtin/index-pack.c:649 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:262
+#, c-format
+msgid "unable to read %s"
+msgstr ""
+
+#: builtin/index-pack.c:715
+#, c-format
+msgid "cannot read existing object %s"
+msgstr ""
+
+#: builtin/index-pack.c:729
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:610
+#: builtin/index-pack.c:744
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:746
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:614
+#: builtin/index-pack.c:748
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:687 builtin/index-pack.c:713
+#: builtin/index-pack.c:818 builtin/index-pack.c:844
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:872
+#: builtin/index-pack.c:1009
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:877
+#: builtin/index-pack.c:1014
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:880
+#: builtin/index-pack.c:1017
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:903
+#: builtin/index-pack.c:1028
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr ""
+
+#: builtin/index-pack.c:1051
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:954
+#: builtin/index-pack.c:1102
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:973
+#: builtin/index-pack.c:1121
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:998
+#: builtin/index-pack.c:1146
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1225
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1101
+#: builtin/index-pack.c:1249
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1114
+#: builtin/index-pack.c:1262
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1122
+#: builtin/index-pack.c:1270
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1283
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1294
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1395
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1397
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1444
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1451
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1330
+#: builtin/index-pack.c:1478
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
-#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
+#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
+#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1555
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
+#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1578
msgid "--verify with no packfile name given"
msgstr ""
@@ -3131,100 +3247,100 @@ msgstr ""
msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/log.c:188
+#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:401 builtin/log.c:489
+#: builtin/log.c:402 builtin/log.c:490
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:513
+#: builtin/log.c:514
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:602
+#: builtin/log.c:603
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:676
+#: builtin/log.c:677
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:687
+#: builtin/log.c:688
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:701
+#: builtin/log.c:702
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:709
+#: builtin/log.c:710
msgid "Not a range."
msgstr ""
-#: builtin/log.c:786
+#: builtin/log.c:787
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:859
+#: builtin/log.c:860
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:932
+#: builtin/log.c:933
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1153
+#: builtin/log.c:1154
#, c-format
msgid "bogus committer info %s"
msgstr ""
-#: builtin/log.c:1198
+#: builtin/log.c:1199
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1200
+#: builtin/log.c:1201
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1208
+#: builtin/log.c:1209
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1210
+#: builtin/log.c:1211
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1212
+#: builtin/log.c:1213
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1235
+#: builtin/log.c:1236
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1237
+#: builtin/log.c:1238
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1390
+#: builtin/log.c:1391
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1494
+#: builtin/log.c:1495
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
+#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
#, c-format
msgid "Unknown commit %s"
msgstr ""
@@ -3694,22 +3810,27 @@ msgstr ""
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2364
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr ""
-#: builtin/pack-objects.c:2368
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr ""
@@ -5021,37 +5142,37 @@ msgstr ""
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:56
+#: git-submodule.sh:88
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
-#: git-submodule.sh:109
+#: git-submodule.sh:145
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:150
+#: git-submodule.sh:186
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
-#: git-submodule.sh:160
+#: git-submodule.sh:196
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:285
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:266
+#: git-submodule.sh:302
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:270
+#: git-submodule.sh:306
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -5059,155 +5180,155 @@ msgid ""
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:317
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:283
+#: git-submodule.sh:319
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:297
+#: git-submodule.sh:333
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:302
+#: git-submodule.sh:338
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:307
+#: git-submodule.sh:343
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:349
+#: git-submodule.sh:385
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr ""
-#: git-submodule.sh:363
+#: git-submodule.sh:399
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:406
+#: git-submodule.sh:442
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr ""
-#: git-submodule.sh:415
+#: git-submodule.sh:451
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:417
+#: git-submodule.sh:453
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:425
+#: git-submodule.sh:461
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:524
+#: git-submodule.sh:560
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-#: git-submodule.sh:537
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:556
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:570
+#: git-submodule.sh:606
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:571
+#: git-submodule.sh:607
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:576
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:577
+#: git-submodule.sh:613
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:582
+#: git-submodule.sh:618
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:583
+#: git-submodule.sh:619
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:605 git-submodule.sh:928
+#: git-submodule.sh:641 git-submodule.sh:964
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:713
+#: git-submodule.sh:749
msgid "--cached cannot be used with --files"
msgstr ""
#. unexpected type
-#: git-submodule.sh:753
+#: git-submodule.sh:789
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:771
+#: git-submodule.sh:807
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:774
+#: git-submodule.sh:810
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:777
+#: git-submodule.sh:813
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:802
+#: git-submodule.sh:838
msgid "blob"
msgstr ""
-#: git-submodule.sh:803
+#: git-submodule.sh:839
msgid "submodule"
msgstr ""
-#: git-submodule.sh:840
+#: git-submodule.sh:876
msgid "# Submodules changed but not updated:"
msgstr ""
-#: git-submodule.sh:842
+#: git-submodule.sh:878
msgid "# Submodule changes to be committed:"
msgstr ""
-#: git-submodule.sh:974
+#: git-submodule.sh:1022
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index b0ff6f99a76..2635c2cf7b0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ 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-06-08 10:20+0800\n"
-"PO-Revision-Date: 2012-07-01 22:59+0100\n"
+"POT-Creation-Date: 2012-07-03 10:23+0800\n"
+"PO-Revision-Date: 2012-07-04 19:33+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -57,8 +57,8 @@ msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
-#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
+#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
+#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -71,44 +71,48 @@ msgstr[0] "Paketet (bundlen) innehåller %d referens"
msgstr[1] "Paketet (bundlen) innehåller %d referenser"
#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "Paketet (bundlen) beskriver en komplett historik."
+
+#: bundle.c:195
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
msgstr[0] "Paketet (bundlen) kräver denna referens"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser"
-#: bundle.c:290
+#: bundle.c:294
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:331
+#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:376
+#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:394
+#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:412
+#: bundle.c:416
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:415
+#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:437
+#: bundle.c:441
msgid "index-pack died"
msgstr "index-pack dog"
@@ -287,16 +291,16 @@ msgstr "\"%s\": %s"
msgid "'%s': short read %s"
msgstr "\"%s\": kort läsning %s"
-#: help.c:207
+#: help.c:208
#, c-format
msgid "available git commands in '%s'"
msgstr "git-kommandon tillgängliga i \"%s\""
-#: help.c:214
+#: help.c:215
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
-#: help.c:270
+#: help.c:271
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -305,11 +309,11 @@ msgstr ""
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:327
+#: help.c:328
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: help.c:349
+#: help.c:350
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -318,17 +322,17 @@ msgstr ""
"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
"Fortsätter under förutsättningen att du menade \"%s\""
-#: help.c:354
+#: help.c:355
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "automatiskt om %0.1f sekunder..."
-#: help.c:361
+#: help.c:362
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: help.c:365
+#: help.c:366
msgid ""
"\n"
"Did you mean this?"
@@ -664,240 +668,343 @@ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
msgid "no such user"
msgstr "okänd användare"
-#: wt-status.c:135
+#: wt-status.c:141
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:141 wt-status.c:158
+#: wt-status.c:168 wt-status.c:195
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
-#: wt-status.c:143 wt-status.c:160
+#: wt-status.c:170 wt-status.c:197
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: wt-status.c:144
+#: wt-status.c:174
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (använd \"git add <fil>...\" för att ange lösning)"
+
+#: wt-status.c:176 wt-status.c:180
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:152
+#: wt-status.c:178
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
+
+#: wt-status.c:189
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:170
+#: wt-status.c:207
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:174
+#: wt-status.c:211
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:176
+#: wt-status.c:213
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:177
+#: wt-status.c:214
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
-#: wt-status.c:179
+#: wt-status.c:216
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.
-#: wt-status.c:188
+#: wt-status.c:225
#, c-format
msgid "%s files:"
msgstr "%se filer:"
-#: wt-status.c:191
+#: wt-status.c:228
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (använd \"git %s <fil>...\" för att ta med i vad som skall checkas in)"
-#: wt-status.c:208
+#: wt-status.c:245
msgid "bug"
msgstr "programfel"
-#: wt-status.c:213
+#: wt-status.c:250
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:214
+#: wt-status.c:251
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:215
+#: wt-status.c:252
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:216
+#: wt-status.c:253
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:217
+#: wt-status.c:254
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:218
+#: wt-status.c:255
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:219
+#: wt-status.c:256
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:249
+#: wt-status.c:286
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:251
+#: wt-status.c:288
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:253
+#: wt-status.c:290
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:267
+#: wt-status.c:304
#, c-format
msgid "new file: %s"
msgstr "ny fil: %s"
-#: wt-status.c:270
+#: wt-status.c:307
#, c-format
msgid "copied: %s -> %s"
msgstr "kopierad: %s -> %s"
-#: wt-status.c:273
+#: wt-status.c:310
#, c-format
msgid "deleted: %s"
msgstr "borttagen: %s"
-#: wt-status.c:276
+#: wt-status.c:313
#, c-format
msgid "modified: %s"
msgstr "ändrad: %s"
-#: wt-status.c:279
+#: wt-status.c:316
#, c-format
msgid "renamed: %s -> %s"
msgstr "namnbyte: %s -> %s"
-#: wt-status.c:282
+#: wt-status.c:319
#, c-format
msgid "typechange: %s"
msgstr "typbyte: %s"
-#: wt-status.c:285
+#: wt-status.c:322
#, c-format
msgid "unknown: %s"
msgstr "okänd: %s"
-#: wt-status.c:288
+#: wt-status.c:325
#, c-format
msgid "unmerged: %s"
msgstr "osammansl.: %s"
-#: wt-status.c:291
+#: wt-status.c:328
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "programfel: diff-status %c ej hanterad"
-#: wt-status.c:737
+#: wt-status.c:786
+msgid "You have unmerged paths."
+msgstr "Du har ej sammanslagna sökvägar."
+
+#: wt-status.c:789 wt-status.c:913
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (rätta konflikter och kör \"git commit\")"
+
+#: wt-status.c:792
+msgid "All conflicts fixed but you are still merging."
+msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
+
+#: wt-status.c:795
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
+
+#: wt-status.c:805
+msgid "You are in the middle of an am session."
+msgstr "Du är i mitten av en körning av \"git am\"."
+
+#: wt-status.c:808
+msgid "The current patch is empty."
+msgstr "Aktuell patch är tom."
+
+#: wt-status.c:812
+msgid " (fix conflicts and then run \"git am --resolved\")"
+msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"
+
+#: wt-status.c:814
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
+
+#: wt-status.c:816
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
+
+#: wt-status.c:874 wt-status.c:884
+msgid "You are currently rebasing."
+msgstr "Du håller på med en ombasering."
+
+#: wt-status.c:877
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
+
+#: wt-status.c:879
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
+
+#: wt-status.c:881
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
+
+#: wt-status.c:887
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
+
+#: wt-status.c:889
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Du håller på att dela upp en incheckning i en ombasering."
+
+#: wt-status.c:892
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
+
+#: wt-status.c:894
+msgid "You are currently editing a commit during a rebase."
+msgstr "Du håller på att redigera en incheckning under en ombasering."
+
+#: wt-status.c:897
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
+
+#: wt-status.c:899
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
+
+#: wt-status.c:909
+msgid "You are currently cherry-picking."
+msgstr "Du håller på med en \"cherry-pick\"."
+
+#: wt-status.c:916
+msgid " (all conflicts fixed: run \"git commit\")"
+msgstr " (alla konflikter har rättats: kör \"git commit\")"
+
+#: wt-status.c:925
+msgid "You are currently bisecting."
+msgstr "Du håller på med en \"bisect\"."
+
+#: wt-status.c:928
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
+
+#: wt-status.c:979
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:744
+#: wt-status.c:986
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:755
+#: wt-status.c:998
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:769
+#: wt-status.c:1012
msgid "Untracked"
msgstr "Ospårad"
-#: wt-status.c:771
+#: wt-status.c:1014
msgid "Ignored"
msgstr "Ignorerad"
# %s är nästa sträng eller tom.
-#: wt-status.c:773
+#: wt-status.c:1016
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:775
+#: wt-status.c:1018
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:781
+#: wt-status.c:1024
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:785
+#: wt-status.c:1028
#, c-format
msgid "no changes added to commit%s\n"
msgstr "inga ändringar att checka in%s\n"
-#: wt-status.c:787
+#: wt-status.c:1030
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr " (använd \"git add\" och/eller \"git commit -a\")"
-#: wt-status.c:789
+#: wt-status.c:1032
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr "inget köat för incheckning, men ospårade filer finns%s\n"
-#: wt-status.c:791
+#: wt-status.c:1034
msgid " (use \"git add\" to track)"
msgstr " (använd \"git add\" för att spåra)"
-#: wt-status.c:793 wt-status.c:796 wt-status.c:799
+#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
#, c-format
msgid "nothing to commit%s\n"
msgstr "inget att checka in%s\n"
-#: wt-status.c:794
+#: wt-status.c:1037
msgid " (create/copy files and use \"git add\" to track)"
msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)"
-#: wt-status.c:797
+#: wt-status.c:1040
msgid " (use -u to show untracked files)"
msgstr " (använd -u för att visa ospårade filer)"
-#: wt-status.c:800
+#: wt-status.c:1043
msgid " (working directory clean)"
msgstr " (arbetskatalogen ren)"
-#: wt-status.c:908
+#: wt-status.c:1151
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:914
+#: wt-status.c:1157
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:929
+#: wt-status.c:1172
msgid "behind "
msgstr "efter "
-#: wt-status.c:932 wt-status.c:935
+#: wt-status.c:1175 wt-status.c:1178
msgid "ahead "
msgstr "före "
-#: wt-status.c:937
+#: wt-status.c:1180
msgid ", behind "
msgstr ", efter "
@@ -924,7 +1031,7 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""
msgid "Unstaged changes after refreshing the index:"
msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
+#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
@@ -1001,7 +1108,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n"
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
@@ -2550,22 +2657,22 @@ msgstr "ogiltig flagga: %s"
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:347
+#: builtin/diff.c:341
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:352
+#: builtin/diff.c:346
#, c-format
msgid "more than %d trees given: '%s'"
msgstr "mer än %d träd angavs: \"%s\""
-#: builtin/diff.c:362
+#: builtin/diff.c:356
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:370
+#: builtin/diff.c:364
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
@@ -2815,30 +2922,30 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
-#: builtin/help.c:59
+#: builtin/help.c:63
#, c-format
msgid "unrecognized help format '%s'"
msgstr "okänt hjälpformat: %s"
-#: builtin/help.c:87
+#: builtin/help.c:91
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:108
+#: builtin/help.c:112
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
#, c-format
msgid "failed to exec '%s': %s"
msgstr "exec misslyckades för \"%s\": %s"
-#: builtin/help.c:211
+#: builtin/help.c:215
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -2847,7 +2954,7 @@ msgstr ""
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:223
+#: builtin/help.c:227
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -2856,266 +2963,277 @@ msgstr ""
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:287
+#: builtin/help.c:291
msgid "The most commonly used git commands are:"
msgstr "De mest använda git-kommandona är:"
-#: builtin/help.c:355
+#: builtin/help.c:359
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:372
+#: builtin/help.c:376
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:380
+#: builtin/help.c:384
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:391
+#: builtin/help.c:395
#, c-format
msgid "'%s': not a documentation directory."
msgstr "\"%s\": inte en dokumentationskatalog."
-#: builtin/help.c:432 builtin/help.c:439
+#: builtin/help.c:436 builtin/help.c:443
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/help.c:453
+#: builtin/help.c:459
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "\"git %s\" är ett alias för \"%s\""
-#: builtin/index-pack.c:169
+#: builtin/index-pack.c:170
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:189
+#: builtin/index-pack.c:190
msgid "object of unexpected type"
msgstr "objekt av oväntad typ"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:236
+#: builtin/index-pack.c:237
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:237
+#: builtin/index-pack.c:238
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:250
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:257
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "paketet har felaktigt objekt vid index %lu: %s"
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:434
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:450
+#: builtin/index-pack.c:483
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:458
+#: builtin/index-pack.c:491
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:499
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:495
+#: builtin/index-pack.c:531
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:497
+#: builtin/index-pack.c:533
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"
-#: builtin/index-pack.c:510
+#: builtin/index-pack.c:555
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:583
-#, c-format
-msgid "cannot read existing object %s"
-msgstr "kan inte läsa befintligt objekt %s"
-
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
+#: builtin/index-pack.c:709 builtin/index-pack.c:718
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:598
+#: builtin/index-pack.c:649 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:262
+#, c-format
+msgid "unable to read %s"
+msgstr "kunde inte läsa %s"
+
+#: builtin/index-pack.c:715
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "kan inte läsa befintligt objekt %s"
+
+#: builtin/index-pack.c:729
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:610
+#: builtin/index-pack.c:744
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:746
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:614
+#: builtin/index-pack.c:748
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:687 builtin/index-pack.c:713
+#: builtin/index-pack.c:818 builtin/index-pack.c:844
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Receiving objects"
msgstr "Tar bort objeckt"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:872
+#: builtin/index-pack.c:1009
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:877
+#: builtin/index-pack.c:1014
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:880
+#: builtin/index-pack.c:1017
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:903
+#: builtin/index-pack.c:1028
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "förvirrad bortom vanvett i parse_pack_objects()"
+
+#: builtin/index-pack.c:1051
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:954
+#: builtin/index-pack.c:1102
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:973
+#: builtin/index-pack.c:1121
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:998
+#: builtin/index-pack.c:1146
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1225
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1101
+#: builtin/index-pack.c:1249
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1114
+#: builtin/index-pack.c:1262
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1122
+#: builtin/index-pack.c:1270
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1283
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1294
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1395
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1397
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1444
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1451
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1330
+#: builtin/index-pack.c:1478
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
-#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
+#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
+#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1555
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
+#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1578
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
@@ -3263,100 +3381,100 @@ msgstr "Kan inte komma åt aktuell arbetskatalog"
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
-#: builtin/log.c:188
+#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:401 builtin/log.c:489
+#: builtin/log.c:402 builtin/log.c:490
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:513
+#: builtin/log.c:514
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:602
+#: builtin/log.c:603
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:676
+#: builtin/log.c:677
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:687
+#: builtin/log.c:688
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:701
+#: builtin/log.c:702
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:709
+#: builtin/log.c:710
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:786
+#: builtin/log.c:787
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:859
+#: builtin/log.c:860
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:932
+#: builtin/log.c:933
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1153
+#: builtin/log.c:1154
#, c-format
msgid "bogus committer info %s"
msgstr "felaktig incheckarinformation %s"
-#: builtin/log.c:1198
+#: builtin/log.c:1199
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1200
+#: builtin/log.c:1201
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
-#: builtin/log.c:1208
+#: builtin/log.c:1209
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1210
+#: builtin/log.c:1211
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1212
+#: builtin/log.c:1213
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1235
+#: builtin/log.c:1236
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1237
+#: builtin/log.c:1238
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1390
+#: builtin/log.c:1391
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1494
+#: builtin/log.c:1495
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
+#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
@@ -3846,22 +3964,27 @@ msgstr "Objektet %s har ingen anteckning\n"
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#, c-format
+msgid "deflate error (%d)"
+msgstr "fel i deflate (%d)"
+
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2364
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "flaggan %s godtar inte negativ form"
-#: builtin/pack-objects.c:2368
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
@@ -5291,38 +5414,38 @@ msgstr "Inget grennamn angavs"
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
-#: git-submodule.sh:56
+#: git-submodule.sh:88
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
-#: git-submodule.sh:109
+#: git-submodule.sh:145
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
"Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""
-#: git-submodule.sh:150
+#: git-submodule.sh:186
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:160
+#: git-submodule.sh:196
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"
-#: git-submodule.sh:249
+#: git-submodule.sh:285
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-#: git-submodule.sh:266
+#: git-submodule.sh:302
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:270
+#: git-submodule.sh:306
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -5333,64 +5456,64 @@ msgstr ""
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den"
-#: git-submodule.sh:281
+#: git-submodule.sh:317
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:283
+#: git-submodule.sh:319
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:297
+#: git-submodule.sh:333
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:302
+#: git-submodule.sh:338
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:307
+#: git-submodule.sh:343
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:349
+#: git-submodule.sh:385
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr "Går in i \"$prefix$sm_path\""
-#: git-submodule.sh:363
+#: git-submodule.sh:399
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
"Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."
-#: git-submodule.sh:406
+#: git-submodule.sh:442
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"
-#: git-submodule.sh:415
+#: git-submodule.sh:451
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""
-#: git-submodule.sh:417
+#: git-submodule.sh:453
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""
-#: git-submodule.sh:425
+#: git-submodule.sh:461
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:524
+#: git-submodule.sh:560
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
@@ -5399,93 +5522,93 @@ msgstr ""
"Undermodulen \"$sm_path\" har inte initierats\n"
"Kanske du vill köra \"update --init\"?"
-#: git-submodule.sh:537
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:556
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:570
+#: git-submodule.sh:606
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:571
+#: git-submodule.sh:607
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:576
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:577
+#: git-submodule.sh:613
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:582
+#: git-submodule.sh:618
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:583
+#: git-submodule.sh:619
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""
-#: git-submodule.sh:605 git-submodule.sh:928
+#: git-submodule.sh:641 git-submodule.sh:964
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:713
+#: git-submodule.sh:749
msgid "--cached cannot be used with --files"
msgstr "--cached kan inte användas med --files"
#. unexpected type
-#: git-submodule.sh:753
+#: git-submodule.sh:789
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:771
+#: git-submodule.sh:807
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr " Varning: $name innehåller inte incheckning $sha1_src"
-#: git-submodule.sh:774
+#: git-submodule.sh:810
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr " Varning: $name innehåller inte incheckning $sha1_dst"
-#: git-submodule.sh:777
+#: git-submodule.sh:813
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"
-#: git-submodule.sh:802
+#: git-submodule.sh:838
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:803
+#: git-submodule.sh:839
msgid "submodule"
msgstr "undermodul"
-#: git-submodule.sh:840
+#: git-submodule.sh:876
msgid "# Submodules changed but not updated:"
msgstr "# Undermoduler ändrade men inte uppdaterade:"
-#: git-submodule.sh:842
+#: git-submodule.sh:878
msgid "# Submodule changes to be committed:"
msgstr "# Undermodulers ändringar att checka in:"
-#: git-submodule.sh:974
+#: git-submodule.sh:1022
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr "Synkroniserar undermodul-url för \"$name\""
diff --git a/po/vi.po b/po/vi.po
index f0529f407a1..9c8c6fe174e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git-1.7.11.rc2.2.gb694fbb\n"
+"Project-Id-Version: git-1.7.11.1-107-g72601\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-06-08 10:20+0800\n"
-"PO-Revision-Date: 2012-06-09 14:08+0700\n"
+"POT-Creation-Date: 2012-07-03 10:23+0800\n"
+"PO-Revision-Date: 2012-07-03 14:21+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"
@@ -65,10 +65,10 @@ msgstr "Khó chứa thiếu những lần chuyển giao (commit) cần trước
#: bundle.c:164
#: sequencer.c:550
#: sequencer.c:982
-#: builtin/log.c:289
-#: builtin/log.c:720
-#: builtin/log.c:1309
-#: builtin/log.c:1528
+#: builtin/log.c:290
+#: builtin/log.c:721
+#: builtin/log.c:1310
+#: builtin/log.c:1529
#: builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
@@ -82,46 +82,50 @@ msgstr[0] "Bundle chứa %d tham chiếu (refs)"
msgstr[1] "Bundle chứa %d tham chiếu (refs)"
#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
+
+#: bundle.c:195
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
msgstr[0] "Lệnh bundle yêu cầu tham chiếu (refs) này"
msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này"
-#: bundle.c:290
+#: bundle.c:294
msgid "rev-list died"
msgstr "rev-list bị chết"
-#: bundle.c:296
-#: builtin/log.c:1205
+#: bundle.c:300
+#: builtin/log.c:1206
#: builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
-#: bundle.c:331
+#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "tham chiếu '%s' bị loại trừ bởi các tùy chọn rev-list"
-#: bundle.c:376
+#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bundle trống rỗng."
-#: bundle.c:394
+#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh pack-objects"
-#: bundle.c:412
+#: bundle.c:416
msgid "pack-objects died"
msgstr "pack-objects đã chết"
-#: bundle.c:415
+#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr "không thể tạo '%s'"
-#: bundle.c:437
+#: bundle.c:441
msgid "index-pack died"
msgstr "index-pack đã chết"
@@ -302,16 +306,16 @@ msgstr "'%s': %s"
msgid "'%s': short read %s"
msgstr "'%s': đọc ngắn %s"
-#: help.c:207
+#: help.c:208
#, c-format
msgid "available git commands in '%s'"
msgstr "các lệnh git sẵn sàng để dùng trong '%s'"
-#: help.c:214
+#: help.c:215
msgid "git commands available from elsewhere on your $PATH"
msgstr "các lệnh git sẵn sàng để dùng từ một nơi khác trong $PATH của bạn"
-#: help.c:270
+#: help.c:271
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -320,11 +324,11 @@ msgstr ""
"'%s' trông như là một lệnh git, nhưng chúng tôi không\n"
"thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?"
-#: help.c:327
+#: help.c:328
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả."
-#: help.c:349
+#: help.c:350
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -333,17 +337,17 @@ msgstr ""
"CẢNH BÁO: Bạn đã gọi lệnh Git có tên '%s', mà nó lại không sẵn có.\n"
"Giả định rằng ý bạn là '%s'"
-#: help.c:354
+#: help.c:355
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "trong %0.1f giây một cách tự động..."
-#: help.c:361
+#: help.c:362
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' không phải là một lệnh của git. Xem thêm 'git --help'."
-#: help.c:365
+#: help.c:366
msgid ""
"\n"
"Did you mean this?"
@@ -688,236 +692,339 @@ msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %
msgid "no such user"
msgstr "không có người dùng như vậy"
-#: wt-status.c:135
+#: wt-status.c:141
msgid "Unmerged paths:"
msgstr "Những đường dẫn chưa được hòa trộn:"
-#: wt-status.c:141
-#: wt-status.c:158
+#: wt-status.c:168
+#: wt-status.c:195
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (sử dụng \"git reset %s <tập-tin>...\" để bỏ một stage (trạng thái))"
-#: wt-status.c:143
-#: wt-status.c:160
+#: wt-status.c:170
+#: wt-status.c:197
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (sử dụng \"git rm --cached <tập-tin>...\" để bỏ trạng thái (stage))"
-#: wt-status.c:144
+#: wt-status.c:174
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (sử dụng \"git add <tập-tin>...\" để đánh dấu là cần giải quyết)"
+
+#: wt-status.c:176
+#: wt-status.c:180
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (sử dụng \"git add/rm <tập-tin>...\" như là một cách thích hợp để đánh dấu là cần được giải quyết)"
-#: wt-status.c:152
+#: wt-status.c:178
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (sử dụng \"git rm <tập-tin>...\" để đánh dấu là cần giải quyết)"
+
+#: wt-status.c:189
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:170
+#: wt-status.c:207
msgid "Changes not staged for commit:"
msgstr "Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):"
-#: wt-status.c:174
+#: wt-status.c:211
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (sử dụng \"git add <tập-tin>...\" để cập nhật những gì cần chuyển giao (commit))"
-#: wt-status.c:176
+#: wt-status.c:213
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (sử dụng \"git add/rm <tập_tin>...\" để cập nhật những gì sẽ được chuyển giao)"
-#: wt-status.c:177
+#: wt-status.c:214
msgid " (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr " (sử dụng \"git checkout -- <tập_tin>...\" để loại bỏ những thay đổi trong thư mục làm việc)"
-#: wt-status.c:179
+#: wt-status.c:216
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (chuyển giao (commit) hoặc là loại bỏ các nội dung không-bị-theo-vết hay đã bị chỉnh sửa trong mô-đun-con)"
-#: wt-status.c:188
+#: wt-status.c:225
#, c-format
msgid "%s files:"
msgstr "%s tệp tin:"
-#: wt-status.c:191
+#: wt-status.c:228
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (sử dụng \"git %s <tập-tin>...\" để bao gồm thêm vào những gì cần chuyển giao (commit))"
-#: wt-status.c:208
+#: wt-status.c:245
msgid "bug"
msgstr "lỗi"
-#: wt-status.c:213
+#: wt-status.c:250
msgid "both deleted:"
msgstr "bị xóa bởi cả hai:"
-#: wt-status.c:214
+#: wt-status.c:251
msgid "added by us:"
msgstr "được thêm vào bởi chúng tôi:"
-#: wt-status.c:215
+#: wt-status.c:252
msgid "deleted by them:"
msgstr "bị xóa đi bởi họ:"
-#: wt-status.c:216
+#: wt-status.c:253
msgid "added by them:"
msgstr "được thêm vào bởi họ:"
-#: wt-status.c:217
+#: wt-status.c:254
msgid "deleted by us:"
msgstr "bị xóa bởi chúng tôi:"
-#: wt-status.c:218
+#: wt-status.c:255
msgid "both added:"
msgstr "được thêm vào bởi cả hai:"
-#: wt-status.c:219
+#: wt-status.c:256
msgid "both modified:"
msgstr "bị sửa bởi cả hai:"
-#: wt-status.c:249
+#: wt-status.c:286
msgid "new commits, "
msgstr " lần chuyển giao (commit) mới, "
-#: wt-status.c:251
+#: wt-status.c:288
msgid "modified content, "
msgstr "nội dung được sửa đổi,"
-#: wt-status.c:253
+#: wt-status.c:290
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi"
-#: wt-status.c:267
+#: wt-status.c:304
#, c-format
msgid "new file: %s"
msgstr "tập tin mới: %s"
-#: wt-status.c:270
+#: wt-status.c:307
#, c-format
msgid "copied: %s -> %s"
msgstr "đã sao chép: %s -> %s"
-#: wt-status.c:273
+#: wt-status.c:310
#, c-format
msgid "deleted: %s"
msgstr "bị xóa: %s"
-#: wt-status.c:276
+#: wt-status.c:313
#, c-format
msgid "modified: %s"
msgstr "bị sửa đổi: %s"
-#: wt-status.c:279
+#: wt-status.c:316
#, c-format
msgid "renamed: %s -> %s"
msgstr "đã đổi tên: %s -> %s"
-#: wt-status.c:282
+#: wt-status.c:319
#, c-format
msgid "typechange: %s"
msgstr "đổi-kiểu: %s"
-#: wt-status.c:285
+#: wt-status.c:322
#, c-format
msgid "unknown: %s"
msgstr "không rõ: %s"
-#: wt-status.c:288
+#: wt-status.c:325
#, c-format
msgid "unmerged: %s"
msgstr "chưa hòa trộn: %s"
-#: wt-status.c:291
+#: wt-status.c:328
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "lỗi: không lấy được trạng thái lệnh diff %c"
-#: wt-status.c:737
+#: wt-status.c:786
+msgid "You have unmerged paths."
+msgstr "Bạn có những đường dẫn chưa được hòa trộn."
+
+#: wt-status.c:789
+#: wt-status.c:913
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (sửa các xung đột sau đó chạy \"git commit\")"
+
+#: wt-status.c:792
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
+
+#: wt-status.c:795
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (sử dụng \"git commit\" để hoàn tất việc hòa trộn)"
+
+#: wt-status.c:805
+msgid "You are in the middle of an am session."
+msgstr "Bạn đang ở giữa của một phiên 'am'."
+
+#: wt-status.c:808
+msgid "The current patch is empty."
+msgstr "Miếng vá hiện tại bị trống rỗng."
+
+#: wt-status.c:812
+msgid " (fix conflicts and then run \"git am --resolved\")"
+msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")"
+
+#: wt-status.c:814
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (sử dụng \"git am --skip\" để bỏ qua lần vá này)"
+
+#: wt-status.c:816
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (sử dụng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
+
+#: wt-status.c:874
+#: wt-status.c:884
+msgid "You are currently rebasing."
+msgstr "Bạn hiện nay đang thực hiện việc rebase (tái cấu trúc)."
+
+#: wt-status.c:877
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (sửa các xung đột và sau đó chạy lệnh \"git rebase --continue\")"
+
+#: wt-status.c:879
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (sử dụng \"git rebase --skip\" để bỏ qua lần vá này)"
+
+#: wt-status.c:881
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (sử dụng \"git rebase --abort\" để check-out nhánh nguyên thủy)"
+
+#: wt-status.c:887
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git rebase --continue\")"
+
+#: wt-status.c:889
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc rebase."
+
+#: wt-status.c:892
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " (Một khi thư mục làm việc của bạn đã gọn gàng, chạy \"git rebase --continue\")"
+
+#: wt-status.c:894
+msgid "You are currently editing a commit during a rebase."
+msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
+
+#: wt-status.c:897
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (sử dụng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)"
+
+#: wt-status.c:899
+msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (sử dụng \"git rebase --continue\" một khi bạn cảm thấy hài lòng về những thay đổi của mình)"
+
+#: wt-status.c:909
+msgid "You are currently cherry-picking."
+msgstr "Bạn hiện nay đang thực hiện việc cherry-pick."
+
+#: wt-status.c:916
+msgid " (all conflicts fixed: run \"git commit\")"
+msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git commit\")"
+
+#: wt-status.c:925
+msgid "You are currently bisecting."
+msgstr "Bạn hiện tại đang thực hiện việc bisect (chia đôi)."
+
+#: wt-status.c:928
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (sử dụng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
+
+#: wt-status.c:979
msgid "On branch "
msgstr "Trên nhánh"
-#: wt-status.c:744
+#: wt-status.c:986
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:755
+#: wt-status.c:998
msgid "Initial commit"
msgstr "Lần chuyển giao (commit) khởi đầu"
-#: wt-status.c:769
+#: wt-status.c:1012
msgid "Untracked"
msgstr "Không được theo vết"
-#: wt-status.c:771
+#: wt-status.c:1014
msgid "Ignored"
msgstr "Bị bỏ qua"
-#: wt-status.c:773
+#: wt-status.c:1016
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin không bị theo vết không được liệt kê ra %s"
-#: wt-status.c:775
+#: wt-status.c:1018
msgid " (use -u option to show untracked files)"
msgstr " (sử dụng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-#: wt-status.c:781
+#: wt-status.c:1024
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:785
+#: wt-status.c:1028
#, c-format
msgid "no changes added to commit%s\n"
msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)%s\n"
-#: wt-status.c:787
+#: wt-status.c:1030
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr " (sử dụng \"git add\" và/hoặc \"git commit -a\")"
-#: wt-status.c:789
+#: wt-status.c:1032
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr "không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin không được theo dấu vết hiện diện%s\n"
-#: wt-status.c:791
+#: wt-status.c:1034
msgid " (use \"git add\" to track)"
msgstr " (sử dụng \"git add\" để theo dõi dấu vết)"
-#: wt-status.c:793
-#: wt-status.c:796
-#: wt-status.c:799
+#: wt-status.c:1036
+#: wt-status.c:1039
+#: wt-status.c:1042
#, c-format
msgid "nothing to commit%s\n"
msgstr "không có gì để chuyển giao (commit) %s\n"
-#: wt-status.c:794
+#: wt-status.c:1037
msgid " (create/copy files and use \"git add\" to track)"
msgstr " (tạo/sao-chép các tập tin và sử dụng \"git add\" để theo dõi dấu vết)"
-#: wt-status.c:797
+#: wt-status.c:1040
msgid " (use -u to show untracked files)"
msgstr " (sử dụng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-#: wt-status.c:800
+#: wt-status.c:1043
msgid " (working directory clean)"
msgstr " (thư mục làm việc sạch sẽ)"
-#: wt-status.c:908
+#: wt-status.c:1151
msgid "HEAD (no branch)"
msgstr "HEAD (chưa có nhánh nào)"
-#: wt-status.c:914
+#: wt-status.c:1157
msgid "Initial commit on "
msgstr "Lần chuyển giao (commit) khởi tạo trên"
-#: wt-status.c:929
+#: wt-status.c:1172
msgid "behind "
msgstr "đằng sau"
-#: wt-status.c:932
-#: wt-status.c:935
+#: wt-status.c:1175
+#: wt-status.c:1178
msgid "ahead "
msgstr "phía trước"
-#: wt-status.c:937
+#: wt-status.c:1180
msgid ", behind "
msgstr ", đằng sau"
@@ -946,7 +1053,7 @@ msgid "Unstaged changes after refreshing the index:"
msgstr "Các thay đổi không được lưu trạng thái sau khi làm tươi mới lại bảng mục lục:"
#: builtin/add.c:195
-#: builtin/add.c:456
+#: builtin/add.c:459
#: builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
@@ -1027,7 +1134,7 @@ msgstr "Có lẽ bạn muốn nói là 'git add .' phải không?\n"
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: builtin/add.c:476
+#: builtin/add.c:480
#: builtin/apply.c:4108
#: builtin/mv.c:229
#: builtin/rm.c:260
@@ -2590,22 +2697,22 @@ msgstr "tùy chọn sai: %s"
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:347
+#: builtin/diff.c:341
#, c-format
msgid "invalid object '%s' given."
msgstr "đối tượng đã cho '%s' không hợp lệ."
-#: builtin/diff.c:352
+#: builtin/diff.c:346
#, c-format
msgid "more than %d trees given: '%s'"
msgstr "đã chỉ ra nhiều hơn %d cây (tree): '%s'"
-#: builtin/diff.c:362
+#: builtin/diff.c:356
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "đã cho nhiều hơn hai đối tượng blob: '%s'"
-#: builtin/diff.c:370
+#: builtin/diff.c:364
#, c-format
msgid "unhandled object '%s' given."
msgstr "đã cho đối tượng không thể nắm giữ '%s'."
@@ -2859,33 +2966,33 @@ msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu d
msgid "both --cached and trees are given."
msgstr "cả hai --cached và các cây phải được chỉ ra."
-#: builtin/help.c:59
+#: builtin/help.c:63
#, c-format
msgid "unrecognized help format '%s'"
msgstr "không nhận ra định dạng trợ giúp '%s'"
-#: builtin/help.c:87
+#: builtin/help.c:91
msgid "Failed to start emacsclient."
msgstr "Lỗi khởi chạy emacsclient."
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to parse emacsclient version."
msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
-#: builtin/help.c:108
+#: builtin/help.c:112
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "phiên bản của emacsclient '%d' quá cũ (< 22)."
-#: builtin/help.c:126
-#: builtin/help.c:154
-#: builtin/help.c:163
-#: builtin/help.c:171
+#: builtin/help.c:130
+#: builtin/help.c:158
+#: builtin/help.c:167
+#: builtin/help.c:175
#, c-format
msgid "failed to exec '%s': %s"
msgstr "gặp lỗi khi thực thi '%s': %s"
-#: builtin/help.c:211
+#: builtin/help.c:215
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -2894,7 +3001,7 @@ msgstr ""
"'%s': đường dẫn không hỗ trợ bộ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng 'man.<tool>.cmd' để thay thế."
-#: builtin/help.c:223
+#: builtin/help.c:227
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -2903,271 +3010,286 @@ msgstr ""
"'%s': cmd (lệnh) hỗ trợ bộ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng 'man.<tool>.path' để thay thế."
-#: builtin/help.c:287
+#: builtin/help.c:291
msgid "The most commonly used git commands are:"
msgstr "Những lệnh git hay được sử dụng nhất là:"
-#: builtin/help.c:355
+#: builtin/help.c:359
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': không rõ chương trình xem man."
-#: builtin/help.c:372
+#: builtin/help.c:376
msgid "no man viewer handled the request"
msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu"
-#: builtin/help.c:380
+#: builtin/help.c:384
msgid "no info viewer handled the request"
msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu"
-#: builtin/help.c:391
+#: builtin/help.c:395
#, c-format
msgid "'%s': not a documentation directory."
msgstr "'%s': không phải là một thư mục tài liệu."
-#: builtin/help.c:432
-#: builtin/help.c:439
+#: builtin/help.c:436
+#: builtin/help.c:443
#, c-format
msgid "usage: %s%s"
msgstr "cách sử dụng: %s%s"
-#: builtin/help.c:453
+#: builtin/help.c:459
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' được đặt bí danh thành `%s'"
-#: builtin/index-pack.c:169
+#: builtin/index-pack.c:170
#, c-format
msgid "object type mismatch at %s"
msgstr "kiểu đối tượng không khớp tại %s"
-#: builtin/index-pack.c:189
+#: builtin/index-pack.c:190
msgid "object of unexpected type"
msgstr "đối tượng của kiểu không mong đợi"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "không thể điền vào %d byte"
msgstr[1] "không thể điền vào %d byte"
-#: builtin/index-pack.c:236
+#: builtin/index-pack.c:237
msgid "early EOF"
msgstr "vừa đúng lúc EOF"
-#: builtin/index-pack.c:237
+#: builtin/index-pack.c:238
msgid "read error on input"
msgstr "lỗi đọc ở đầu vào"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:250
msgid "used more bytes than were available"
msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có"
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:257
msgid "pack too large for current definition of off_t"
msgstr "pack quá lớn so với định nghĩa hiện tại của kiểu off_t"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273
#, c-format
msgid "unable to create '%s'"
msgstr "không thể tạo '%s'"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
#, c-format
msgid "cannot open packfile '%s'"
msgstr "không thể mở packfile '%s'"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "pack signature mismatch"
msgstr "chữ ký cho pack không khớp"
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "pack có đối tượng sai khoảng bù (offset) %lu: %s"
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:434
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:450
+#: builtin/index-pack.c:483
msgid "offset value overflow for delta base object"
msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
-#: builtin/index-pack.c:458
+#: builtin/index-pack.c:491
msgid "delta base offset is out of bound"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:499
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:495
+#: builtin/index-pack.c:531
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin pack"
-#: builtin/index-pack.c:497
+#: builtin/index-pack.c:533
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu"
msgstr[1] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu"
-#: builtin/index-pack.c:510
+#: builtin/index-pack.c:555
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:583
-#, c-format
-msgid "cannot read existing object %s"
-msgstr "không thể đọc đối tượng đã tồn tại %s"
-
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:646
+#: builtin/index-pack.c:652
+#: builtin/index-pack.c:675
+#: builtin/index-pack.c:709
+#: builtin/index-pack.c:718
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:598
+#: builtin/index-pack.c:649
+#: builtin/pack-objects.c:170
+#: builtin/pack-objects.c:262
+#, c-format
+msgid "unable to read %s"
+msgstr "không thể đọc %s"
+
+#: builtin/index-pack.c:715
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "không thể đọc đối tượng đã tồn tại %s"
+
+#: builtin/index-pack.c:729
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:610
+#: builtin/index-pack.c:744
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:746
msgid "Error in object"
msgstr "Lỗi trong đối tượng"
-#: builtin/index-pack.c:614
+#: builtin/index-pack.c:748
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
-#: builtin/index-pack.c:687
-#: builtin/index-pack.c:713
+#: builtin/index-pack.c:818
+#: builtin/index-pack.c:844
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:872
+#: builtin/index-pack.c:1009
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pack bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:877
+#: builtin/index-pack.c:1014
msgid "cannot fstat packfile"
msgstr "không thể fstat packfile"
-#: builtin/index-pack.c:880
+#: builtin/index-pack.c:1017
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:903
+#: builtin/index-pack.c:1028
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
+
+#: builtin/index-pack.c:1051
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:954
+#: builtin/index-pack.c:1102
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:973
+#: builtin/index-pack.c:1121
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pack có %d delta chưa được giải quyết"
msgstr[1] "pack có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:998
+#: builtin/index-pack.c:1146
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1225
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1101
+#: builtin/index-pack.c:1249
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin pack"
-#: builtin/index-pack.c:1114
+#: builtin/index-pack.c:1262
#, c-format
msgid "cannot write keep file '%s'"
msgstr "không thể ghi tập tin giữ lại '%s'"
-#: builtin/index-pack.c:1122
+#: builtin/index-pack.c:1270
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "không thể đóng tập tin giữ lại đã được ghi '%s'"
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1283
msgid "cannot store pack file"
msgstr "không thể lưu tập tin pack"
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1294
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1395
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin pack đã sẵn có '%s' "
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1397
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin 'pack idx' cho '%s'"
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1444
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
msgstr[1] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1451
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
msgstr[1] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1330
+#: builtin/index-pack.c:1478
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: builtin/index-pack.c:1374
-#: builtin/index-pack.c:1377
-#: builtin/index-pack.c:1389
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1522
+#: builtin/index-pack.c:1525
+#: builtin/index-pack.c:1537
+#: builtin/index-pack.c:1541
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1555
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1411
-#: builtin/index-pack.c:1421
+#: builtin/index-pack.c:1559
+#: builtin/index-pack.c:1569
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "tên tập tin packfile '%s' không được kết thúc bằng đuôi '.pack'"
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1578
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
@@ -3313,102 +3435,102 @@ msgstr "Không thể truy cập thư mục làm việc hiện hành"
msgid "Cannot access work tree '%s'"
msgstr "không thể truy cập cây (tree) làm việc '%s'"
-#: builtin/log.c:188
+#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:401
-#: builtin/log.c:489
+#: builtin/log.c:402
+#: builtin/log.c:490
#, c-format
msgid "Could not read object %s"
msgstr "Không thể đọc đối tượng %s"
-#: builtin/log.c:513
+#: builtin/log.c:514
#, c-format
msgid "Unknown type: %d"
msgstr "Không nhận ra kiểu: %d"
-#: builtin/log.c:602
+#: builtin/log.c:603
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:676
+#: builtin/log.c:677
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:687
+#: builtin/log.c:688
#, c-format
msgid "Cannot open patch file %s"
msgstr "Không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:701
+#: builtin/log.c:702
msgid "Need exactly one range."
msgstr "Cần chính xác một vùng."
-#: builtin/log.c:709
+#: builtin/log.c:710
msgid "Not a range."
msgstr "Không phải là một vùng."
-#: builtin/log.c:786
+#: builtin/log.c:787
msgid "Cover letter needs email format"
msgstr "'Cover letter' cần cho định dạng thư"
-#: builtin/log.c:859
+#: builtin/log.c:860
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:932
+#: builtin/log.c:933
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1153
+#: builtin/log.c:1154
#, c-format
msgid "bogus committer info %s"
msgstr "thông tin người chuyển giao không có thực %s"
-#: builtin/log.c:1198
+#: builtin/log.c:1199
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1200
+#: builtin/log.c:1201
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix và -k xung khắc nhau."
-#: builtin/log.c:1208
+#: builtin/log.c:1209
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1210
+#: builtin/log.c:1211
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1212
+#: builtin/log.c:1213
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1235
+#: builtin/log.c:1236
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
-#: builtin/log.c:1237
+#: builtin/log.c:1238
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thư mục '%s'"
-#: builtin/log.c:1390
+#: builtin/log.c:1391
msgid "Failed to create output files"
msgstr "Gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:1494
+#: builtin/log.c:1495
#, c-format
msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <dòng-ngược> một cách thủ công.\n"
-#: builtin/log.c:1510
-#: builtin/log.c:1512
-#: builtin/log.c:1524
+#: builtin/log.c:1511
+#: builtin/log.c:1513
+#: builtin/log.c:1525
#, c-format
msgid "Unknown commit %s"
msgstr "Không hiểu lần chuyển giao (commit) %s"
@@ -3910,22 +4032,28 @@ msgstr "Đối tượng %s không có ghi chú (note)\n"
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:183
+#: builtin/pack-objects.c:186
+#, c-format
+msgid "deflate error (%d)"
+msgstr "lỗi giải nén (%d)"
+
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai '%s'"
-#: builtin/pack-objects.c:2364
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "tùy chọn %s không chấp nhận dạng thức âm"
-#: builtin/pack-objects.c:2368
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "không thể phân tích giá trị '%s' cho tùy chọn %s"
@@ -4904,7 +5032,7 @@ msgid ""
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\"."
+"Để phục hồi lại thành nhánh nguyên thủy 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."
@@ -4970,7 +5098,7 @@ msgid ""
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\"."
+"Để phục hồi lại nhánh nguyên thủy 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."
@@ -5135,8 +5263,8 @@ msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-"Không thể check out original HEAD '$branch'.\n"
-"Hãy thử 'git bisect reset <commit>'."
+"Không thể check-out HEAD nguyên thủy của '$branch'.\n"
+"Hãy thử 'git bisect reset <lần-chuyển-giao>'."
#: git-bisect.sh:390
msgid "No logfile given"
@@ -5353,37 +5481,37 @@ msgstr "Chưa chỉ ra tên của nhánh"
msgid "(To restore them type \"git stash apply\")"
msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
-#: git-submodule.sh:56
+#: git-submodule.sh:88
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "không thể tháo bỏ một thành phần ra khỏi url '$remoteurl'"
-#: git-submodule.sh:109
+#: git-submodule.sh:145
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr "Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn '$sm_path'"
-#: git-submodule.sh:150
+#: git-submodule.sh:186
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "Nhân bản '$url' vào đường dẫn mô-đun-con '$sm_path' gặp lỗi"
-#: git-submodule.sh:160
+#: git-submodule.sh:196
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitdir '$a' là bộ phận của đường dẫn mô-đun-con '$b' hoặc \"vice versa\""
-#: git-submodule.sh:249
+#: git-submodule.sh:285
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-#: git-submodule.sh:266
+#: git-submodule.sh:302
#, sh-format
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
+#: git-submodule.sh:306
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -5394,62 +5522,62 @@ msgstr ""
"$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
+#: git-submodule.sh:317
#, 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
+#: git-submodule.sh:319
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' đã tồn tại từ trước và không phải là một kho git hợp lệ"
-#: git-submodule.sh:297
+#: git-submodule.sh:333
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Không thể checkout mô-đun con '$sm_path'"
-#: git-submodule.sh:302
+#: git-submodule.sh:338
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Gặp lỗi khi thêm mô-đun con '$sm_path'"
-#: git-submodule.sh:307
+#: git-submodule.sh:343
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun con '$sm_path'"
-#: git-submodule.sh:349
+#: git-submodule.sh:385
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr "Đang nhập '$prefix$sm_path'"
-#: git-submodule.sh:363
+#: git-submodule.sh:399
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr "Dừng lại tại '$sm_path'; script trả về trạng thái khác không."
-#: git-submodule.sh:406
+#: git-submodule.sh:442
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr "Không tìm thấy url cho đường dẫn mô-đun-con '$sm_path' trong .gitmodules"
-#: git-submodule.sh:415
+#: git-submodule.sh:451
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con '$sm_path'"
-#: git-submodule.sh:417
+#: git-submodule.sh:453
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr "Mô-đun-con '$name' ($url) được đăng ký cho đường dẫn '$sm_path'"
-#: git-submodule.sh:425
+#: git-submodule.sh:461
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con '$sm_path'"
-#: git-submodule.sh:524
+#: git-submodule.sh:560
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
@@ -5458,94 +5586,94 @@ msgstr ""
"Đường dẫn mô-đun-con '$sm_path' chưa được khởi tạo\n"
"Có lẽ bạn muốn sử dụng lệnh 'update --init'?"
-#: git-submodule.sh:537
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr "Không tìm thấy điểm xét lại hiện hành trong đường dẫn mô-đun-con '$sm_path'"
-#: git-submodule.sh:556
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con '$sm_path'"
-#: git-submodule.sh:570
+#: git-submodule.sh:606
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr "Không thể rebase '$sha1' trong đường dẫn mô-đun-con '$sm_path'"
-#: git-submodule.sh:571
+#: git-submodule.sh:607
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "Đường dẫn mô-đun-con '$sm_path': được rebase vào trong '$sha1'"
-#: git-submodule.sh:576
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr "Không thể hòa trộn (merge) '$sha1' trong đường dẫn mô-đun-con '$sm_path'"
-#: git-submodule.sh:577
+#: git-submodule.sh:613
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "Đường dẫn mô-đun-con '$sm_path': được hòa trộn vào '$sha1'"
-#: git-submodule.sh:582
+#: git-submodule.sh:618
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr "Không thể checkout '$sha1' trong đường dẫn mô-đun-con '$sm_path'"
-#: git-submodule.sh:583
+#: git-submodule.sh:619
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "Đường dẫn mô-đun-con '$sm_path': được checkout '$sha1'"
-#: git-submodule.sh:605
-#: git-submodule.sh:928
+#: git-submodule.sh:641
+#: git-submodule.sh:964
#, sh-format
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
+#: git-submodule.sh:749
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
+#: git-submodule.sh:789
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chờ $mod_dst"
-#: git-submodule.sh:771
+#: git-submodule.sh:807
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_src"
-#: git-submodule.sh:774
+#: git-submodule.sh:810
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_dst"
-#: git-submodule.sh:777
+#: git-submodule.sh:813
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Cảnh báo: $name không chứa những lần chuyển giao (commit) $sha1_src và $sha1_dst"
-#: git-submodule.sh:802
+#: git-submodule.sh:838
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:803
+#: git-submodule.sh:839
msgid "submodule"
msgstr "mô-đun con"
-#: git-submodule.sh:840
+#: git-submodule.sh:876
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
+#: git-submodule.sh:878
msgid "# Submodule changes to be committed:"
msgstr "# Những thay đổi mô-đun-con được chuyển giao (commit):"
-#: git-submodule.sh:974
+#: git-submodule.sh:1022
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b46b53e6d6a..b3e1a54c8ef 100644
--- a/po/zh_CN.po
+++ b/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-08 10:20+0800\n"
-"PO-Revision-Date: 2012-06-08 12:24+0800\n"
+"POT-Creation-Date: 2012-07-03 10:23+0800\n"
+"PO-Revision-Date: 2012-07-04 22:38+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
@@ -61,8 +61,8 @@ msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "版本库缺少这些必备的提交："
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
-#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
+#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
+#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
@@ -75,44 +75,48 @@ msgstr[0] "这个包中含有 %d 个引用"
msgstr[1] "这个包中含有 %d 个引用"
#: bundle.c:192
+msgid "The bundle records a complete history."
+msgstr "这个包记录一个完整历史。"
+
+#: bundle.c:195
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
msgstr[0] "这个包需要这个引用"
msgstr[1] "这个包需要 %d 个这些引用"
-#: bundle.c:290
+#: bundle.c:294
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:331
+#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:376
+#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
-#: bundle.c:394
+#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:412
+#: bundle.c:416
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:415
+#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:437
+#: bundle.c:441
msgid "index-pack died"
msgstr "index-pack 终止"
@@ -293,16 +297,16 @@ msgstr "'%s'：%s"
msgid "'%s': short read %s"
msgstr "'%s'：读取不完整 %s"
-#: help.c:207
+#: help.c:208
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
-#: help.c:214
+#: help.c:215
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-#: help.c:270
+#: help.c:271
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -311,11 +315,11 @@ msgstr ""
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"
-#: help.c:327
+#: help.c:328
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系统中未发现 Git 命令。"
-#: help.c:349
+#: help.c:350
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -324,17 +328,17 @@ msgstr ""
"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
"是 '%s'"
-#: help.c:354
+#: help.c:355
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "在 %0.1f 秒钟后自动运行..."
-#: help.c:361
+#: help.c:362
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-#: help.c:365
+#: help.c:366
msgid ""
"\n"
"Did you mean this?"
@@ -668,261 +672,379 @@ msgstr "无法在 passwd 文件中查询到当前用户：%s"
msgid "no such user"
msgstr "无此用户"
-#: wt-status.c:135
+#: wt-status.c:141
msgid "Unmerged paths:"
msgstr "未合并的路径："
# 译者：注意保持前导空格
-#: wt-status.c:141 wt-status.c:158
+#: wt-status.c:168 wt-status.c:195
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"
# 译者：注意保持前导空格
-#: wt-status.c:143 wt-status.c:160
+#: wt-status.c:170 wt-status.c:197
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"
# 译者：注意保持前导空格
-#: wt-status.c:144
+#: wt-status.c:174
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " （使用 \"git add <file>...\" 标记解决方案）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:176 wt-status.c:180
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
-#: wt-status.c:152
+# 译者：注意保持前导空格
+#: wt-status.c:178
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " （使用 \"git rm <file>...\" 标记解决方案）"
+
+#: wt-status.c:189
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:170
+#: wt-status.c:207
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
# 译者：注意保持前导空格
-#: wt-status.c:174
+#: wt-status.c:211
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:176
+#: wt-status.c:213
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:177
+#: wt-status.c:214
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
# 译者：注意保持前导空格
-#: wt-status.c:179
+#: wt-status.c:216
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
-#: wt-status.c:188
+#: wt-status.c:225
#, c-format
msgid "%s files:"
msgstr "%s文件："
# 译者：注意保持前导空格
-#: wt-status.c:191
+#: wt-status.c:228
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"
-#: wt-status.c:208
+#: wt-status.c:245
msgid "bug"
msgstr "bug"
-#: wt-status.c:213
+#: wt-status.c:250
msgid "both deleted:"
msgstr "双方删除："
-#: wt-status.c:214
+#: wt-status.c:251
msgid "added by us:"
msgstr "由我们添加："
-#: wt-status.c:215
+#: wt-status.c:252
msgid "deleted by them:"
msgstr "由他们删除："
-#: wt-status.c:216
+#: wt-status.c:253
msgid "added by them:"
msgstr "由他们添加："
-#: wt-status.c:217
+#: wt-status.c:254
msgid "deleted by us:"
msgstr "由我们删除："
-#: wt-status.c:218
+#: wt-status.c:255
msgid "both added:"
msgstr "双方添加："
-#: wt-status.c:219
+#: wt-status.c:256
msgid "both modified:"
msgstr "双方修改："
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:249
+#: wt-status.c:286
msgid "new commits, "
msgstr "新提交, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:251
+#: wt-status.c:288
msgid "modified content, "
msgstr "修改的内容, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:253
+#: wt-status.c:290
msgid "untracked content, "
msgstr "未跟踪的内容, "
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:267
+#: wt-status.c:304
#, c-format
msgid "new file: %s"
msgstr "新文件： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:270
+#: wt-status.c:307
#, c-format
msgid "copied: %s -> %s"
msgstr "拷贝： %s -> %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:273
+#: wt-status.c:310
#, c-format
msgid "deleted: %s"
msgstr "删除： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:276
+#: wt-status.c:313
#, c-format
msgid "modified: %s"
msgstr "修改： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:279
+#: wt-status.c:316
#, c-format
msgid "renamed: %s -> %s"
msgstr "重命名： %s -> %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:282
+#: wt-status.c:319
#, c-format
msgid "typechange: %s"
msgstr "类型变更： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:285
+#: wt-status.c:322
#, c-format
msgid "unknown: %s"
msgstr "未知： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: wt-status.c:288
+#: wt-status.c:325
#, c-format
msgid "unmerged: %s"
msgstr "未合并： %s"
-#: wt-status.c:291
+#: wt-status.c:328
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "bug：未处理的差异状态 %c"
-#: wt-status.c:737
+#: wt-status.c:786
+msgid "You have unmerged paths."
+msgstr "您有路径尚未合并。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:789 wt-status.c:913
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " （解决冲突并运行 \"git commit\"）"
+
+#: wt-status.c:792
+msgid "All conflicts fixed but you are still merging."
+msgstr "所有冲突已解决但您仍处于合并中。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:795
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " （使用 \"git commit\" 结束合并）"
+
+#: wt-status.c:805
+msgid "You are in the middle of an am session."
+msgstr "您正处于一个 am 过程中。"
+
+#: wt-status.c:808
+msgid "The current patch is empty."
+msgstr "当前的补丁为空。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:812
+msgid " (fix conflicts and then run \"git am --resolved\")"
+msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:814
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " （使用 \"git am --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:816
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " （使用 \"git am --abort\" 恢复原有分支）"
+
+#: wt-status.c:874 wt-status.c:884
+msgid "You are currently rebasing."
+msgstr "您正在变基。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:877
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:879
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:881
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:887
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
+
+#: wt-status.c:889
+msgid "You are currently splitting a commit during a rebase."
+msgstr "您正在变基过程中拆分一个提交。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:892
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+
+#: wt-status.c:894
+msgid "You are currently editing a commit during a rebase."
+msgstr "您正在变基过程中编辑一个提交。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:897
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " （使用 \"git commit --amend\" 修补当前提交）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:899
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" （执行 \"git rebase --continue\" 一旦您满意您的修改）"
+
+#: wt-status.c:909
+msgid "You are currently cherry-picking."
+msgstr "您正在做拣选操作。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:916
+msgid " (all conflicts fixed: run \"git commit\")"
+msgstr " （解决所有冲突后，执行 \"git commit\"）"
+
+#: wt-status.c:925
+msgid "You are currently bisecting."
+msgstr "您正在做二分查找。"
+
+# 译者：注意保持前导空格
+#: wt-status.c:928
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
+
+#: wt-status.c:979
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:744
+#: wt-status.c:986
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:755
+#: wt-status.c:998
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:769
+#: wt-status.c:1012
msgid "Untracked"
msgstr "未跟踪的"
-#: wt-status.c:771
+#: wt-status.c:1014
msgid "Ignored"
msgstr "忽略的"
-#: wt-status.c:773
+#: wt-status.c:1016
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:775
+#: wt-status.c:1018
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:781
+#: wt-status.c:1024
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:785
+#: wt-status.c:1028
#, c-format
msgid "no changes added to commit%s\n"
msgstr "修改尚未加入提交%s\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:787
+#: wt-status.c:1030
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
-#: wt-status.c:789
+#: wt-status.c:1032
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr "空提交但存在未跟踪文件%s\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:791
+#: wt-status.c:1034
msgid " (use \"git add\" to track)"
msgstr "（使用 \"git add\" 建立跟踪）"
-#: wt-status.c:793 wt-status.c:796 wt-status.c:799
+#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
#, c-format
msgid "nothing to commit%s\n"
msgstr "无须提交%s\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:794
+#: wt-status.c:1037
msgid " (create/copy files and use \"git add\" to track)"
msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:797
+#: wt-status.c:1040
msgid " (use -u to show untracked files)"
msgstr "（使用 -u 显示未跟踪文件）"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:800
+#: wt-status.c:1043
msgid " (working directory clean)"
msgstr "（干净的工作区）"
-#: wt-status.c:908
+#: wt-status.c:1151
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
# 译者：注意保持句尾空格
-#: wt-status.c:914
+#: wt-status.c:1157
msgid "Initial commit on "
msgstr "初始提交于 "
# 译者：注意保持句尾空格
-#: wt-status.c:929
+#: wt-status.c:1172
msgid "behind "
msgstr "落后 "
# 译者：注意保持句尾空格
-#: wt-status.c:932 wt-status.c:935
+#: wt-status.c:1175 wt-status.c:1178
msgid "ahead "
msgstr "领先 "
# 译者：注意保持句尾空格
-#: wt-status.c:937
+#: wt-status.c:1180
msgid ", behind "
msgstr "，落后 "
@@ -949,7 +1071,7 @@ msgstr "路径 '%s' 属于模组 '%.*s'"
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
+#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径 '%s' 未匹配任何文件"
@@ -1026,7 +1148,7 @@ msgstr "也许您想要执行 'git add .'？\n"
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
@@ -2558,22 +2680,22 @@ msgstr "无效选项：%s"
msgid "Not a git repository"
msgstr "不是一个 git 版本库"
-#: builtin/diff.c:347
+#: builtin/diff.c:341
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:352
+#: builtin/diff.c:346
#, c-format
msgid "more than %d trees given: '%s'"
msgstr "提供了超过 %d 个树对象：'%s'"
-#: builtin/diff.c:362
+#: builtin/diff.c:356
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个 blob 对象：'%s'"
-#: builtin/diff.c:370
+#: builtin/diff.c:364
#, c-format
msgid "unhandled object '%s' given."
msgstr "提供了无法处理的对象 '%s'。"
@@ -2822,30 +2944,30 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
-#: builtin/help.c:59
+#: builtin/help.c:63
#, c-format
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
-#: builtin/help.c:87
+#: builtin/help.c:91
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
-#: builtin/help.c:108
+#: builtin/help.c:112
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
-#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
#, c-format
msgid "failed to exec '%s': %s"
msgstr "无法执行 '%s'：%s"
-#: builtin/help.c:211
+#: builtin/help.c:215
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -2854,7 +2976,7 @@ msgstr ""
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<tool>.cmd'。"
-#: builtin/help.c:223
+#: builtin/help.c:227
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -2863,266 +2985,277 @@ msgstr ""
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<tool>.path'。"
-#: builtin/help.c:287
+#: builtin/help.c:291
msgid "The most commonly used git commands are:"
msgstr "最常用的 git 命令有："
-#: builtin/help.c:355
+#: builtin/help.c:359
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:372
+#: builtin/help.c:376
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:380
+#: builtin/help.c:384
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:391
+#: builtin/help.c:395
#, c-format
msgid "'%s': not a documentation directory."
msgstr "'%s'：不是一个文档目录。"
-#: builtin/help.c:432 builtin/help.c:439
+#: builtin/help.c:436 builtin/help.c:443
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:453
+#: builtin/help.c:459
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' 是 `%s' 的别名"
-#: builtin/index-pack.c:169
+#: builtin/index-pack.c:170
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:189
+#: builtin/index-pack.c:190
msgid "object of unexpected type"
msgstr "意外的类型的对象"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:227
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:236
+#: builtin/index-pack.c:237
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:237
+#: builtin/index-pack.c:238
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:250
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:257
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:292
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "包中有错误的对象位于 %lu：%s"
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:434
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:450
+#: builtin/index-pack.c:483
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:458
+#: builtin/index-pack.c:491
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:499
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:495
+#: builtin/index-pack.c:531
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:497
+#: builtin/index-pack.c:533
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "包文件过早结束，缺少 %lu 字节"
msgstr[1] "包文件过早结束，缺少 %lu 字节"
-#: builtin/index-pack.c:510
+#: builtin/index-pack.c:555
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:583
-#, c-format
-msgid "cannot read existing object %s"
-msgstr "不能读取现存对象 %s"
-
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
+#: builtin/index-pack.c:709 builtin/index-pack.c:718
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:598
+#: builtin/index-pack.c:649 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:262
+#, c-format
+msgid "unable to read %s"
+msgstr "不能读 %s"
+
+#: builtin/index-pack.c:715
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "不能读取现存对象 %s"
+
+#: builtin/index-pack.c:729
#, c-format
msgid "invalid blob object %s"
msgstr "无效的 blob 对象 %s"
-#: builtin/index-pack.c:610
+#: builtin/index-pack.c:744
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:746
msgid "Error in object"
msgstr "对象中出错"
-#: builtin/index-pack.c:614
+#: builtin/index-pack.c:748
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:687 builtin/index-pack.c:713
+#: builtin/index-pack.c:818 builtin/index-pack.c:844
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:983
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:872
+#: builtin/index-pack.c:1009
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:877
+#: builtin/index-pack.c:1014
msgid "cannot fstat packfile"
msgstr "不能枚举包文件状态"
-#: builtin/index-pack.c:880
+#: builtin/index-pack.c:1017
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:903
+#: builtin/index-pack.c:1028
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects() 中遇到不可理喻的问题"
+
+#: builtin/index-pack.c:1051
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:954
+#: builtin/index-pack.c:1102
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:973
+#: builtin/index-pack.c:1121
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:998
+#: builtin/index-pack.c:1146
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能缩小附加对象（%d）"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1225
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1101
+#: builtin/index-pack.c:1249
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1114
+#: builtin/index-pack.c:1262
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
-#: builtin/index-pack.c:1122
+#: builtin/index-pack.c:1270
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1283
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1294
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1395
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1397
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1444
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 个对象"
msgstr[1] "非 delta：%d 个对象"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1451
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1330
+#: builtin/index-pack.c:1478
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
-#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
+#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
+#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1555
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 共用"
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
+#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1578
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包名参数"
@@ -3271,100 +3404,100 @@ msgstr "不能访问当前工作目录"
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
-#: builtin/log.c:188
+#: builtin/log.c:189
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:401 builtin/log.c:489
+#: builtin/log.c:402 builtin/log.c:490
#, c-format
msgid "Could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:513
+#: builtin/log.c:514
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:602
+#: builtin/log.c:603
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:676
+#: builtin/log.c:677
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:687
+#: builtin/log.c:688
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:701
+#: builtin/log.c:702
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:709
+#: builtin/log.c:710
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:786
+#: builtin/log.c:787
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:859
+#: builtin/log.c:860
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:932
+#: builtin/log.c:933
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1153
+#: builtin/log.c:1154
#, c-format
msgid "bogus committer info %s"
msgstr "虚假的提交者信息 %s"
-#: builtin/log.c:1198
+#: builtin/log.c:1199
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1200
+#: builtin/log.c:1201
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1208
+#: builtin/log.c:1209
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1210
+#: builtin/log.c:1211
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1212
+#: builtin/log.c:1213
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1235
+#: builtin/log.c:1236
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1237
+#: builtin/log.c:1238
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1390
+#: builtin/log.c:1391
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1494
+#: builtin/log.c:1495
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
-#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
+#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
@@ -3845,22 +3978,27 @@ msgstr "对象 %s 没有注解\n"
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#, c-format
+msgid "deflate error (%d)"
+msgstr "压缩错误 (%d)"
+
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:2364
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr "选项 %s 不接受否定格式"
-#: builtin/pack-objects.c:2368
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "不能解析选项 %1$s 的值 '%2$s'"
@@ -4810,8 +4948,7 @@ msgstr "您需要先设置你的提交者信息"
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
-msgstr ""
-"您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
+msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
#: git-am.sh:105
#, sh-format
@@ -4929,8 +5066,7 @@ msgstr ""
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
-msgstr ""
-"您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
+msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
#: git-am.sh:847
msgid "No changes -- Patch already applied."
@@ -5271,37 +5407,37 @@ msgstr "未指定分支名"
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
-#: git-submodule.sh:56
+#: git-submodule.sh:88
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "无法从 url '$remoteurl' 剥离一个组件"
-#: git-submodule.sh:109
+#: git-submodule.sh:145
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
-#: git-submodule.sh:150
+#: git-submodule.sh:186
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
-#: git-submodule.sh:160
+#: git-submodule.sh:196
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
-#: git-submodule.sh:249
+#: git-submodule.sh:285
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:266
+#: git-submodule.sh:302
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:270
+#: git-submodule.sh:306
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -5312,62 +5448,62 @@ msgstr ""
"$sm_path\n"
"如果您确实想添加它，使用 -f 参数。"
-#: git-submodule.sh:281
+#: git-submodule.sh:317
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存版本库到索引"
-#: git-submodule.sh:283
+#: git-submodule.sh:319
#, 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:333
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:302
+#: git-submodule.sh:338
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:307
+#: git-submodule.sh:343
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:349
+#: git-submodule.sh:385
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr "正在进入 '$prefix$sm_path'"
-#: git-submodule.sh:363
+#: git-submodule.sh:399
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr "停止于 '$sm_path'，脚本返回非零值。"
-#: git-submodule.sh:406
+#: git-submodule.sh:442
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
-#: git-submodule.sh:415
+#: git-submodule.sh:451
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册 url"
-#: git-submodule.sh:417
+#: git-submodule.sh:453
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
-#: git-submodule.sh:425
+#: git-submodule.sh:461
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
-#: git-submodule.sh:524
+#: git-submodule.sh:560
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
@@ -5376,96 +5512,96 @@ msgstr ""
"子模组路径 '$sm_path' 没有初始化\n"
"也许您想用 'update --init'？"
-#: git-submodule.sh:537
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
-#: git-submodule.sh:556
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:570
+#: git-submodule.sh:606
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
-#: git-submodule.sh:571
+#: git-submodule.sh:607
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
-#: git-submodule.sh:576
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
-#: git-submodule.sh:577
+#: git-submodule.sh:613
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
-#: git-submodule.sh:582
+#: git-submodule.sh:618
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
-#: git-submodule.sh:583
+#: git-submodule.sh:619
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
-#: git-submodule.sh:605 git-submodule.sh:928
+#: git-submodule.sh:641 git-submodule.sh:964
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:713
+#: git-submodule.sh:749
msgid "--cached cannot be used with --files"
msgstr "--cached 不能和 --files 共用"
#. unexpected type
-#: git-submodule.sh:753
+#: git-submodule.sh:789
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:771
+#: git-submodule.sh:807
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr " 警告：$name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:774
+#: git-submodule.sh:810
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr " 警告：$name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:777
+#: git-submodule.sh:813
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:802
+#: git-submodule.sh:838
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:803
+#: git-submodule.sh:839
msgid "submodule"
msgstr "子模组"
-#: git-submodule.sh:840
+#: git-submodule.sh:876
msgid "# Submodules changed but not updated:"
msgstr "# 子模组已修改但尚未更新："
-#: git-submodule.sh:842
+#: git-submodule.sh:878
msgid "# Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: git-submodule.sh:974
+#: git-submodule.sh:1022
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr "为 '$name' 同步子模组 url"