diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/de.po | 1617 | ||||
| -rw-r--r-- | po/git.pot | 1501 | ||||
| -rw-r--r-- | po/sv.po | 1568 | ||||
| -rw-r--r-- | po/vi.po | 1662 | ||||
| -rw-r--r-- | po/zh_CN.po | 1670 |
5 files changed, 5295 insertions, 2723 deletions
@@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: git 1.7.11\n" +"Project-Id-Version: git 1.7.12\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-08-06 23:47+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" @@ -48,17 +48,17 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:696 +#: bundle.c:89 builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" -msgstr "Dem Projektarchiv fehlen folgende vorrausgesetzte Versionen:" +msgstr "Dem Projektarchiv fehlen folgende vorausgesetzte 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:726 builtin/log.c:1316 builtin/log.c:1535 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:1212 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" @@ -228,8 +232,8 @@ msgstr "" "%s" #: diff.c:1400 -msgid " 0 files changed\n" -msgstr " 0 Dateien geändert\n" +msgid " 0 files changed" +msgstr " 0 Dateien geändert" #: diff.c:1404 #, c-format @@ -252,7 +256,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] ", %d Zeile entfernt(-)" msgstr[1] ", %d Zeilen entfernt(-)" -#: diff.c:3478 +#: diff.c:3461 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -288,16 +292,16 @@ msgstr "'%s': %s" msgid "'%s': short read %s" msgstr "'%s': read() zu kurz %s" -#: help.c:207 +#: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "Vorhandene Git-Kommandos in '%s'" -#: help.c:214 +#: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "Vorhandene Git-Kommandos irgendwo in deinem $PATH" -#: help.c:270 +#: help.c:275 #, 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:332 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:354 #, 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:359 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatisch in %0.1f Sekunden..." -#: help.c:361 +#: help.c:366 #, 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:370 msgid "" "\n" "Did you mean this?" @@ -343,35 +347,301 @@ msgstr[1] "" "\n" "Hast du eines von diesen gemeint?" -#: parse-options.c:493 +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "(ungültige Version)\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "Fehler beim Erstellen der Bäume" + +#: merge-recursive.c:497 +msgid "diff setup failed" +msgstr "diff_setup_done fehlgeschlagen" + +#: merge-recursive.c:627 +msgid "merge-recursive: disk full?" +msgstr "merge-recursive: Festplatte voll?" + +#: merge-recursive.c:690 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "Fehler beim Erstellen des Pfades '%s'%s" + +#: merge-recursive.c:701 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Entferne %s um Platz für Unterverzeichnis zu schaffen\n" + +#. something else exists +#. .. but not some other error (who really cares what?) +#: merge-recursive.c:715 merge-recursive.c:736 +msgid ": perhaps a D/F conflict?" +msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" + +#: merge-recursive.c:726 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "verweigere, da unbeobachtete Dateien in '%s' verloren gehen würden" + +#: merge-recursive.c:766 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "kann Objekt %s '%s' nicht lesen" + +#: merge-recursive.c:768 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "Blob erwartet für %s '%s'" + +#: merge-recursive.c:791 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "Fehler beim Öffnen von '%s'" + +#: merge-recursive.c:799 +#, c-format +msgid "failed to symlink '%s'" +msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'" + +#: merge-recursive.c:802 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" + +#: merge-recursive.c:939 +msgid "Failed to execute internal merge" +msgstr "Fehler bei Ausführung der internen Zusammenführung" + +#: merge-recursive.c:943 +#, c-format +msgid "Unable to add %s to database" +msgstr "Konnte %s nicht zur Datenbank hinzufügen" + +#: merge-recursive.c:959 +msgid "unsupported object type in the tree" +msgstr "nicht unterstützter Objekttyp im Baum" + +#: merge-recursive.c:1038 merge-recursive.c:1052 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " +"im Arbeitsbereich gelassen." + +#: merge-recursive.c:1044 merge-recursive.c:1057 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " +"im Arbeitsbereich bei %s gelassen." + +#: merge-recursive.c:1098 +msgid "rename" +msgstr "umbenennen" + +#: merge-recursive.c:1098 +msgid "renamed" +msgstr "umbenannt" + +#: merge-recursive.c:1154 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" + +#: merge-recursive.c:1176 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Zweig \"%s\" " +"und \"%s\"->\"%s\" in Zweig \"%s\"%s" + +#: merge-recursive.c:1181 +msgid " (left unresolved)" +msgstr " (bleibt unaufgelöst)" + +#: merge-recursive.c:1235 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" +"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " +"in %s" + +#: merge-recursive.c:1265 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Benenne stattdessen %s nach %s und %s nach %s um" + +#: merge-recursive.c:1464 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "" +"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " +"%s" + +#: merge-recursive.c:1474 +#, c-format +msgid "Adding merged %s" +msgstr "Füge zusammengeführte Datei %s hinzu" + +#: merge-recursive.c:1479 merge-recursive.c:1677 +#, c-format +msgid "Adding as %s instead" +msgstr "Füge stattdessen als %s hinzu" + +#: merge-recursive.c:1530 +#, c-format +msgid "cannot read object %s" +msgstr "kann Objekt %s nicht lesen" + +#: merge-recursive.c:1533 +#, c-format +msgid "object %s is not a blob" +msgstr "Objekt %s ist kein Blob" + +#: merge-recursive.c:1581 +msgid "modify" +msgstr "ändern" + +#: merge-recursive.c:1581 +msgid "modified" +msgstr "geändert" + +#: merge-recursive.c:1591 +msgid "content" +msgstr "Inhalt" + +#: merge-recursive.c:1598 +msgid "add/add" +msgstr "hinzufügen/hinzufügen" + +#: merge-recursive.c:1632 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "%s ausgelassen (Ergebnis der Zusammenführung existiert bereits)" + +#: merge-recursive.c:1646 +#, c-format +msgid "Auto-merging %s" +msgstr "automatische Zusammenführung von %s" + +#: merge-recursive.c:1650 git-submodule.sh:844 +msgid "submodule" +msgstr "Unterprojekt" + +#: merge-recursive.c:1651 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s" + +#: merge-recursive.c:1741 +#, c-format +msgid "Removing %s" +msgstr "Entferne %s" + +#: merge-recursive.c:1766 +msgid "file/directory" +msgstr "Datei/Verzeichnis" + +#: merge-recursive.c:1772 +msgid "directory/file" +msgstr "Verzeichnis/Datei" + +#: merge-recursive.c:1777 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" +"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " +"hinzu." + +#: merge-recursive.c:1787 +#, c-format +msgid "Adding %s" +msgstr "Füge %s hinzu" + +#: merge-recursive.c:1804 +msgid "Fatal merge failure, shouldn't happen." +msgstr "Fataler Fehler bei der Zusammenführung. Sollte nicht passieren." + +#: merge-recursive.c:1823 +msgid "Already up-to-date!" +msgstr "Bereits aktuell!" + +#: merge-recursive.c:1832 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "Zusammenführen der Bäume %s und %s fehlgeschlagen" + +#: merge-recursive.c:1862 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "unverarbeiteter Pfad??? %s" + +#: merge-recursive.c:1907 +msgid "Merging:" +msgstr "Zusammenführung:" + +#: merge-recursive.c:1920 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "%u gemeinsamen Vorfahren gefunden" +msgstr[1] "%u gemeinsame Vorfahren gefunden" + +#: merge-recursive.c:1957 +msgid "merge returned no commit" +msgstr "Zusammenführung hat keine Version zurückgegeben" + +#: merge-recursive.c:2014 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Konnte Objekt '%s' nicht parsen." + +#: merge-recursive.c:2026 builtin/merge.c:697 +msgid "Unable to write index." +msgstr "Konnte Bereitstellung nicht schreiben." + +#: parse-options.c:494 msgid "..." msgstr "..." -#: parse-options.c:511 +#: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:516 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:518 +#: parse-options.c:519 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1629 +#: remote.c:1632 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Dein Zweig ist vor '%s' um %d Version.\n" msgstr[1] "Dein Zweig ist vor '%s' um %d Versionen.\n" -#: remote.c:1635 +#: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -382,7 +652,7 @@ msgstr[1] "" "Dein Zweig ist zu '%s' um %d Versionen hinterher, und kann vorgespult " "werden.\n" -#: remote.c:1643 +#: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -610,7 +880,7 @@ msgstr "kann Zweigspitze (HEAD) nicht auflösen" msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Zweig, der noch geboren wird" -#: sequencer.c:805 builtin/apply.c:3697 +#: sequencer.c:805 builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" @@ -644,21 +914,21 @@ msgstr "Kann nicht zu initialer Version zurücksetzen." msgid "Can't cherry-pick into empty head" msgstr "Kann \"cherry-pick\" nicht in einem leerem Kopf ausführen." -#: sha1_name.c:864 +#: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "Zweigspitze (HEAD) zeigt auf keinen Zweig" -#: sha1_name.c:867 +#: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "Kein solcher Zweig '%s'" -#: sha1_name.c:869 +#: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Kein entferntes Projektarchiv für Zweig '%s' konfiguriert." -#: sha1_name.c:872 +#: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -673,243 +943,353 @@ 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:140 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" -#: wt-status.c:141 wt-status.c:158 +#: wt-status.c:167 wt-status.c:194 #, 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:169 wt-status.c:196 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:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)" + +#: wt-status.c:175 wt-status.c:179 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:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)" + +#: wt-status.c:188 msgid "Changes to be committed:" msgstr "zum Eintragen bereitgestellte Änderungen:" -#: wt-status.c:170 +#: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Eintragen bereitgestellt sind:" -#: wt-status.c:174 +#: wt-status.c:210 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:212 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:213 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:215 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:224 #, c-format msgid "%s files:" msgstr "%s Dateien:" -#: wt-status.c:191 +#: wt-status.c:227 #, 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:244 msgid "bug" msgstr "Fehler" -#: wt-status.c:213 +#: wt-status.c:249 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:214 +#: wt-status.c:250 msgid "added by us:" msgstr "von uns hinzugefügt:" -#: wt-status.c:215 +#: wt-status.c:251 msgid "deleted by them:" msgstr "von denen gelöscht:" -#: wt-status.c:216 +#: wt-status.c:252 msgid "added by them:" msgstr "von denen hinzugefügt:" -#: wt-status.c:217 +#: wt-status.c:253 msgid "deleted by us:" msgstr "von uns gelöscht:" -#: wt-status.c:218 +#: wt-status.c:254 msgid "both added:" msgstr "von beiden hinzugefügt:" -#: wt-status.c:219 +#: wt-status.c:255 msgid "both modified:" msgstr "von beiden geändert:" -#: wt-status.c:249 +#: wt-status.c:285 msgid "new commits, " msgstr "neue Versionen, " -#: wt-status.c:251 +#: wt-status.c:287 msgid "modified content, " msgstr "geänderter Inhalt, " -#: wt-status.c:253 +#: wt-status.c:289 msgid "untracked content, " msgstr "unbeobachteter Inhalt, " -#: wt-status.c:267 +#: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "neue Datei: %s" -#: wt-status.c:270 +#: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "kopiert: %s -> %s" -#: wt-status.c:273 +#: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "gelöscht: %s" -#: wt-status.c:276 +#: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "geändert: %s" -#: wt-status.c:279 +#: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "umbenannt: %s -> %s" -#: wt-status.c:282 +#: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "Typänderung: %s" -#: wt-status.c:285 +#: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "unbekannt: %s" -#: wt-status.c:288 +#: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "nicht zusammengeführt: %s" -#: wt-status.c:291 +#: wt-status.c:327 #, c-format msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:737 +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "Du hast nicht zusammengeführte Pfade." + +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (behebe die Konflikte und führe \"git commit\" aus)" + +#: wt-status.c:791 +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:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (benutze \"git commit\" um die Zusammenführung abzuschließen)" + +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "Eine \"am\"-Sitzung ist im Gange." + +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "Der aktuelle Patch ist leer." + +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " (behebe die Konflikte und führe dann \"git am --resolved\" aus)" + +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (benutze \"git am --skip\" um diesen Patch auszulassen)" + +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr "" +" (benutze \"git am --abort\" um den ursprünglichen Zweig wiederherzustellen)" + +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "Du bist gerade beim Neuaufbau." + +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (behebe die Konflikte und führe dann \"git rebase --continue\" aus)" + +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (benutze \"git rebase --skip\" um diesen Patch auszulassen)" + +#: wt-status.c:880 +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:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (alle Konflikte behoben: führe \"git rebase --continue\" aus)" + +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf." + +#: wt-status.c:891 +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:893 +msgid "You are currently editing a commit during a rebase." +msgstr "Du editierst gerade eine Version während eines Neuaufbaus." + +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" +" (benutze \"git commit --amend\" um die aktuelle Version nachzubessern)" + +#: wt-status.c:898 +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:908 +msgid "You are currently cherry-picking." +msgstr "Du führst gerade \"cherry-pick\" aus." + +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " (alle Konflikte behoben: führe \"git commit\" aus)" + +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "Du bist gerade beim Halbieren." + +#: wt-status.c:927 +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:978 msgid "On branch " msgstr "Auf Zweig " -#: wt-status.c:744 +#: wt-status.c:985 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Zweig." -#: wt-status.c:755 +#: wt-status.c:997 msgid "Initial commit" msgstr "Initiale Version" -#: wt-status.c:769 +#: wt-status.c:1011 msgid "Untracked" msgstr "Unbeobachtete" -#: wt-status.c:771 +#: wt-status.c:1013 msgid "Ignored" msgstr "Ignorierte" -#: wt-status.c:773 +#: wt-status.c:1015 #, c-format msgid "Untracked files not listed%s" msgstr "Unbeobachtete Dateien nicht aufgelistet%s" -#: wt-status.c:775 +#: wt-status.c:1017 msgid " (use -u option to show untracked files)" msgstr " (benutze die Option -u um unbeobachteten Dateien anzuzeigen)" -#: wt-status.c:781 +#: wt-status.c:1023 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:785 +#: wt-status.c:1027 #, 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:1029 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:1031 #, 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:1033 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:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "nichts zum Eintragen%s\n" -#: wt-status.c:794 +#: wt-status.c:1036 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:1039 msgid " (use -u to show untracked files)" msgstr " (benutze die Option -u um unbeobachtete Dateien anzuzeigen)" -#: wt-status.c:800 +#: wt-status.c:1042 msgid " (working directory clean)" msgstr " (Arbeitsverzeichnis sauber)" -#: wt-status.c:908 +#: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "HEAD (kein Zweig)" -#: wt-status.c:914 +#: wt-status.c:1156 msgid "Initial commit on " msgstr "Initiale Version auf " -#: wt-status.c:929 +#: wt-status.c:1171 msgid "behind " msgstr "hinterher " -#: wt-status.c:932 wt-status.c:935 +#: wt-status.c:1174 wt-status.c:1177 msgid "ahead " msgstr "voraus " -#: wt-status.c:937 +#: wt-status.c:1179 msgid ", behind " msgstr ", hinterher " @@ -918,7 +1298,7 @@ msgstr ", hinterher " msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:67 builtin/commit.c:226 +#: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" @@ -937,7 +1317,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" @@ -1012,79 +1392,79 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Wolltest du vielleicht 'git add .' sagen?\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 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:4433 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [Optionen] [<Patch>...]" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "nicht erkannte Option für Leerzeichen: '%s'" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Leerzeichen: '%s'" -#: builtin/apply.c:815 +#: builtin/apply.c:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: builtin/apply.c:824 +#: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: builtin/apply.c:905 +#: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: builtin/apply.c:937 +#: builtin/apply.c:946 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: builtin/apply.c:941 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: builtin/apply.c:942 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: builtin/apply.c:949 +#: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: builtin/apply.c:1394 +#: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1451 +#: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1468 +#: builtin/apply.c:1477 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1099,70 +1479,70 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: builtin/apply.c:1628 +#: builtin/apply.c:1637 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1630 +#: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1656 +#: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1692 +#: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1694 +#: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1697 +#: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1843 +#: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:1958 +#: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2048 +#: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2052 +#: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2123 +#: builtin/apply.c:2132 msgid "oops" msgstr "Ups" -#: builtin/apply.c:2645 +#: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2763 +#: builtin/apply.c:2772 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -1170,12 +1550,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: builtin/apply.c:2775 +#: builtin/apply.c:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld) um Patch-Bereich bei %d anzuwenden" -#: builtin/apply.c:2781 +#: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" @@ -1184,329 +1564,339 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2800 +#: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:2903 +#: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:2909 +#: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: builtin/apply.c:2930 +#: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3045 +#: builtin/apply.c:3061 #, c-format -msgid "patch %s has been renamed/deleted" -msgstr "Patch %s wurde umbenannt/gelöscht" +msgid "cannot checkout %s" +msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3052 builtin/apply.c:3069 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "Lösch-Patch hinterlässt Dateiinhalte" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3139 builtin/apply.c:3361 #, c-format -msgid "%s: already exists in working directory" -msgstr "%s existiert bereits im Arbeitsverzeichnis" +msgid "path %s has been renamed/deleted" +msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3143 +#: builtin/apply.c:3220 builtin/apply.c:3375 #, c-format -msgid "%s: has been deleted/renamed" -msgstr "%s wurde gelöscht/umbenannt" +msgid "%s: does not exist in index" +msgstr "%s ist nicht bereitgestellt" -#: builtin/apply.c:3148 builtin/apply.c:3179 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3159 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s ist nicht bereitgestellt" - -#: builtin/apply.c:3173 +#: builtin/apply.c:3229 builtin/apply.c:3383 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Bereitstellung" -#: builtin/apply.c:3190 +#: builtin/apply.c:3331 +msgid "removal patch leaves file contents" +msgstr "Lösch-Patch hinterlässt Dateiinhalte" + +#: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3192 +#: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3247 +#: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3267 +#: builtin/apply.c:3506 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s existiert bereits im Arbeitsverzeichnis" + +#: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: builtin/apply.c:3272 +#: builtin/apply.c:3531 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: builtin/apply.c:3280 +#: builtin/apply.c:3539 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3293 +#: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s..." -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:3491 +#: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus der Bereitstellung entfernen" -#: builtin/apply.c:3518 +#: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "fehlerhafter Patch für Unterprojekt %s" -#: builtin/apply.c:3522 +#: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:3527 +#: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: builtin/apply.c:3530 +#: builtin/apply.c:3790 builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: builtin/apply.c:3563 +#: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:3612 +#: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:3668 +#: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:3676 +#: builtin/apply.c:3967 msgid "internal error" msgstr "interner Fehler" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:3970 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: builtin/apply.c:3689 +#: builtin/apply.c:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:3710 +#: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:3713 +#: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Bereich #%d zurückgewiesen." -#: builtin/apply.c:3844 +#: builtin/apply.c:4154 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:3855 +#: builtin/apply.c:4165 msgid "unable to read index file" msgstr "Konnte Bereitstellungsdatei nicht lesen" -#: builtin/apply.c:3970 builtin/apply.c:3973 +#: builtin/apply.c:4284 builtin/apply.c:4287 msgid "path" msgstr "Pfad" -#: builtin/apply.c:3971 +#: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "wendet keine Änderungen im angegebenen Pfad an" -#: builtin/apply.c:3974 +#: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "wendet Änderungen nur im angegebenen Pfad an" -#: builtin/apply.c:3976 +#: builtin/apply.c:4290 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:3977 +#: builtin/apply.c:4291 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -"entfernt <Anzahl> vorrangestellte Schrägstriche von herkömmlichen " +"entfernt <Anzahl> vorangestellte Schrägstriche von herkömmlichen " "Differenzpfaden" -#: builtin/apply.c:3980 +#: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "ignoriert hinzugefügte Zeilen des Patches" -#: builtin/apply.c:3982 +#: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, wird der \"diffstat\" für die Eingabe " "ausgegeben" -#: builtin/apply.c:3986 +#: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "" "zeigt die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation" -#: builtin/apply.c:3988 +#: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, wird eine Zusammenfassung für die Eingabe " "ausgegeben" -#: builtin/apply.c:3990 +#: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: builtin/apply.c:3992 +#: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "" "stellt sicher, dass der Patch in der aktuellen Bereitstellung angewendet " "werden kann" -#: builtin/apply.c:3994 +#: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "wendet einen Patch an, ohne Änderungen im Arbeitszweig vorzunehmen" -#: builtin/apply.c:3996 +#: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:3998 +#: builtin/apply.c:4312 +msgid "attempt three-way merge if a patch does not apply" +msgstr "" +"versucht 3-Wege-Zusammenführung, wenn der Patch nicht angewendet werden " +"konnte" + +#: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "" "erstellt eine temporäre Bereitstellung basierend auf den integrierten " "Bereitstellungsinformationen" -#: builtin/apply.c:4000 +#: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4003 +#: builtin/apply.c:4319 msgid "ensure at least <n> lines of context match" msgstr "" "stellt sicher, dass mindestens <Anzahl> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4004 +#: builtin/apply.c:4320 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4005 +#: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "ermittelt neue oder geänderte Zeilen die Fehler in Leerzeichen haben" -#: builtin/apply.c:4008 builtin/apply.c:4011 +#: builtin/apply.c:4324 builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "ignoriert Änderungen in Leerzeichen bei der Suche des Kontextes" -#: builtin/apply.c:4014 +#: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "wendet den Patch in umgekehrter Reihenfolge an" -#: builtin/apply.c:4016 +#: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "erwartet keinen Kontext" -#: builtin/apply.c:4018 +#: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "hinterlässt zurückgewiesene Patch-Bereiche in den entsprechenden *.rej " "Dateien" -#: builtin/apply.c:4020 +#: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "erlaubt sich überlappende Patch-Bereiche" -#: builtin/apply.c:4021 +#: builtin/apply.c:4337 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: builtin/apply.c:4023 +#: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "toleriert fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende" -#: builtin/apply.c:4026 +#: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "vertraut nicht den Zeilennummern im Kopf des Patch-Bereiches" -#: builtin/apply.c:4028 +#: builtin/apply.c:4344 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4029 +#: builtin/apply.c:4345 msgid "prepend <root> to all filenames" msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen" -#: builtin/apply.c:4050 +#: builtin/apply.c:4367 +msgid "--3way outside a repository" +msgstr "--3way außerhalb eines Projektarchivs" + +#: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "--index außerhalb eines Projektarchivs" -#: builtin/apply.c:4053 +#: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "--cached außerhalb eines Projektarchivs" -#: builtin/apply.c:4069 +#: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4083 +#: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Fehler in Leerzeichen" msgstr[1] "unterdrückte %d Fehler in Leerzeichen" -#: builtin/apply.c:4089 builtin/apply.c:4099 +#: builtin/apply.c:4414 builtin/apply.c:4424 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1675,7 +2065,7 @@ msgstr "Konnte einige Referenzen nicht lesen" #: builtin/branch.c:613 msgid "cannot rename the current branch while not on any." msgstr "" -"Kann aktuellen Zweig nicht umbennen, solange du dich auf keinem befindest." +"Kann aktuellen Zweig nicht umbenennen, solange du dich auf keinem befindest." #: builtin/branch.c:623 #, c-format @@ -1716,7 +2106,7 @@ msgstr "Konnte Beschreibungsvorlage für Zweig nicht schreiben: %s" msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte Zweigspitze (HEAD) nicht als gültige Referenz auflösen." -#: builtin/branch.c:788 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "Zweigspitze (HEAD) wurde nicht unter \"refs/heads\" gefunden!" @@ -1743,99 +2133,99 @@ msgstr "Um ein Paket zu erstellen wird ein Projektarchiv benötigt." msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Projektarchiv benötigt." -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:131 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:175 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:192 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:209 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Ergebnis der Zusammenführung von '%s' nicht hinzufügen." -#: builtin/checkout.c:234 builtin/checkout.c:392 +#: builtin/checkout.c:235 builtin/checkout.c:393 msgid "corrupt index file" msgstr "beschädigte Bereitstellungsdatei" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done fehlgeschlagen" -#: builtin/checkout.c:414 +#: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "Du musst zuerst deine aktuelle Bereitstellung auflösen." -#: builtin/checkout.c:533 +#: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Konnte \"reflog\" für '%s' nicht durchführen\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "Zweigspitze (HEAD) ist jetzt bei" -#: builtin/checkout.c:573 +#: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Zweig '%s' zurück\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Gewechselt zu zurückgesetztem Zweig '%s'\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Gewechselt zu einem neuen Zweig '%s'\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "Gewechselt zu Zweig '%s'\n" -#: builtin/checkout.c:640 +#: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:647 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1858,7 +2248,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:665 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1873,71 +2263,71 @@ msgstr "" " git branch neuer_zweig_name %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:695 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:698 +#: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "Vorherige Position der Zweigspitze (HEAD) war" -#: builtin/checkout.c:724 +#: builtin/checkout.c:725 builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "du bist auf einem Zweig, der noch geboren wird" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein Baum: %s" -#: builtin/checkout.c:974 +#: builtin/checkout.c:977 msgid "-B cannot be used with -b" msgstr "-B kann nicht mit -b benutzt werden" -#: builtin/checkout.c:983 +#: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "--patch ist inkompatibel mit allen anderen Optionen" -#: builtin/checkout.c:986 +#: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden" -#: builtin/checkout.c:988 +#: builtin/checkout.c:991 msgid "--detach cannot be used with -t" msgstr "--detach kann nicht mit -t benutzt werden" -#: builtin/checkout.c:994 +#: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "--track benötigt einen Zweignamen" -#: builtin/checkout.c:1001 +#: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "Vermisse Zweignamen; versuche -b" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan und -b|-B sind gegenseitig exklusiv" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" msgstr "--orphan kann nicht mit -t benutzt werden" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f und -m sind inkompatibel" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -1948,29 +2338,29 @@ msgstr "" "Hast du beabsichtigt '%s' auszuchecken, welcher nicht als Version aufgelöst " "werden kann?" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" "git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " "von Zweigen." -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout: --detach nimmt kein Pfad-Argument" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -"git checkout: --ours/--theirs, --force and --merge sind inkompatibel wenn\n" +"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "du aus der Bereitstellung auscheckst." -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "Kann Zweig nur zu einer Version wechseln." -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs ist inkompatibel mit den Wechseln von Zweigen." @@ -2023,11 +2413,6 @@ msgstr "Entferne nicht %s\n" msgid "reference repository '%s' is not a local directory." msgstr "Referenziertes Projektarchiv '%s' ist kein lokales Verzeichnis." -#: builtin/clone.c:302 -#, c-format -msgid "failed to open '%s'" -msgstr "Fehler beim Öffnen von '%s'" - #: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" @@ -2068,80 +2453,80 @@ msgstr "Konnte Datei nicht nach '%s' kopieren" msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden externer Zweig %s nicht finden." -#: builtin/clone.c:549 +#: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externe Zweigspitze (HEAD) bezieht sich auf eine nicht existierende Referenz " "und kann nicht ausgecheckt werden.\n" -#: builtin/clone.c:639 +#: builtin/clone.c:642 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:643 +#: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "Du musst ein Projektarchiv zum Klonen angeben." -#: builtin/clone.c:654 +#: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare und --origin %s Optionen sind inkompatibel." -#: builtin/clone.c:668 +#: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "Projektarchiv '%s' existiert nicht." -#: builtin/clone.c:673 +#: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth wird in lokalen Klonen ignoriert; benutze stattdessen file://." -#: builtin/clone.c:683 +#: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:693 +#: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsbaum '%s' existiert bereits." -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/clone.c:709 builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:709 +#: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." -#: builtin/clone.c:728 +#: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in bloßes Projektarchiv '%s'...\n" -#: builtin/clone.c:730 +#: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s'...\n" -#: builtin/clone.c:786 +#: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:835 +#: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "externer Zweig %s nicht im anderen Projektarchiv %s gefunden" -#: builtin/clone.c:842 +#: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "Du scheinst ein leeres Projektarchiv geklont zu haben." @@ -2202,97 +2587,97 @@ msgstr "" "\n" "Andernfalls benutze bitte 'git reset'\n" -#: builtin/commit.c:253 +#: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des Baum-Objektes der Zweigspitze (HEAD)." -#: builtin/commit.c:295 +#: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "Konnte temporäre Bereitstellung nicht erstellen." -#: builtin/commit.c:301 +#: builtin/commit.c:304 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:386 +#: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "" "Kann keine partielle Eintragung durchführen, während eine Zusammenführung im " "Gange ist." -#: builtin/commit.c:388 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keine partielle Eintragung durchführen, während \"cherry-pick\" im " "Gange ist." -#: builtin/commit.c:398 +#: builtin/commit.c:401 msgid "cannot read the index" msgstr "Kann Bereitstellung nicht lesen" -#: builtin/commit.c:418 +#: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "Konnte temporäre Bereitstellungsdatei nicht schreiben." -#: builtin/commit.c:493 builtin/commit.c:499 +#: builtin/commit.c:496 builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "Ungültige Version: %s" -#: builtin/commit.c:522 +#: builtin/commit.c:525 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:582 +#: builtin/commit.c:585 #, c-format msgid "Malformed ident string: '%s'" msgstr "Fehlerhafte Identifikations-String: '%s'" -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Version %s nicht nachschlagen" -#: builtin/commit.c:632 builtin/shortlog.c:296 +#: builtin/commit.c:635 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:634 +#: builtin/commit.c:637 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:638 +#: builtin/commit.c:641 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:644 +#: builtin/commit.c:647 msgid "commit has empty message" msgstr "Version hat eine leere Beschreibung" -#: builtin/commit.c:660 +#: builtin/commit.c:663 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:664 +#: builtin/commit.c:667 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:668 +#: builtin/commit.c:671 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/commit.c:720 +#: builtin/commit.c:723 msgid "could not write commit template" msgstr "Konnte Versionsvorlage nicht schreiben" -#: builtin/commit.c:731 +#: builtin/commit.c:734 #, c-format msgid "" "\n" @@ -2307,7 +2692,7 @@ msgstr "" "\t%s\n" "und versuche es erneut.\n" -#: builtin/commit.c:736 +#: builtin/commit.c:739 #, c-format msgid "" "\n" @@ -2322,7 +2707,7 @@ msgstr "" "\t%s\n" "und versuche es erneut.\n" -#: builtin/commit.c:748 +#: builtin/commit.c:751 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -2331,7 +2716,7 @@ msgstr "" "die mit '#' beginnen, werden ignoriert, und eine leere Versionsbeschreibung\n" "bricht die Eintragung ab.\n" -#: builtin/commit.c:753 +#: builtin/commit.c:756 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -2342,171 +2727,171 @@ msgstr "" "entfernen.\n" "Eine leere Versionsbeschreibung bricht die Eintragung ab.\n" -#: builtin/commit.c:766 +#: builtin/commit.c:769 #, c-format msgid "%sAuthor: %s" msgstr "%sAutor: %s" -#: builtin/commit.c:773 +#: builtin/commit.c:776 #, c-format msgid "%sCommitter: %s" msgstr "%sEintragender: %s" -#: builtin/commit.c:793 +#: builtin/commit.c:796 msgid "Cannot read index" msgstr "Kann Bereitstellung nicht lesen" -#: builtin/commit.c:830 +#: builtin/commit.c:833 msgid "Error building trees" msgstr "Fehler beim Erzeugen der Zweige" -#: builtin/commit.c:845 builtin/tag.c:361 +#: builtin/commit.c:848 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Bitte liefere eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:942 +#: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" msgstr "Kein existierender Autor mit '%s' gefunden." -#: builtin/commit.c:957 builtin/commit.c:1157 +#: builtin/commit.c:960 builtin/commit.c:1160 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien" -#: builtin/commit.c:997 +#: builtin/commit.c:1000 msgid "Using both --reset-author and --author does not make sense" msgstr "Verwendung von --reset-author und --author macht keinen Sinn." -#: builtin/commit.c:1008 +#: builtin/commit.c:1011 msgid "You have nothing to amend." msgstr "Du hast nichts zum nachbessern." -#: builtin/commit.c:1011 +#: builtin/commit.c:1014 msgid "You are in the middle of a merge -- cannot amend." msgstr "Eine Zusammenführung ist im Gange -- kann nicht nachbessern." -#: builtin/commit.c:1013 +#: builtin/commit.c:1016 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann nicht nachbessern." -#: builtin/commit.c:1016 +#: builtin/commit.c:1019 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam benutzt werden." -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Nur eines von -c/-C/-F/--fixup kann benutzt werden." -#: builtin/commit.c:1028 +#: builtin/commit.c:1031 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden" -#: builtin/commit.c:1036 +#: builtin/commit.c:1039 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset--author kann nur mit -C, -c oder --amend benutzt werden" -#: builtin/commit.c:1053 +#: builtin/commit.c:1056 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Nur eines von --include/--only/--all/--interactive/--patch kann benutzt " "werden." -#: builtin/commit.c:1055 +#: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only machen ohne Pfade keinen Sinn." -#: builtin/commit.c:1057 +#: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." msgstr "" "Klug... die letzte Version mit einer unsauberen Bereitstellung nachbessern." -#: builtin/commit.c:1059 +#: builtin/commit.c:1062 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" "Explizite Pfade ohne -i oder -o angegeben; unter der Annahme von --only " "Pfaden..." -#: builtin/commit.c:1069 builtin/tag.c:577 +#: builtin/commit.c:1072 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1074 +#: builtin/commit.c:1077 msgid "Paths with -a does not make sense." msgstr "Pfade mit -a machen keinen Sinn." -#: builtin/commit.c:1257 +#: builtin/commit.c:1260 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellte Version nicht nachschlagen." -#: builtin/commit.c:1259 +#: builtin/commit.c:1262 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellte Version nicht analysieren." -#: builtin/commit.c:1300 +#: builtin/commit.c:1303 msgid "detached HEAD" msgstr "losgelöste Zweigspitze (HEAD)" -#: builtin/commit.c:1302 +#: builtin/commit.c:1305 msgid " (root-commit)" msgstr " (Basis-Version)" -#: builtin/commit.c:1446 +#: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "Konnte Version der Zweigspitze (HEAD) nicht analysieren." -#: builtin/commit.c:1484 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1491 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1498 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1517 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Versionsbeschreibung nicht lesen: %s" -#: builtin/commit.c:1531 +#: builtin/commit.c:1534 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Eintragung abgebrochen; du hast die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1536 +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Eintragung aufgrund leerer Versionsbeschreibung abgebrochen.\n" -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Versionsobjektes." -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht sperren." -#: builtin/commit.c:1576 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht aktualisieren." -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "Das Projektarchiv wurde aktualisiert, aber die \"new_index\"-Datei\n" -"konnte nicht geschrieben werden. Prüfe, dass dein Speicher nicht\n" +"konnte nicht geschrieben werden. Prüfe, dass deine Festplatte nicht\n" "voll und Dein Kontingent nicht aufgebraucht ist und führe\n" "anschließend \"git reset HEAD\" zu Wiederherstellung aus." @@ -2608,22 +2993,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 +3267,30 @@ msgstr "" msgid "both --cached and trees are given." msgstr "sowohl --cached als auch Zweige gegeben" -#: builtin/help.c:59 +#: builtin/help.c:65 #, c-format msgid "unrecognized help format '%s'" msgstr "nicht erkanntes Hilfeformat: %s" -#: builtin/help.c:87 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "Konnte emacsclient nicht starten." -#: builtin/help.c:100 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "Konnte Version des emacsclient nicht parsen." -#: builtin/help.c:108 +#: builtin/help.c:114 #, 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:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "Fehler beim Ausführen von '%s': %s" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -2914,7 +3299,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:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -2923,267 +3308,273 @@ msgstr "" "'%s': Kommando für unterstützten Handbuchbetrachter.\n" "Du könntest stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:287 +#: builtin/help.c:299 msgid "The most commonly used git commands are:" msgstr "Die allgemein verwendeten Git-Kommandos sind:" -#: builtin/help.c:355 +#: builtin/help.c:367 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:372 +#: builtin/help.c:384 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:380 +#: builtin/help.c:392 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:391 -#, c-format -msgid "'%s': not a documentation directory." -msgstr "'%s' ist kein Dokumentationsverzeichnis" - -#: builtin/help.c:432 builtin/help.c:439 +#: builtin/help.c:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/help.c:453 +#: builtin/help.c:470 #, 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:530 msgid "cannot pread pack file" msgstr "Kann Paketdatei %s nicht lesen" -#: builtin/index-pack.c:497 +#: builtin/index-pack.c:532 #, 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:558 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:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:598 +#: builtin/index-pack.c:652 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:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "Kann existierendes Objekt %s nicht lesen." + +#: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:610 +#: builtin/index-pack.c:747 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:749 msgid "Error in object" msgstr "Fehler in Objekt" -#: builtin/index-pack.c:614 +#: builtin/index-pack.c:751 #, 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:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:872 +#: builtin/index-pack.c:1012 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:877 +#: builtin/index-pack.c:1017 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:880 +#: builtin/index-pack.c:1020 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:903 +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" + +#: builtin/index-pack.c:1054 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:954 +#: builtin/index-pack.c:1105 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:973 +#: builtin/index-pack.c:1124 #, 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:1149 #, 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:1228 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1101 +#: builtin/index-pack.c:1252 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1114 +#: builtin/index-pack.c:1265 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1122 +#: builtin/index-pack.c:1273 #, 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:1286 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1297 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1398 #, 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:1400 #, 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:1447 #, 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:1454 #, 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:1481 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:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1558 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:1562 builtin/index-pack.c:1572 #, 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:1581 msgid "--verify with no packfile name given" msgstr "--verify ohne Name der Paketdatei angegeben" @@ -3257,63 +3648,63 @@ msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'" msgid "insane git directory %s" msgstr "ungültiges Git-Verzeichnis %s" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" -msgstr "Konnte git-Verknüfung %s nicht erstellen" +msgstr "Konnte git-Verknüpfung %s nicht erstellen" #. #. * TRANSLATORS: The first '%s' is either "Reinitialized #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-Projektarchiv in %s%s\n" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "Reinitialisierte existierendes" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "Initialisierte leeres" -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr " gemeinsames" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "kann aktuelles Arbeitsverzeichnis nicht ermitteln" -#: builtin/init-db.c:521 builtin/init-db.c:528 +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -3322,103 +3713,103 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "Kann nicht auf aktuelles Arbeitsverzeichnis zugreifen." -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format 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:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:513 +#: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:602 +#: builtin/log.c:608 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:676 +#: builtin/log.c:682 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:687 +#: builtin/log.c:693 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:701 +#: builtin/log.c:707 msgid "Need exactly one range." msgstr "Brauche genau einen Versionsbereich." -#: builtin/log.c:709 +#: builtin/log.c:715 msgid "Not a range." msgstr "Kein Versionsbereich." -#: builtin/log.c:786 +#: builtin/log.c:792 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:859 +#: builtin/log.c:865 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:932 +#: builtin/log.c:938 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1153 +#: builtin/log.c:1160 #, c-format msgid "bogus committer info %s" msgstr "unechte Einreicher-Informationen %s" -#: builtin/log.c:1198 +#: builtin/log.c:1205 msgid "-n and -k are mutually exclusive." -msgstr "-n und -k schliessen sich gegenseitig aus" +msgstr "-n und -k schließen sich gegenseitig aus" -#: builtin/log.c:1200 +#: builtin/log.c:1207 msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix und -k schliessen sich gegenseitig aus" +msgstr "--subject-prefix und -k schließen sich gegenseitig aus" -#: builtin/log.c:1208 +#: builtin/log.c:1215 msgid "--name-only does not make sense" msgstr "--name-only macht keinen Sinn" -#: builtin/log.c:1210 +#: builtin/log.c:1217 msgid "--name-status does not make sense" msgstr "--name-status macht keinen Sinn" -#: builtin/log.c:1212 +#: builtin/log.c:1219 msgid "--check does not make sense" msgstr "--check macht keinen Sinn" -#: builtin/log.c:1235 +#: builtin/log.c:1242 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1237 +#: builtin/log.c:1244 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1390 +#: builtin/log.c:1397 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1494 +#: builtin/log.c:1501 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -3426,7 +3817,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:1517 builtin/log.c:1519 builtin/log.c:1531 #, c-format msgid "Unknown commit %s" msgstr "Unbekannte Version %s" @@ -3509,10 +3900,6 @@ msgstr "\"git write-tree\" schlug beim Schreiben eines Baumes fehl" msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: builtin/merge.c:697 -msgid "Unable to write index." -msgstr "Konnte Bereitstellung nicht schreiben." - #: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur die Zusammenführung von zwei Zweigen behandelt." @@ -3926,22 +4313,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" @@ -4566,31 +4958,31 @@ msgstr "" "Kann keine '%s' Zurücksetzung durchführen, während eine Zusammenführung im " "Gange ist." -#: builtin/reset.c:297 +#: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/reset.c:302 +#: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:311 +#: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed mit Pfaden ist veraltet; benutze stattdessen 'git reset -- <Pfade>'." -#: builtin/reset.c:313 +#: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "Eine '%s' Zurücksetzung mit Pfaden ist nicht möglich." -#: builtin/reset.c:325 +#: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt" -#: builtin/reset.c:341 +#: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen." @@ -4941,14 +5333,15 @@ msgstr "" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem run \"$cmdline --resolved\".\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." -msgstr "" -"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" +"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +"To restore the original branch and stop patching, run \"$cmdline --abort\"." +msgstr "" +"Wenn du das Problem gelöst hast, führe \"$cmdline --resolved\" aus.\n" +"Falls du diesen Patch auslassen möchtest, führe stattdessen \"$cmdline --skip" +"\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der " +"Patches\n" "abzubrechen, führe \"$cmdline --abort\" aus." #: git-am.sh:121 @@ -4961,6 +5354,12 @@ msgstr "" "Dem Projektarchiv fehlen notwendige Blobs um auf eine 3-Wege-Zusammenführung " "zurückzufallen." +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "" +"Verwende Informationen aus der Bereitstellung um einen Basisbaum " +"nachzustellen" + #: git-am.sh:154 msgid "" "Did you hand edit your patch?\n" @@ -4973,45 +5372,53 @@ msgstr "" msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und der 3-Wege-Zusammenführung..." -#: git-am.sh:275 +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "Zusammenführung der Änderungen fehlgeschlagen" + +#: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: git-am.sh:362 +#: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Patch-Format $patch_format wird nicht unterstützt." -#: git-am.sh:364 +#: git-am.sh:363 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: git-am.sh:418 -msgid "-d option is no longer supported. Do not use." -msgstr "-d Option wird nicht länger unterstützt. Nicht benutzen." +#: git-am.sh:389 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" +"entfernt. Bitte nicht mehr verwenden." -#: git-am.sh:481 +#: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" "Vorheriges Verzeichnis des Neuaufbaus $dotest existiert noch, aber mbox " "gegeben." -#: git-am.sh:486 +#: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "Bitte werde dir klar. --skip oder --abort?" -#: git-am.sh:513 +#: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." -#: git-am.sh:579 +#: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" "Unsaubere Bereitstellung: kann Patches nicht anwenden (unsauber: $files)" -#: git-am.sh:671 +#: git-am.sh:679 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -5019,38 +5426,39 @@ 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 +#: git-am.sh:706 msgid "Patch does not have a valid e-mail address." msgstr "Patch enthält keine gültige eMail-Adresse." -#: git-am.sh:755 +#: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " "Terminal verbunden ist." -#: git-am.sh:759 +#: git-am.sh:757 msgid "Commit Body is:" msgstr "Beschreibung der Eintragung ist:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:766 +#: git-am.sh:764 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:802 +#: git-am.sh:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Wende an: $FIRSTLINE" -#: git-am.sh:823 +#: git-am.sh:821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5061,7 +5469,7 @@ msgstr "" "diese bereits anderweitig eingefügt worden sein; du könntest diesen Patch\n" "auslassen." -#: git-am.sh:831 +#: git-am.sh:829 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -5069,16 +5477,16 @@ msgstr "" "Du hast immer noch nicht zusammengeführte Pfade in der Bereitstellung.\n" "Hast du vergessen 'git add' zu benutzen?" -#: git-am.sh:847 +#: git-am.sh:845 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: git-am.sh:857 +#: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Anwendung des Patches fehlgeschlagen bei $msgnum $FIRSTLINE" -#: git-am.sh:873 +#: git-am.sh:876 msgid "applying to an empty history" msgstr "wende zu leerer Historie an" @@ -5283,6 +5691,131 @@ msgstr "Kann nicht mehrere Zweige in einen ungeborenen Zweig zusammenführen" msgid "Cannot rebase onto multiple branches" msgstr "kann nicht auf mehrere Zweige neu aufbauen" +#: git-rebase.sh:52 +msgid "" +"When you have resolved this problem, run \"git rebase --continue\".\n" +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." +msgstr "" +"Wenn du das Problem aufgelöst hast, führe \"git rebase --continue\" aus.\n" +"Falls du diesen Patch auslassen möchtest, führe stattdessen \"git rebase --" +"skip\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und den Neuaufbau " +"abzubrechen,\n" +"führe \"git rebase --abort\" aus." + +#: git-rebase.sh:159 +msgid "The pre-rebase hook refused to rebase." +msgstr "Der \"pre-rebase hook\" hat den Neuaufbau zurückgewiesen." + +#: git-rebase.sh:164 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "\"git-am\" scheint im Gange zu sein. Kann nicht neu aufbauen." + +#: git-rebase.sh:295 +msgid "The --exec option must be used with the --interactive option" +msgstr "Die --exec Option muss mit der --interactive Option benutzt werden" + +#: git-rebase.sh:300 +msgid "No rebase in progress?" +msgstr "Kein Neuaufbau im Gange?" + +#: git-rebase.sh:313 +msgid "Cannot read HEAD" +msgstr "Kann Zweigspitze (HEAD) nicht lesen" + +#: git-rebase.sh:316 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Du musst alle Zusammenführungskonflikte editieren und diese dann\n" +"mittels \"git add\" als aufgelöst markieren" + +#: git-rebase.sh:334 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Konnte nicht zu $head_name zurückgehen" + +#: git-rebase.sh:350 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" +"Es sieht so aus, als ob es das Verzeichnis $state_dir_base bereits gibt\n" +"und es könnte ein anderer Neuaufbau im Gange sein. Wenn das der Fall ist,\n" +"probiere bitte\n" +"\t$cmd_live_rebase\n" +"Wenn das nicht der Fall ist, probiere bitte\n" +"\t$cmd_clear_stale_rebase\n" +"und führe dieses Kommando nochmal aus. Es wird angehalten, falls noch\n" +"etwas Schützenswertes vorhanden ist." + +#: git-rebase.sh:395 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "ungültiger Übernahmezweig $upstream_name" + +#: git-rebase.sh:419 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: es gibt mehr als eine Zusammenführungsbasis" + +#: git-rebase.sh:422 git-rebase.sh:426 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: es gibt keine Zusammenführungsbasis" + +#: git-rebase.sh:431 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "$onto_name zeigt auf keine gültige Version" + +#: git-rebase.sh:454 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "fatal: Zweig $branch_name nicht gefunden" + +#: git-rebase.sh:474 +msgid "Please commit or stash them." +msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"." + +#: git-rebase.sh:492 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Aktueller Zweig $branch_name ist auf dem neusten Stand." + +#: git-rebase.sh:495 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "" +"Aktueller Zweig $branch_name ist auf dem neusten Stand, Neuaufbau erzwungen." + +#: git-rebase.sh:506 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Änderungen von $mb zu $onto:" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:515 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" +"Zunächst wird die Zweigspitze zurückgespult, um deine Änderungen\n" +"darauf neu anzuwenden..." + +#: git-rebase.sh:523 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "$branch_name zu $onto_name vorgespult." + #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear mit Parametern ist nicht implementiert" @@ -5414,109 +5947,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:189 #, 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:201 #, 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:290 #, 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:307 #, 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:311 #, 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:322 #, 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:324 #, 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:338 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken" -#: git-submodule.sh:302 +#: git-submodule.sh:343 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:307 +#: git-submodule.sh:348 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:349 +#: git-submodule.sh:390 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Betrete '$prefix$sm_path'" -#: git-submodule.sh:363 +#: git-submodule.sh:404 #, 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:447 #, 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:456 #, 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:458 #, 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:466 #, 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:565 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5525,99 +6057,104 @@ msgstr "" "Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n" "Vielleicht möchtest du 'update --init' benutzen?" -#: git-submodule.sh:537 +#: git-submodule.sh:578 #, 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:597 #, 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:611 #, 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:612 #, 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:617 #, 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:618 #, 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:623 #, 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:624 #, 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:646 git-submodule.sh:969 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'" -#: git-submodule.sh:713 -msgid "--cached cannot be used with --files" -msgstr "--cached kann nicht mit --files benutzt werden" +#: git-submodule.sh:754 +msgid "The --cached option cannot be used with the --files option" +msgstr "Die --cached Option kann nicht mit der --files Option benutzt werden" #. unexpected type -#: git-submodule.sh:753 +#: git-submodule.sh:794 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:771 +#: git-submodule.sh:812 #, 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:815 #, 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:818 #, 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:843 msgid "blob" msgstr "Blob" -#: git-submodule.sh:803 -msgid "submodule" -msgstr "Unterprojekt" - -#: git-submodule.sh:840 +#: git-submodule.sh:881 msgid "# Submodules changed but not updated:" msgstr "# Unterprojekte geändert, aber nicht aktualisiert:" -#: git-submodule.sh:842 +#: git-submodule.sh:883 msgid "# Submodule changes to be committed:" msgstr "# Änderungen in Unterprojekt zum Eintragen:" -#: git-submodule.sh:974 +#: git-submodule.sh:1027 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Synchronisiere Unterprojekt-URL für '$name'" +#~ msgid "-d option is no longer supported. Do not use." +#~ msgstr "-d Option wird nicht länger unterstützt. Nicht benutzen." + +#~ msgid "%s: has been deleted/renamed" +#~ msgstr "%s wurde gelöscht/umbenannt" + +#~ msgid "'%s': not a documentation directory." +#~ msgstr "'%s' ist kein Dokumentationsverzeichnis" + #~ msgid "--" #~ msgstr "--" @@ -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-08-06 23:47+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,7 +45,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:696 +#: bundle.c:89 builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "" @@ -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:726 builtin/log.c:1316 builtin/log.c:1535 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:1212 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 "" @@ -222,7 +226,7 @@ msgid "" msgstr "" #: diff.c:1400 -msgid " 0 files changed\n" +msgid " 0 files changed" msgstr "" #: diff.c:1404 @@ -246,7 +250,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] "" msgstr[1] "" -#: diff.c:3478 +#: diff.c:3461 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -280,44 +284,44 @@ msgstr "" msgid "'%s': short read %s" msgstr "" -#: help.c:207 +#: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:214 +#: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:270 +#: help.c:275 #, 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:332 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:349 +#: help.c:354 #, 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:359 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:361 +#: help.c:366 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:365 +#: help.c:370 msgid "" "\n" "Did you mean this?" @@ -327,35 +331,289 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: parse-options.c:493 +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "" + +#: merge-recursive.c:497 +msgid "diff setup failed" +msgstr "" + +#: merge-recursive.c:627 +msgid "merge-recursive: disk full?" +msgstr "" + +#: merge-recursive.c:690 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "" + +#: merge-recursive.c:701 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "" + +#. something else exists +#. .. but not some other error (who really cares what?) +#: merge-recursive.c:715 merge-recursive.c:736 +msgid ": perhaps a D/F conflict?" +msgstr "" + +#: merge-recursive.c:726 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "" + +#: merge-recursive.c:766 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "" + +#: merge-recursive.c:768 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "" + +#: merge-recursive.c:791 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: merge-recursive.c:799 +#, c-format +msgid "failed to symlink '%s'" +msgstr "" + +#: merge-recursive.c:802 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "" + +#: merge-recursive.c:939 +msgid "Failed to execute internal merge" +msgstr "" + +#: merge-recursive.c:943 +#, c-format +msgid "Unable to add %s to database" +msgstr "" + +#: merge-recursive.c:959 +msgid "unsupported object type in the tree" +msgstr "" + +#: merge-recursive.c:1038 merge-recursive.c:1052 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" + +#: merge-recursive.c:1044 merge-recursive.c:1057 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" + +#: merge-recursive.c:1098 +msgid "rename" +msgstr "" + +#: merge-recursive.c:1098 +msgid "renamed" +msgstr "" + +#: merge-recursive.c:1154 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "" + +#: merge-recursive.c:1176 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" + +#: merge-recursive.c:1181 +msgid " (left unresolved)" +msgstr "" + +#: merge-recursive.c:1235 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" + +#: merge-recursive.c:1265 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "" + +#: merge-recursive.c:1464 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "" + +#: merge-recursive.c:1474 +#, c-format +msgid "Adding merged %s" +msgstr "" + +#: merge-recursive.c:1479 merge-recursive.c:1677 +#, c-format +msgid "Adding as %s instead" +msgstr "" + +#: merge-recursive.c:1530 +#, c-format +msgid "cannot read object %s" +msgstr "" + +#: merge-recursive.c:1533 +#, c-format +msgid "object %s is not a blob" +msgstr "" + +#: merge-recursive.c:1581 +msgid "modify" +msgstr "" + +#: merge-recursive.c:1581 +msgid "modified" +msgstr "" + +#: merge-recursive.c:1591 +msgid "content" +msgstr "" + +#: merge-recursive.c:1598 +msgid "add/add" +msgstr "" + +#: merge-recursive.c:1632 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "" + +#: merge-recursive.c:1646 +#, c-format +msgid "Auto-merging %s" +msgstr "" + +#: merge-recursive.c:1650 git-submodule.sh:844 +msgid "submodule" +msgstr "" + +#: merge-recursive.c:1651 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "" + +#: merge-recursive.c:1741 +#, c-format +msgid "Removing %s" +msgstr "" + +#: merge-recursive.c:1766 +msgid "file/directory" +msgstr "" + +#: merge-recursive.c:1772 +msgid "directory/file" +msgstr "" + +#: merge-recursive.c:1777 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" + +#: merge-recursive.c:1787 +#, c-format +msgid "Adding %s" +msgstr "" + +#: merge-recursive.c:1804 +msgid "Fatal merge failure, shouldn't happen." +msgstr "" + +#: merge-recursive.c:1823 +msgid "Already up-to-date!" +msgstr "" + +#: merge-recursive.c:1832 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "" + +#: merge-recursive.c:1862 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "" + +#: merge-recursive.c:1907 +msgid "Merging:" +msgstr "" + +#: merge-recursive.c:1920 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "" +msgstr[1] "" + +#: merge-recursive.c:1957 +msgid "merge returned no commit" +msgstr "" + +#: merge-recursive.c:2014 +#, c-format +msgid "Could not parse object '%s'" +msgstr "" + +#: merge-recursive.c:2026 builtin/merge.c:697 +msgid "Unable to write index." +msgstr "" + +#: parse-options.c:494 msgid "..." msgstr "" -#: parse-options.c:511 +#: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:516 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:518 +#: parse-options.c:519 #, c-format msgid " %s" msgstr "" -#: remote.c:1629 +#: remote.c:1632 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:1635 +#: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -363,7 +621,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1643 +#: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -578,7 +836,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:805 builtin/apply.c:3697 +#: sequencer.c:805 builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "" @@ -610,21 +868,21 @@ msgstr "" msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:864 +#: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:867 +#: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:869 +#: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:872 +#: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -638,232 +896,333 @@ msgstr "" msgid "no such user" msgstr "" -#: wt-status.c:135 +#: wt-status.c:140 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:141 wt-status.c:158 +#: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:143 wt-status.c:160 +#: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:144 +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr "" + +#: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:152 +#: wt-status.c:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr "" + +#: wt-status.c:188 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:170 +#: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:174 +#: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:176 +#: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:177 +#: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:179 +#: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:188 +#: wt-status.c:224 #, c-format msgid "%s files:" msgstr "" -#: wt-status.c:191 +#: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:208 +#: wt-status.c:244 msgid "bug" msgstr "" -#: wt-status.c:213 +#: wt-status.c:249 msgid "both deleted:" msgstr "" -#: wt-status.c:214 +#: wt-status.c:250 msgid "added by us:" msgstr "" -#: wt-status.c:215 +#: wt-status.c:251 msgid "deleted by them:" msgstr "" -#: wt-status.c:216 +#: wt-status.c:252 msgid "added by them:" msgstr "" -#: wt-status.c:217 +#: wt-status.c:253 msgid "deleted by us:" msgstr "" -#: wt-status.c:218 +#: wt-status.c:254 msgid "both added:" msgstr "" -#: wt-status.c:219 +#: wt-status.c:255 msgid "both modified:" msgstr "" -#: wt-status.c:249 +#: wt-status.c:285 msgid "new commits, " msgstr "" -#: wt-status.c:251 +#: wt-status.c:287 msgid "modified content, " msgstr "" -#: wt-status.c:253 +#: wt-status.c:289 msgid "untracked content, " msgstr "" -#: wt-status.c:267 +#: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:270 +#: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:273 +#: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:276 +#: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:279 +#: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:282 +#: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:285 +#: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:288 +#: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:291 +#: wt-status.c:327 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:737 +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "" + +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr "" + +#: wt-status.c:791 +msgid "All conflicts fixed but you are still merging." +msgstr "" + +#: wt-status.c:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr "" + +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "" + +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "" + +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr "" + +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr "" + +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "" + +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:880 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr "" + +#: wt-status.c:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "" + +#: wt-status.c:891 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "" + +#: wt-status.c:893 +msgid "You are currently editing a commit during a rebase." +msgstr "" + +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" + +#: wt-status.c:898 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" + +#: wt-status.c:908 +msgid "You are currently cherry-picking." +msgstr "" + +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr "" + +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "" + +#: wt-status.c:927 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr "" + +#: wt-status.c:978 msgid "On branch " msgstr "" -#: wt-status.c:744 +#: wt-status.c:985 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:755 +#: wt-status.c:997 msgid "Initial commit" msgstr "" -#: wt-status.c:769 +#: wt-status.c:1011 msgid "Untracked" msgstr "" -#: wt-status.c:771 +#: wt-status.c:1013 msgid "Ignored" msgstr "" -#: wt-status.c:773 +#: wt-status.c:1015 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:775 +#: wt-status.c:1017 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:781 +#: wt-status.c:1023 msgid "No changes" msgstr "" -#: wt-status.c:785 +#: wt-status.c:1027 #, c-format msgid "no changes added to commit%s\n" msgstr "" -#: wt-status.c:787 +#: wt-status.c:1029 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "" -#: wt-status.c:789 +#: wt-status.c:1031 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" -#: wt-status.c:791 +#: wt-status.c:1033 msgid " (use \"git add\" to track)" msgstr "" -#: wt-status.c:793 wt-status.c:796 wt-status.c:799 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "" -#: wt-status.c:794 +#: wt-status.c:1036 msgid " (create/copy files and use \"git add\" to track)" msgstr "" -#: wt-status.c:797 +#: wt-status.c:1039 msgid " (use -u to show untracked files)" msgstr "" -#: wt-status.c:800 +#: wt-status.c:1042 msgid " (working directory clean)" msgstr "" -#: wt-status.c:908 +#: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:914 +#: wt-status.c:1156 msgid "Initial commit on " msgstr "" -#: wt-status.c:929 +#: wt-status.c:1171 msgid "behind " msgstr "" -#: wt-status.c:932 wt-status.c:935 +#: wt-status.c:1174 wt-status.c:1177 msgid "ahead " msgstr "" -#: wt-status.c:937 +#: wt-status.c:1179 msgid ", behind " msgstr "" @@ -872,7 +1231,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:226 +#: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "" @@ -890,7 +1249,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 "" @@ -962,75 +1321,75 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 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:4433 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:815 +#: builtin/apply.c:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:824 +#: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:905 +#: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:937 +#: builtin/apply.c:946 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:941 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:942 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:949 +#: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1394 +#: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1451 +#: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1468 +#: builtin/apply.c:1477 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1041,395 +1400,403 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1628 +#: builtin/apply.c:1637 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1630 +#: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1656 +#: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1692 +#: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1694 +#: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1697 +#: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1843 +#: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1958 +#: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2048 +#: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2052 +#: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2123 +#: builtin/apply.c:2132 msgid "oops" msgstr "" -#: builtin/apply.c:2645 +#: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2763 +#: builtin/apply.c:2772 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2775 +#: builtin/apply.c:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2781 +#: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2800 +#: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2903 +#: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2909 +#: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2930 +#: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3045 +#: builtin/apply.c:3061 #, c-format -msgid "patch %s has been renamed/deleted" +msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3052 builtin/apply.c:3069 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3139 builtin/apply.c:3361 #, c-format -msgid "%s: already exists in working directory" +msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3143 +#: builtin/apply.c:3220 builtin/apply.c:3375 #, c-format -msgid "%s: has been deleted/renamed" +msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3148 builtin/apply.c:3179 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3159 +#: builtin/apply.c:3229 builtin/apply.c:3383 #, c-format -msgid "%s: does not exist in index" +msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3173 -#, c-format -msgid "%s: does not match index" +#: builtin/apply.c:3331 +msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3190 +#: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3192 +#: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3247 +#: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3267 +#: builtin/apply.c:3506 +#, c-format +msgid "%s: already exists in working directory" +msgstr "" + +#: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3272 +#: builtin/apply.c:3531 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3280 +#: builtin/apply.c:3539 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3293 +#: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3491 +#: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3518 +#: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3522 +#: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3527 +#: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3530 +#: builtin/apply.c:3790 builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3563 +#: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3612 +#: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3668 +#: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3676 +#: builtin/apply.c:3967 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:3970 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3689 +#: builtin/apply.c:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:3710 +#: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:3713 +#: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:3844 +#: builtin/apply.c:4154 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:3855 +#: builtin/apply.c:4165 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:3970 builtin/apply.c:3973 +#: builtin/apply.c:4284 builtin/apply.c:4287 msgid "path" msgstr "" -#: builtin/apply.c:3971 +#: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:3974 +#: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:3976 +#: builtin/apply.c:4290 msgid "num" msgstr "" -#: builtin/apply.c:3977 +#: builtin/apply.c:4291 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:3980 +#: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:3982 +#: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:3986 +#: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:3988 +#: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:3990 +#: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:3992 +#: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:3994 +#: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:3996 +#: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:3998 +#: builtin/apply.c:4312 +msgid "attempt three-way merge if a patch does not apply" +msgstr "" + +#: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4000 +#: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4003 +#: builtin/apply.c:4319 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4004 +#: builtin/apply.c:4320 msgid "action" msgstr "" -#: builtin/apply.c:4005 +#: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4008 builtin/apply.c:4011 +#: builtin/apply.c:4324 builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4014 +#: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4016 +#: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4018 +#: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4020 +#: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4021 +#: builtin/apply.c:4337 msgid "be verbose" msgstr "" -#: builtin/apply.c:4023 +#: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4026 +#: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4028 +#: builtin/apply.c:4344 msgid "root" msgstr "" -#: builtin/apply.c:4029 +#: builtin/apply.c:4345 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4050 +#: builtin/apply.c:4367 +msgid "--3way outside a repository" +msgstr "" + +#: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4053 +#: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4069 +#: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4083 +#: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4089 builtin/apply.c:4099 +#: builtin/apply.c:4414 builtin/apply.c:4424 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1628,7 +1995,7 @@ msgstr "" msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:788 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "" @@ -1653,99 +2020,99 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:131 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:175 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:192 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:209 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:234 builtin/checkout.c:392 +#: builtin/checkout.c:235 builtin/checkout.c:393 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "" -#: builtin/checkout.c:414 +#: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:533 +#: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:566 +#: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:573 +#: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:576 +#: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:580 +#: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:582 +#: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:584 +#: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:640 +#: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:647 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1760,7 +2127,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:664 +#: builtin/checkout.c:665 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1770,96 +2137,96 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:694 +#: builtin/checkout.c:695 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:698 +#: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:724 +#: builtin/checkout.c:725 builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:974 +#: builtin/checkout.c:977 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:983 +#: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:986 +#: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "" -#: builtin/checkout.c:988 +#: builtin/checkout.c:991 msgid "--detach cannot be used with -t" msgstr "" -#: builtin/checkout.c:994 +#: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1001 +#: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" msgstr "" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -1908,11 +2275,6 @@ msgstr "" msgid "reference repository '%s' is not a local directory." msgstr "" -#: builtin/clone.c:302 -#, c-format -msgid "failed to open '%s'" -msgstr "" - #: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" @@ -1953,78 +2315,78 @@ msgstr "" msgid "done.\n" msgstr "" -#: builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:549 +#: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:639 +#: builtin/clone.c:642 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:643 +#: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:654 +#: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:668 +#: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:673 +#: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:683 +#: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:693 +#: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/clone.c:709 builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:709 +#: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:728 +#: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:730 +#: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:786 +#: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:835 +#: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:842 +#: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "" @@ -2063,93 +2425,93 @@ msgid "" "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:253 +#: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:295 +#: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:301 +#: builtin/commit.c:304 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:386 +#: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:388 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:398 +#: builtin/commit.c:401 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:418 +#: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:493 builtin/commit.c:499 +#: builtin/commit.c:496 builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:522 +#: builtin/commit.c:525 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:585 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:632 builtin/shortlog.c:296 +#: builtin/commit.c:635 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:634 +#: builtin/commit.c:637 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:638 +#: builtin/commit.c:641 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:644 +#: builtin/commit.c:647 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:660 +#: builtin/commit.c:663 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:664 +#: builtin/commit.c:667 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:668 +#: builtin/commit.c:671 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:720 +#: builtin/commit.c:723 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:731 +#: builtin/commit.c:734 #, c-format msgid "" "\n" @@ -2159,7 +2521,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:736 +#: builtin/commit.c:739 #, c-format msgid "" "\n" @@ -2169,171 +2531,171 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:748 +#: builtin/commit.c:751 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:753 +#: builtin/commit.c:756 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:766 +#: builtin/commit.c:769 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:773 +#: builtin/commit.c:776 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:793 +#: builtin/commit.c:796 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:830 +#: builtin/commit.c:833 msgid "Error building trees" msgstr "" -#: builtin/commit.c:845 builtin/tag.c:361 +#: builtin/commit.c:848 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:942 +#: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:957 builtin/commit.c:1157 +#: builtin/commit.c:960 builtin/commit.c:1160 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:997 +#: builtin/commit.c:1000 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1008 +#: builtin/commit.c:1011 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1011 +#: builtin/commit.c:1014 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1013 +#: builtin/commit.c:1016 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1016 +#: builtin/commit.c:1019 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1028 +#: builtin/commit.c:1031 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1036 +#: builtin/commit.c:1039 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1053 +#: builtin/commit.c:1056 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1057 +#: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1059 +#: builtin/commit.c:1062 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1069 builtin/tag.c:577 +#: builtin/commit.c:1072 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1074 +#: builtin/commit.c:1077 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1257 +#: builtin/commit.c:1260 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1259 +#: builtin/commit.c:1262 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1300 +#: builtin/commit.c:1303 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1302 +#: builtin/commit.c:1305 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1446 +#: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1484 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1491 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1531 +#: builtin/commit.c:1534 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1576 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2432,22 +2794,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 +3051,309 @@ msgstr "" msgid "both --cached and trees are given." msgstr "" -#: builtin/help.c:59 +#: builtin/help.c:65 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:87 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:100 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:108 +#: builtin/help.c:114 #, 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:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:211 +#: builtin/help.c:217 #, 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:229 #, 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:299 msgid "The most commonly used git commands are:" msgstr "" -#: builtin/help.c:355 +#: builtin/help.c:367 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:372 +#: builtin/help.c:384 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:380 +#: builtin/help.c:392 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:391 -#, c-format -msgid "'%s': not a documentation directory." -msgstr "" - -#: builtin/help.c:432 builtin/help.c:439 +#: builtin/help.c:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:453 +#: builtin/help.c:470 #, 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:530 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:497 +#: builtin/index-pack.c:532 #, 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:558 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:583 +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format -msgid "cannot read existing object %s" +msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 #, c-format -msgid "SHA1 COLLISION FOUND WITH %s !" +msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:598 +#: builtin/index-pack.c:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "" + +#: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:610 +#: builtin/index-pack.c:747 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:749 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:614 +#: builtin/index-pack.c:751 #, 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:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:872 +#: builtin/index-pack.c:1012 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:877 +#: builtin/index-pack.c:1017 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:880 +#: builtin/index-pack.c:1020 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:903 +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "" + +#: builtin/index-pack.c:1054 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:954 +#: builtin/index-pack.c:1105 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:973 +#: builtin/index-pack.c:1124 #, 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:1149 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1077 +#: builtin/index-pack.c:1228 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1101 +#: builtin/index-pack.c:1252 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1114 +#: builtin/index-pack.c:1265 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1122 +#: builtin/index-pack.c:1273 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1286 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1297 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1398 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1400 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1447 #, 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:1454 #, 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:1481 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:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1558 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1581 msgid "--verify with no packfile name given" msgstr "" @@ -3059,22 +3427,22 @@ msgstr "" msgid "insane git directory %s" msgstr "" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "" @@ -3084,147 +3452,147 @@ msgstr "" #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr "" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "" -#: builtin/init-db.c:521 builtin/init-db.c:528 +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "" -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format 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:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:513 +#: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:602 +#: builtin/log.c:608 msgid "format.headers without value" msgstr "" -#: builtin/log.c:676 +#: builtin/log.c:682 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:687 +#: builtin/log.c:693 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:701 +#: builtin/log.c:707 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:709 +#: builtin/log.c:715 msgid "Not a range." msgstr "" -#: builtin/log.c:786 +#: builtin/log.c:792 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:859 +#: builtin/log.c:865 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:932 +#: builtin/log.c:938 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1153 +#: builtin/log.c:1160 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1198 +#: builtin/log.c:1205 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1200 +#: builtin/log.c:1207 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1208 +#: builtin/log.c:1215 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1210 +#: builtin/log.c:1217 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1212 +#: builtin/log.c:1219 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1235 +#: builtin/log.c:1242 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1237 +#: builtin/log.c:1244 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1390 +#: builtin/log.c:1397 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1494 +#: builtin/log.c:1501 #, 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:1517 builtin/log.c:1519 builtin/log.c:1531 #, c-format msgid "Unknown commit %s" msgstr "" @@ -3305,10 +3673,6 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: builtin/merge.c:697 -msgid "Unable to write index." -msgstr "" - #: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." msgstr "" @@ -3694,22 +4058,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 "" @@ -4258,30 +4627,30 @@ msgstr "" msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:297 +#: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:302 +#: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:311 +#: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:313 +#: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:325 +#: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:341 +#: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" @@ -4599,9 +4968,9 @@ msgstr "" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem run \"$cmdline --resolved\".\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." +"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +"To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" #: git-am.sh:121 @@ -4612,6 +4981,10 @@ msgstr "" msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "" + #: git-am.sh:154 msgid "" "Did you hand edit your patch?\n" @@ -4622,42 +4995,48 @@ msgstr "" msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: git-am.sh:275 +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "" + +#: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: git-am.sh:362 +#: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "" -#: git-am.sh:364 +#: git-am.sh:363 msgid "Patch format detection failed." msgstr "" -#: git-am.sh:418 -msgid "-d option is no longer supported. Do not use." +#: git-am.sh:389 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." msgstr "" -#: git-am.sh:481 +#: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:486 +#: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:513 +#: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:579 +#: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:671 +#: git-am.sh:679 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -4665,53 +5044,53 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:708 +#: git-am.sh:706 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:755 +#: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:759 +#: git-am.sh:757 msgid "Commit Body is:" msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:766 +#: git-am.sh:764 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:802 +#: git-am.sh:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:823 +#: git-am.sh:821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: git-am.sh:831 +#: git-am.sh:829 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:847 +#: git-am.sh:845 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:857 +#: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:873 +#: git-am.sh:876 msgid "applying to an empty history" msgstr "" @@ -4894,6 +5273,112 @@ msgstr "" msgid "Cannot rebase onto multiple branches" msgstr "" +#: git-rebase.sh:52 +msgid "" +"When you have resolved this problem, run \"git rebase --continue\".\n" +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." +msgstr "" + +#: git-rebase.sh:159 +msgid "The pre-rebase hook refused to rebase." +msgstr "" + +#: git-rebase.sh:164 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "" + +#: git-rebase.sh:295 +msgid "The --exec option must be used with the --interactive option" +msgstr "" + +#: git-rebase.sh:300 +msgid "No rebase in progress?" +msgstr "" + +#: git-rebase.sh:313 +msgid "Cannot read HEAD" +msgstr "" + +#: git-rebase.sh:316 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" + +#: git-rebase.sh:334 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "" + +#: git-rebase.sh:350 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" + +#: git-rebase.sh:395 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "" + +#: git-rebase.sh:419 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "" + +#: git-rebase.sh:422 git-rebase.sh:426 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "" + +#: git-rebase.sh:431 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "" + +#: git-rebase.sh:454 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "" + +#: git-rebase.sh:474 +msgid "Please commit or stash them." +msgstr "" + +#: git-rebase.sh:492 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "" + +#: git-rebase.sh:495 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "" + +#: git-rebase.sh:506 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:515 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" + +#: git-rebase.sh:523 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "" + #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "" @@ -5021,37 +5506,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:189 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:160 +#: git-submodule.sh:201 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:249 +#: git-submodule.sh:290 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:266 +#: git-submodule.sh:307 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:270 +#: git-submodule.sh:311 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5059,155 +5544,151 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:281 +#: git-submodule.sh:322 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:283 +#: git-submodule.sh:324 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:297 +#: git-submodule.sh:338 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:302 +#: git-submodule.sh:343 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:307 +#: git-submodule.sh:348 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:349 +#: git-submodule.sh:390 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:363 +#: git-submodule.sh:404 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:406 +#: git-submodule.sh:447 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:415 +#: git-submodule.sh:456 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:417 +#: git-submodule.sh:458 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:425 +#: git-submodule.sh:466 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:524 +#: git-submodule.sh:565 #, 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:578 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:556 +#: git-submodule.sh:597 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:570 +#: git-submodule.sh:611 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:571 +#: git-submodule.sh:612 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:576 +#: git-submodule.sh:617 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:577 +#: git-submodule.sh:618 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:582 +#: git-submodule.sh:623 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:583 +#: git-submodule.sh:624 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:605 git-submodule.sh:928 +#: git-submodule.sh:646 git-submodule.sh:969 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:713 -msgid "--cached cannot be used with --files" +#: git-submodule.sh:754 +msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:753 +#: git-submodule.sh:794 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:771 +#: git-submodule.sh:812 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:774 +#: git-submodule.sh:815 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:777 +#: git-submodule.sh:818 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:802 +#: git-submodule.sh:843 msgid "blob" msgstr "" -#: git-submodule.sh:803 -msgid "submodule" -msgstr "" - -#: git-submodule.sh:840 +#: git-submodule.sh:881 msgid "# Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:842 +#: git-submodule.sh:883 msgid "# Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:974 +#: git-submodule.sh:1027 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 1.7.10\n" +"Project-Id-Version: git 1.7.12\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-08-06 23:47+0800\n" +"PO-Revision-Date: 2012-10-02 08:15+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -48,7 +48,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:696 +#: bundle.c:89 builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -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:726 builtin/log.c:1316 builtin/log.c:1535 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:1212 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" @@ -227,8 +231,8 @@ msgstr "" "%s" #: diff.c:1400 -msgid " 0 files changed\n" -msgstr " 0 filer ändrade\n" +msgid " 0 files changed" +msgstr " 0 filer ändrade" #: diff.c:1404 #, c-format @@ -251,7 +255,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] ", %d borttagning(-)" msgstr[1] ", %d borttagningar(-)" -#: diff.c:3478 +#: diff.c:3461 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -287,16 +291,16 @@ msgstr "\"%s\": %s" msgid "'%s': short read %s" msgstr "\"%s\": kort läsning %s" -#: help.c:207 +#: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:214 +#: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:270 +#: help.c:275 #, 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:332 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:354 #, 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:359 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:361 +#: help.c:366 #, 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:370 msgid "" "\n" "Did you mean this?" @@ -342,35 +346,297 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: parse-options.c:493 +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "(felaktig incheckning)\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "fel vid byggande av träd" + +#: merge-recursive.c:497 +msgid "diff setup failed" +msgstr "misslyckades sätta upp för diff" + +#: merge-recursive.c:627 +msgid "merge-recursive: disk full?" +msgstr "merge-recursive: disk full?" + +#: merge-recursive.c:690 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "misslyckades skapa sökvägen \"%s\"%s" + +#: merge-recursive.c:701 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Tar bort %s för att göra plats för underkatalog\n" + +#. something else exists +#. .. but not some other error (who really cares what?) +#: merge-recursive.c:715 merge-recursive.c:736 +msgid ": perhaps a D/F conflict?" +msgstr ": kanske en K/F-konflikt?" + +#: merge-recursive.c:726 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "vägrar förlora ospårad fil vid \"%s\"" + +#: merge-recursive.c:766 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "kan inte läsa objektet %s: \"%s\"" + +#: merge-recursive.c:768 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "blob förväntades för %s \"%s\"" + +#: merge-recursive.c:791 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades öppna \"%s\"" + +#: merge-recursive.c:799 +#, c-format +msgid "failed to symlink '%s'" +msgstr "misslyckades ta skapa symboliska länken \"%s\"" + +#: merge-recursive.c:802 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "vet inte hur %06o %s \"%s\" skall hanteras" + +#: merge-recursive.c:939 +msgid "Failed to execute internal merge" +msgstr "Misslyckades exekvera intern sammanslagning" + +#: merge-recursive.c:943 +#, c-format +msgid "Unable to add %s to database" +msgstr "Kunde inte lägga till %s till databasen" + +#: merge-recursive.c:959 +msgid "unsupported object type in the tree" +msgstr "objekttyp som ej stöds upptäcktes i trädet" + +#: merge-recursive.c:1038 merge-recursive.c:1052 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " +"i trädet." + +#: merge-recursive.c:1044 merge-recursive.c:1057 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " +"i trädet vid %s." + +#: merge-recursive.c:1098 +msgid "rename" +msgstr "namnbyte" + +#: merge-recursive.c:1098 +msgid "renamed" +msgstr "namnbytt" + +#: merge-recursive.c:1154 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s är en katalog i %s lägger till som %s istället" + +#: merge-recursive.c:1176 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " +"namnbyte \"%s\"->\"%s\" i \"%s\"%s" + +#: merge-recursive.c:1181 +msgid " (left unresolved)" +msgstr " (lämnad olöst)" + +#: merge-recursive.c:1235 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" +"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" + +#: merge-recursive.c:1265 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Byter namn på %s till %s och %s till %s istället" + +#: merge-recursive.c:1464 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" + +#: merge-recursive.c:1474 +#, c-format +msgid "Adding merged %s" +msgstr "Lägger till sammanslagen %s" + +#: merge-recursive.c:1479 merge-recursive.c:1677 +#, c-format +msgid "Adding as %s instead" +msgstr "Lägger till som %s iställer" + +#: merge-recursive.c:1530 +#, c-format +msgid "cannot read object %s" +msgstr "kan inte läsa objektet %s" + +#: merge-recursive.c:1533 +#, c-format +msgid "object %s is not a blob" +msgstr "objektet %s är inte en blob" + +#: merge-recursive.c:1581 +msgid "modify" +msgstr "ändra" + +#: merge-recursive.c:1581 +msgid "modified" +msgstr "ändrad" + +#: merge-recursive.c:1591 +msgid "content" +msgstr "innehåll" + +#: merge-recursive.c:1598 +msgid "add/add" +msgstr "tillägg/tillägg" + +#: merge-recursive.c:1632 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "Hoppade över %s (sammanslagen samma som befintlig)" + +#: merge-recursive.c:1646 +#, c-format +msgid "Auto-merging %s" +msgstr "Slår ihop %s automatiskt" + +#: merge-recursive.c:1650 git-submodule.sh:844 +msgid "submodule" +msgstr "undermodul" + +#: merge-recursive.c:1651 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" + +#: merge-recursive.c:1741 +#, c-format +msgid "Removing %s" +msgstr "Tar bort %s" + +#: merge-recursive.c:1766 +msgid "file/directory" +msgstr "fil/katalog" + +#: merge-recursive.c:1772 +msgid "directory/file" +msgstr "katalog/fil" + +#: merge-recursive.c:1777 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" +"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" + +#: merge-recursive.c:1787 +#, c-format +msgid "Adding %s" +msgstr "Lägger till %s" + +#: merge-recursive.c:1804 +msgid "Fatal merge failure, shouldn't happen." +msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." + +#: merge-recursive.c:1823 +msgid "Already up-to-date!" +msgstr "Redan à jour!" + +#: merge-recursive.c:1832 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "sammanslagning av träden %s och %s misslyckades" + +#: merge-recursive.c:1862 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "Obehandlad sökväg??? %s" + +#: merge-recursive.c:1907 +msgid "Merging:" +msgstr "Slår ihop:" + +#: merge-recursive.c:1920 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "hittade %u gemensam förfader:" +msgstr[1] "hittade %u gemensamma förfäder:" + +#: merge-recursive.c:1957 +msgid "merge returned no commit" +msgstr "sammanslagningen returnerade ingen incheckning" + +#: merge-recursive.c:2014 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Kunde inte tolka objektet \"%s\"" + +#: merge-recursive.c:2026 builtin/merge.c:697 +msgid "Unable to write index." +msgstr "Kunde inte skriva indexet." + +#: parse-options.c:494 msgid "..." msgstr "..." -#: parse-options.c:511 +#: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:516 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:518 +#: parse-options.c:519 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1629 +#: remote.c:1632 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:1635 +#: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -380,7 +646,7 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1643 +#: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -604,7 +870,7 @@ msgstr "kan inte bestämma HEAD" msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:805 builtin/apply.c:3697 +#: sequencer.c:805 builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" @@ -636,21 +902,21 @@ msgstr "Kan inte ångra som första incheckning" msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: sha1_name.c:864 +#: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: sha1_name.c:867 +#: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "Okänd gren: \"%s\"" -#: sha1_name.c:869 +#: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Ingen standarduppström angiven för grenen \"%s\"" -#: sha1_name.c:872 +#: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" @@ -664,240 +930,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:140 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:141 wt-status.c:158 +#: wt-status.c:167 wt-status.c:194 #, 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:169 wt-status.c:196 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:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (använd \"git add <fil>...\" för att ange lösning)" + +#: wt-status.c:175 wt-status.c:179 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:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (använd \"git rm <fil>...\" för att ange lösning)" + +#: wt-status.c:188 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:170 +#: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:174 +#: wt-status.c:210 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:212 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:213 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:215 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:224 #, c-format msgid "%s files:" msgstr "%se filer:" -#: wt-status.c:191 +#: wt-status.c:227 #, 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)" +" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:208 +#: wt-status.c:244 msgid "bug" msgstr "programfel" -#: wt-status.c:213 +#: wt-status.c:249 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:214 +#: wt-status.c:250 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:215 +#: wt-status.c:251 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:216 +#: wt-status.c:252 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:217 +#: wt-status.c:253 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:218 +#: wt-status.c:254 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:219 +#: wt-status.c:255 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:249 +#: wt-status.c:285 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:251 +#: wt-status.c:287 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:253 +#: wt-status.c:289 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:267 +#: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "ny fil: %s" -#: wt-status.c:270 +#: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "kopierad: %s -> %s" -#: wt-status.c:273 +#: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "borttagen: %s" -#: wt-status.c:276 +#: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "ändrad: %s" -#: wt-status.c:279 +#: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "namnbyte: %s -> %s" -#: wt-status.c:282 +#: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "typbyte: %s" -#: wt-status.c:285 +#: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "okänd: %s" -#: wt-status.c:288 +#: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "osammansl.: %s" -#: wt-status.c:291 +#: wt-status.c:327 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:737 +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "Du har ej sammanslagna sökvägar." + +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (rätta konflikter och kör \"git commit\")" + +#: wt-status.c:791 +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:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" + +#: wt-status.c:804 +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:807 +msgid "The current patch is empty." +msgstr "Aktuell patch är tom." + +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " (rätta konflikter och kör sedan \"git am --resolved\")" + +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (använd \"git am --skip\" för att hoppa över patchen)" + +#: wt-status.c:815 +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:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "Du håller på med en ombasering." + +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" + +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" + +#: wt-status.c:880 +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:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" + +#: wt-status.c:888 +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:891 +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:893 +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:896 +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:898 +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:908 +msgid "You are currently cherry-picking." +msgstr "Du håller på med en \"cherry-pick\"." + +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " (alla konflikter har rättats: kör \"git commit\")" + +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "Du håller på med en \"bisect\"." + +#: wt-status.c:927 +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:978 msgid "On branch " msgstr "På grenen " -#: wt-status.c:744 +#: wt-status.c:985 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:755 +#: wt-status.c:997 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:769 +#: wt-status.c:1011 msgid "Untracked" msgstr "Ospårad" -#: wt-status.c:771 +#: wt-status.c:1013 msgid "Ignored" msgstr "Ignorerad" # %s är nästa sträng eller tom. -#: wt-status.c:773 +#: wt-status.c:1015 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:775 +#: wt-status.c:1017 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:1023 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:785 +#: wt-status.c:1027 #, 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:1029 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:1031 #, 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:1033 msgid " (use \"git add\" to track)" -msgstr " (använd \"git add\" för att spåra)" +msgstr " (spåra med \"git add\")" -#: wt-status.c:793 wt-status.c:796 wt-status.c:799 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "inget att checka in%s\n" -#: wt-status.c:794 +#: wt-status.c:1036 msgid " (create/copy files and use \"git add\" to track)" -msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)" +msgstr " (skapa/kopiera filer och spåra med \"git add\")" -#: wt-status.c:797 +#: wt-status.c:1039 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:1042 msgid " (working directory clean)" msgstr " (arbetskatalogen ren)" -#: wt-status.c:908 +#: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:914 +#: wt-status.c:1156 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:929 +#: wt-status.c:1171 msgid "behind " msgstr "efter " -#: wt-status.c:932 wt-status.c:935 +#: wt-status.c:1174 wt-status.c:1177 msgid "ahead " msgstr "före " -#: wt-status.c:937 +#: wt-status.c:1179 msgid ", behind " msgstr ", efter " @@ -906,7 +1275,7 @@ msgstr ", efter " msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:67 builtin/commit.c:226 +#: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -924,7 +1293,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" @@ -996,75 +1365,75 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 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:4433 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [flaggor] [<patch>...]" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:815 +#: builtin/apply.c:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:824 +#: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:905 +#: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: builtin/apply.c:937 +#: builtin/apply.c:946 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: builtin/apply.c:941 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: builtin/apply.c:942 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: builtin/apply.c:949 +#: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: builtin/apply.c:1394 +#: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1451 +#: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1468 +#: builtin/apply.c:1477 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1080,82 +1449,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1628 +#: builtin/apply.c:1637 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1630 +#: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1656 +#: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1692 +#: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1694 +#: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1697 +#: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: builtin/apply.c:1843 +#: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:1958 +#: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2048 +#: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2052 +#: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2123 +#: builtin/apply.c:2132 msgid "oops" msgstr "hoppsan" -#: builtin/apply.c:2645 +#: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2763 +#: builtin/apply.c:2772 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: builtin/apply.c:2775 +#: builtin/apply.c:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: builtin/apply.c:2781 +#: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" @@ -1164,313 +1533,321 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2800 +#: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2903 +#: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:2909 +#: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: builtin/apply.c:2930 +#: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3045 +#: builtin/apply.c:3061 #, c-format -msgid "patch %s has been renamed/deleted" -msgstr "patchen %s har ändrat namn/tagits bort" +msgid "cannot checkout %s" +msgstr "kan inte checka ut %s" -#: builtin/apply.c:3052 builtin/apply.c:3069 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "patch för borttagning lämnar kvar filinnehåll" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3139 builtin/apply.c:3361 #, c-format -msgid "%s: already exists in working directory" -msgstr "%s: finns redan i arbetskatalogen" +msgid "path %s has been renamed/deleted" +msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3143 +#: builtin/apply.c:3220 builtin/apply.c:3375 #, c-format -msgid "%s: has been deleted/renamed" -msgstr "%s: har tagits bort/ändrat namn" +msgid "%s: does not exist in index" +msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3148 builtin/apply.c:3179 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3159 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: finns inte i indexet" - -#: builtin/apply.c:3173 +#: builtin/apply.c:3229 builtin/apply.c:3383 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3190 +#: builtin/apply.c:3331 +msgid "removal patch leaves file contents" +msgstr "patch för borttagning lämnar kvar filinnehåll" + +#: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3192 +#: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3247 +#: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3267 +#: builtin/apply.c:3506 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: finns redan i arbetskatalogen" + +#: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: builtin/apply.c:3272 +#: builtin/apply.c:3531 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: builtin/apply.c:3280 +#: builtin/apply.c:3539 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3293 +#: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3491 +#: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3518 +#: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "trasig patch för underprojektet %s" -#: builtin/apply.c:3522 +#: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3527 +#: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: builtin/apply.c:3530 +#: builtin/apply.c:3790 builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3563 +#: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3612 +#: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:3668 +#: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:3676 +#: builtin/apply.c:3967 msgid "internal error" msgstr "internt fel" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:3970 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: builtin/apply.c:3689 +#: builtin/apply.c:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:3710 +#: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:3713 +#: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:3844 +#: builtin/apply.c:4154 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:3855 +#: builtin/apply.c:4165 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:3970 builtin/apply.c:3973 +#: builtin/apply.c:4284 builtin/apply.c:4287 msgid "path" msgstr "sökväg" -#: builtin/apply.c:3971 +#: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:3974 +#: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:3976 +#: builtin/apply.c:4290 msgid "num" msgstr "antal" -#: builtin/apply.c:3977 +#: builtin/apply.c:4291 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: builtin/apply.c:3980 +#: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:3982 +#: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: builtin/apply.c:3986 +#: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "visar antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:3988 +#: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: builtin/apply.c:3990 +#: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: builtin/apply.c:3992 +#: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: builtin/apply.c:3994 +#: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:3996 +#: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:3998 +#: builtin/apply.c:4312 +msgid "attempt three-way merge if a patch does not apply" +msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" + +#: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4000 +#: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4003 +#: builtin/apply.c:4319 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4004 +#: builtin/apply.c:4320 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4005 +#: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4008 builtin/apply.c:4011 +#: builtin/apply.c:4324 builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4014 +#: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4016 +#: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4018 +#: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4020 +#: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4021 +#: builtin/apply.c:4337 msgid "be verbose" msgstr "var pratsam" -#: builtin/apply.c:4023 +#: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4026 +#: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4028 +#: builtin/apply.c:4344 msgid "root" msgstr "rot" -#: builtin/apply.c:4029 +#: builtin/apply.c:4345 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4050 +#: builtin/apply.c:4367 +msgid "--3way outside a repository" +msgstr "--3way utanför arkiv" + +#: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4053 +#: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4069 +#: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4083 +#: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: builtin/apply.c:4089 builtin/apply.c:4099 +#: builtin/apply.c:4414 builtin/apply.c:4424 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1676,7 +2053,7 @@ msgstr "kunde inte skriva grenbeskrivningsmall: %s" msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:788 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" @@ -1703,99 +2080,99 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:131 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:175 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:192 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:209 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:234 builtin/checkout.c:392 +#: builtin/checkout.c:235 builtin/checkout.c:393 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done misslyckades" -#: builtin/checkout.c:414 +#: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:533 +#: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:573 +#: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:640 +#: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:647 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1818,7 +2195,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:665 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1833,71 +2210,71 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:695 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:698 +#: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:724 +#: builtin/checkout.c:725 builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:974 +#: builtin/checkout.c:977 msgid "-B cannot be used with -b" msgstr "-B kan inte användas med -b" -#: builtin/checkout.c:983 +#: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "--patch är inkompatibel med alla andra flaggor" -#: builtin/checkout.c:986 +#: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detcah kan inte användas med -b/-B/--orphan" -#: builtin/checkout.c:988 +#: builtin/checkout.c:991 msgid "--detach cannot be used with -t" msgstr "--detach kan inte användas med -t" -#: builtin/checkout.c:994 +#: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1001 +#: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan och -b|-B kan inte användas samtidigt" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" msgstr "--orphan kan inte användas med -t" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f och -m är inkompatibla" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -1906,15 +2283,15 @@ msgstr "" "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" "Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout: --detach tar inte en sökväg som argument" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -1922,11 +2299,11 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "Kan inte växla gren på en icke-incheckning." -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs är inkompatibla med att byta gren." @@ -1979,11 +2356,6 @@ msgstr "Tar inte bort %s\n" msgid "reference repository '%s' is not a local directory." msgstr "referensarkivet \"%s\" är inte en lokal katalog." -#: builtin/clone.c:302 -#, c-format -msgid "failed to open '%s'" -msgstr "misslyckades öppna \"%s\"" - #: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" @@ -2024,79 +2396,79 @@ msgstr "misslyckades kopiera filen till \"%s\"" msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:549 +#: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:639 +#: builtin/clone.c:642 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:643 +#: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:654 +#: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:668 +#: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:673 +#: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:683 +#: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:693 +#: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/clone.c:709 builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:709 +#: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:728 +#: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:730 +#: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:786 +#: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:835 +#: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:842 +#: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -2155,93 +2527,93 @@ msgstr "" "\n" "Annars använder du \"git reset\"\n" -#: builtin/commit.c:253 +#: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:295 +#: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:301 +#: builtin/commit.c:304 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:386 +#: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:388 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:398 +#: builtin/commit.c:401 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:418 +#: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:493 builtin/commit.c:499 +#: builtin/commit.c:496 builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "felaktig incheckning: %s" -#: builtin/commit.c:522 +#: builtin/commit.c:525 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:582 +#: builtin/commit.c:585 #, c-format msgid "Malformed ident string: '%s'" msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:632 builtin/shortlog.c:296 +#: builtin/commit.c:635 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:634 +#: builtin/commit.c:637 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:638 +#: builtin/commit.c:641 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:644 +#: builtin/commit.c:647 msgid "commit has empty message" msgstr "incheckningen har ett tomt meddelande" -#: builtin/commit.c:660 +#: builtin/commit.c:663 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:664 +#: builtin/commit.c:667 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:668 +#: builtin/commit.c:671 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:720 +#: builtin/commit.c:723 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:731 +#: builtin/commit.c:734 #, c-format msgid "" "\n" @@ -2256,7 +2628,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:736 +#: builtin/commit.c:739 #, c-format msgid "" "\n" @@ -2271,7 +2643,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:748 +#: builtin/commit.c:751 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -2279,7 +2651,7 @@ msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" "med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:753 +#: builtin/commit.c:756 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -2289,159 +2661,159 @@ msgstr "" "med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:766 +#: builtin/commit.c:769 #, c-format msgid "%sAuthor: %s" msgstr "%sFörfattare: %s" -#: builtin/commit.c:773 +#: builtin/commit.c:776 #, c-format msgid "%sCommitter: %s" msgstr "%sIncheckare: %s" -#: builtin/commit.c:793 +#: builtin/commit.c:796 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:830 +#: builtin/commit.c:833 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:845 builtin/tag.c:361 +#: builtin/commit.c:848 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:942 +#: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:957 builtin/commit.c:1157 +#: builtin/commit.c:960 builtin/commit.c:1160 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:997 +#: builtin/commit.c:1000 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1008 +#: builtin/commit.c:1011 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1011 +#: builtin/commit.c:1014 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1013 +#: builtin/commit.c:1016 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1016 +#: builtin/commit.c:1019 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1028 +#: builtin/commit.c:1031 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1036 +#: builtin/commit.c:1039 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1053 +#: builtin/commit.c:1056 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1055 +#: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1057 +#: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1059 +#: builtin/commit.c:1062 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1069 builtin/tag.c:577 +#: builtin/commit.c:1072 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1074 +#: builtin/commit.c:1077 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1257 +#: builtin/commit.c:1260 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1259 +#: builtin/commit.c:1262 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1300 +#: builtin/commit.c:1303 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1302 +#: builtin/commit.c:1305 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1446 +#: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1484 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1491 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1498 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1517 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1531 +#: builtin/commit.c:1534 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1536 +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1576 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2550,22 +2922,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 +3187,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:65 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: %s" -#: builtin/help.c:87 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:100 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:108 +#: builtin/help.c:114 #, 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:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "exec misslyckades för \"%s\": %s" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -2847,7 +3219,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:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -2856,266 +3228,272 @@ 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:299 msgid "The most commonly used git commands are:" msgstr "De mest använda git-kommandona är:" -#: builtin/help.c:355 +#: builtin/help.c:367 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:372 +#: builtin/help.c:384 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:380 +#: builtin/help.c:392 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:391 -#, c-format -msgid "'%s': not a documentation directory." -msgstr "\"%s\": inte en dokumentationskatalog." - -#: builtin/help.c:432 builtin/help.c:439 +#: builtin/help.c:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:453 +#: builtin/help.c:470 #, 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:530 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:497 +#: builtin/index-pack.c:532 #, 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:558 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:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:598 +#: builtin/index-pack.c:652 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:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "kan inte läsa befintligt objekt %s" + +#: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:610 +#: builtin/index-pack.c:747 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:749 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:614 +#: builtin/index-pack.c:751 #, 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:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Receiving objects" -msgstr "Tar bort objeckt" +msgstr "Tar emot objekt" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:872 +#: builtin/index-pack.c:1012 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:877 +#: builtin/index-pack.c:1017 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:880 +#: builtin/index-pack.c:1020 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:903 +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "förvirrad bortom vanvett i parse_pack_objects()" + +#: builtin/index-pack.c:1054 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:954 +#: builtin/index-pack.c:1105 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:973 +#: builtin/index-pack.c:1124 #, 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:1149 #, 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:1228 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1101 +#: builtin/index-pack.c:1252 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1114 +#: builtin/index-pack.c:1265 #, 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:1273 #, 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:1286 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1297 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1398 #, 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:1400 #, 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:1447 #, 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:1454 #, 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:1481 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:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1558 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:1562 builtin/index-pack.c:1572 #, 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:1581 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -3189,22 +3567,22 @@ msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" msgid "insane git directory %s" msgstr "tokig git-katalog %s" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Kunde inte skapa gitlänk %s" @@ -3214,38 +3592,38 @@ msgstr "Kunde inte skapa gitlänk %s" #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr " delat" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "kan inte läsa aktuell katalog (cwd)" -#: builtin/init-db.c:521 builtin/init-db.c:528 +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -3254,109 +3632,109 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "Kan inte komma åt aktuell arbetskatalog" -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format 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:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:513 +#: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:602 +#: builtin/log.c:608 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:676 +#: builtin/log.c:682 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:687 +#: builtin/log.c:693 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:701 +#: builtin/log.c:707 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:709 +#: builtin/log.c:715 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:786 +#: builtin/log.c:792 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:859 +#: builtin/log.c:865 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:932 +#: builtin/log.c:938 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1153 +#: builtin/log.c:1160 #, c-format msgid "bogus committer info %s" msgstr "felaktig incheckarinformation %s" -#: builtin/log.c:1198 +#: builtin/log.c:1205 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1200 +#: builtin/log.c:1207 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:1215 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1210 +#: builtin/log.c:1217 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1212 +#: builtin/log.c:1219 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1235 +#: builtin/log.c:1242 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1237 +#: builtin/log.c:1244 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1390 +#: builtin/log.c:1397 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1494 +#: builtin/log.c:1501 #, 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:1517 builtin/log.c:1519 builtin/log.c:1531 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -3437,10 +3815,6 @@ msgstr "git write-tree misslyckades skriva ett träd" msgid "failed to read the cache" msgstr "misslyckads läsa cachen" -#: builtin/merge.c:697 -msgid "Unable to write index." -msgstr "Kunde inte skriva indexet." - #: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." @@ -3846,22 +4220,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" @@ -4467,31 +4846,31 @@ msgstr "Oköade ändringar efter återställning:" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:297 +#: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/reset.c:302 +#: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:311 +#: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:313 +#: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:325 +#: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:341 +#: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." @@ -4813,7 +5192,7 @@ msgstr "Visa status för arbetskatalogen" #: common-cmds.h:28 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Skapa, visa, ta bort eller verifiera ett taggobjekt signerat med GPG" +msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" #: git-am.sh:50 msgid "You need to set your committer info first" @@ -4830,9 +5209,9 @@ msgstr "" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem run \"$cmdline --resolved\".\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." +"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +"To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" "När du har löst problemet kör du \"$cmdline --resolved\".\n" "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" @@ -4848,6 +5227,10 @@ msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "Använder indexinfo för att åteskapa ett basträd..." + #: git-am.sh:154 msgid "" "Did you hand edit your patch?\n" @@ -4861,42 +5244,50 @@ msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att pacha grundversionen och trevägssammanslagning..." -#: git-am.sh:275 +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "Misslyckads slå ihop ändringarna." + +#: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: git-am.sh:362 +#: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Patchformatet $patch_format stöds inte." -#: git-am.sh:364 +#: git-am.sh:363 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: git-am.sh:418 -msgid "-d option is no longer supported. Do not use." -msgstr "Flaggan -d stöds inte lägre. Använd inte." +#: git-am.sh:389 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"Flaggan -b/--binary har varit utan funktion länge, och\n" +"kommer tas bort. Vi ber dig att inte använda den längre." -#: git-am.sh:481 +#: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." -#: git-am.sh:486 +#: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "Bestäm dig. --skip eller --abort?" -#: git-am.sh:513 +#: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: git-am.sh:579 +#: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)" -#: git-am.sh:671 +#: git-am.sh:679 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -4907,32 +5298,32 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." -#: git-am.sh:708 +#: git-am.sh:706 msgid "Patch does not have a valid e-mail address." msgstr "Patchen har inte någon giltig e-postadress." -#: git-am.sh:755 +#: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: git-am.sh:759 +#: git-am.sh:757 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:766 +#: git-am.sh:764 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " -#: git-am.sh:802 +#: git-am.sh:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Tillämpar: $FIRSTLINE" -#: git-am.sh:823 +#: git-am.sh:821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4942,7 +5333,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: git-am.sh:831 +#: git-am.sh:829 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -4950,16 +5341,16 @@ msgstr "" "Du har fortfarande sökvägar som inte slagits samman i ditt index\n" "glömde du använda \"git add\"?" -#: git-am.sh:847 +#: git-am.sh:845 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: git-am.sh:857 +#: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" -#: git-am.sh:873 +#: git-am.sh:876 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" @@ -5162,6 +5553,126 @@ msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." msgid "Cannot rebase onto multiple branches" msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" +#: git-rebase.sh:52 +msgid "" +"When you have resolved this problem, run \"git rebase --continue\".\n" +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." +msgstr "" +"När du har löst problemet kör du \"git rebase --continue\".\n" +"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" +"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." + +#: git-rebase.sh:159 +msgid "The pre-rebase hook refused to rebase." +msgstr "Kroken pre-rebase vägrade ombaseringen." + +#: git-rebase.sh:164 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "Det verkar som en git-am körs. Kan inte ombasera." + +#: git-rebase.sh:295 +msgid "The --exec option must be used with the --interactive option" +msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" + +#: git-rebase.sh:300 +msgid "No rebase in progress?" +msgstr "Ingen ombasering pågår?" + +#: git-rebase.sh:313 +msgid "Cannot read HEAD" +msgstr "Kan inte läsa HEAD" + +#: git-rebase.sh:316 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Du måste redigera alla sammanslagningskonflikter och\n" +"därefter markera dem som lösta med git add" + +#: git-rebase.sh:334 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Kunde inte flytta tillbaka till $head_name" + +#: git-rebase.sh:350 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" +"Det verkar som katalogen $state_dir_base redan existerar, och\n" +"jag undrar om du redan är mitt i en annan ombasering. Om så är\n" +"fallet, försök\n" +"\t$cmd_live_rebase\n" +"Om så inte är fallet, kör\n" +"\t$cmd_clear_stale_rebase\n" +"och kör programmet igen. Jag avslutar ifall du fortfarande har\n" +"något av värde där." + +#: git-rebase.sh:395 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "ogiltig uppström $upstream_name" + +#: git-rebase.sh:419 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: mer än en sammanslagningsbas finns" + +#: git-rebase.sh:422 git-rebase.sh:426 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: ingen sammanslagningsbas finns" + +#: git-rebase.sh:431 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "Peka på en giltig incheckning: $onto_name" + +#: git-rebase.sh:454 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "ödesdigert: ingen sådan gren: $branch_name" + +#: git-rebase.sh:474 +msgid "Please commit or stash them." +msgstr "Checka in eller använd \"stash\" på dem." + +#: git-rebase.sh:492 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Aktuell gren $branch_name är à jour." + +#: git-rebase.sh:495 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." + +#: git-rebase.sh:506 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Ändringar från $mb till $onto:" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:515 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "" +"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." + +#: git-rebase.sh:523 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "Snabbspolade $branch_name till $onto_name." + #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" @@ -5291,38 +5802,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:189 #, 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:201 #, 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:290 #, 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:307 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:270 +#: git-submodule.sh:311 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5333,64 +5844,64 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:281 +#: git-submodule.sh:322 #, 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:324 #, 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:338 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:302 +#: git-submodule.sh:343 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:307 +#: git-submodule.sh:348 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:349 +#: git-submodule.sh:390 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Går in i \"$prefix$sm_path\"" -#: git-submodule.sh:363 +#: git-submodule.sh:404 #, 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:447 #, 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:456 #, 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:458 #, 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:466 #, 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:565 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5399,97 +5910,102 @@ msgstr "" "Undermodulen \"$sm_path\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:537 +#: git-submodule.sh:578 #, 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:597 #, 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:611 #, 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:612 #, 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:617 #, 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:618 #, 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:623 #, 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:624 #, 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:646 git-submodule.sh:969 #, 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 -msgid "--cached cannot be used with --files" -msgstr "--cached kan inte användas med --files" +#: git-submodule.sh:754 +msgid "The --cached option cannot be used with the --files option" +msgstr "Flaggan --cached kan inte användas med flaggan --files" #. unexpected type -#: git-submodule.sh:753 +#: git-submodule.sh:794 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:771 +#: git-submodule.sh:812 #, 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:815 #, 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:818 #, 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:843 msgid "blob" msgstr "blob" -#: git-submodule.sh:803 -msgid "submodule" -msgstr "undermodul" - -#: git-submodule.sh:840 +#: git-submodule.sh:881 msgid "# Submodules changed but not updated:" msgstr "# Undermoduler ändrade men inte uppdaterade:" -#: git-submodule.sh:842 +#: git-submodule.sh:883 msgid "# Submodule changes to be committed:" msgstr "# Undermodulers ändringar att checka in:" -#: git-submodule.sh:974 +#: git-submodule.sh:1027 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Synkroniserar undermodul-url för \"$name\"" +#~ msgid "%s: has been deleted/renamed" +#~ msgstr "%s: har tagits bort/ändrat namn" + +#~ msgid "'%s': not a documentation directory." +#~ msgstr "\"%s\": inte en dokumentationskatalog." + +#~ msgid "-d option is no longer supported. Do not use." +#~ msgstr "Flaggan -d stöds inte lägre. Använd inte." + #~ msgid "cherry-pick" #~ msgstr "cherry-pick" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git-1.7.11.rc2.2.gb694fbb\n" +"Project-Id-Version: git-1.7.12-rc1-18-ge0453\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-08-06 23:47+0800\n" +"PO-Revision-Date: 2012-08-07 07:11+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" @@ -53,7 +53,7 @@ msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu (header) không được thừa nhận: %s%s (%d)" #: bundle.c:89 -#: builtin/commit.c:696 +#: builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "không thể mở '%s'" @@ -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:726 +#: builtin/log.c:1316 +#: builtin/log.c:1535 #: 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:1212 #: 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" @@ -242,8 +246,8 @@ msgstr "" "%s" #: diff.c:1400 -msgid " 0 files changed\n" -msgstr " 0 tập tin nào bị thay đổi\n" +msgid " 0 files changed" +msgstr " 0 có tập tin nào bị sửa đổi" #: diff.c:1404 #, c-format @@ -266,7 +270,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] ", %d bị xóa(-)" msgstr[1] ", %d bị xóa(-)" -#: diff.c:3478 +#: diff.c:3461 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -302,16 +306,16 @@ msgstr "'%s': %s" msgid "'%s': short read %s" msgstr "'%s': đọc ngắn %s" -#: help.c:207 +#: help.c:212 #, 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:219 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:275 #, 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:332 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:354 #, 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:359 #, 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:366 #, 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:370 msgid "" "\n" "Did you mean this?" @@ -357,42 +361,297 @@ msgstr[1] "" "\n" "Có phải ý bạn là một trong số những cái này không?" -#: parse-options.c:493 +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "(commit sai)\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache gặp lỗi đối với đường dẫn '%s'" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "gặp lỗi khi xây dựng cây" + +#: merge-recursive.c:497 +msgid "diff setup failed" +msgstr "cài đặt diff gặp lỗi" + +#: merge-recursive.c:627 +msgid "merge-recursive: disk full?" +msgstr "merge-recursive: đĩa bị đầy?" + +#: merge-recursive.c:690 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "gặp lỗi khi tạo đường dẫn '%s'%s" + +#: merge-recursive.c:701 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" + +#. something else exists +#. .. but not some other error (who really cares what?) +#: merge-recursive.c:715 +#: merge-recursive.c:736 +msgid ": perhaps a D/F conflict?" +msgstr ": có lẽ là một xung đột D/F?" + +#: merge-recursive.c:726 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "từ chối đóng tập tin không được theo vết tại '%s'" + +#: merge-recursive.c:766 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "không thể đọc đối tượng %s '%s'" + +#: merge-recursive.c:768 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "đối tượng blob được mong đợi cho %s '%s'" + +#: merge-recursive.c:791 +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "gặp lỗi khi mở '%s'" + +#: merge-recursive.c:799 +#, c-format +msgid "failed to symlink '%s'" +msgstr "gặp lỗi khi tạo liên kết tượng trưng symlink '%s'" + +#: merge-recursive.c:802 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "không hiểu phải làm gì với %06o %s '%s'" + +#: merge-recursive.c:939 +msgid "Failed to execute internal merge" +msgstr "Gặp lỗi khi thực hiện trộn nội bộ" + +#: merge-recursive.c:943 +#, c-format +msgid "Unable to add %s to database" +msgstr "Không thể thêm %s vào cơ sở dữ liệu" + +#: merge-recursive.c:959 +msgid "unsupported object type in the tree" +msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)" + +#: merge-recursive.c:1038 +#: merge-recursive.c:1052 +#, c-format +msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree." +msgstr "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s còn lại trong cây (tree)." + +#: merge-recursive.c:1044 +#: merge-recursive.c:1057 +#, c-format +msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s." +msgstr "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s còn lại trong cây (tree) tại %s." + +#: merge-recursive.c:1098 +msgid "rename" +msgstr "đổi tên" + +#: merge-recursive.c:1098 +msgid "renamed" +msgstr "đã đổi tên" + +#: merge-recursive.c:1154 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" + +#: merge-recursive.c:1176 +#, c-format +msgid "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s\"%s" +msgstr "XUNG ĐỘT (đổi tên/đổi tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi tên \"%s\"->\"%s\" trong \"%s\"%s" + +#: merge-recursive.c:1181 +msgid " (left unresolved)" +msgstr " (cần giải quyết)" + +#: merge-recursive.c:1235 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "XUNG ĐỘT (đổi tên/đổi tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" + +#: merge-recursive.c:1265 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "Đang đổi tên %s thành %s thay vì %s thành %s" + +#: merge-recursive.c:1464 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "XUNG ĐỘT (đổi tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s" + +#: merge-recursive.c:1474 +#, c-format +msgid "Adding merged %s" +msgstr "Thêm hòa trộn %s" + +#: merge-recursive.c:1479 +#: merge-recursive.c:1677 +#, c-format +msgid "Adding as %s instead" +msgstr "Thay vào đó thêm vào %s" + +#: merge-recursive.c:1530 +#, c-format +msgid "cannot read object %s" +msgstr "không thể đọc đối tượng %s" + +#: merge-recursive.c:1533 +#, c-format +msgid "object %s is not a blob" +msgstr "đối tượng %s không phải là một blob" + +#: merge-recursive.c:1581 +msgid "modify" +msgstr "sửa đổi" + +#: merge-recursive.c:1581 +msgid "modified" +msgstr "đã sửa" + +#: merge-recursive.c:1591 +msgid "content" +msgstr "nội dung" + +#: merge-recursive.c:1598 +msgid "add/add" +msgstr "thêm/thêm" + +#: merge-recursive.c:1632 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "Đã bỏ qua %s (đã sẵn có lần hòa trộn này)" + +#: merge-recursive.c:1646 +#, c-format +msgid "Auto-merging %s" +msgstr "Tự-động-hòa-trộn %s" + +#: merge-recursive.c:1650 +#: git-submodule.sh:844 +msgid "submodule" +msgstr "mô-đun con" + +#: merge-recursive.c:1651 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" + +#: merge-recursive.c:1741 +#, c-format +msgid "Removing %s" +msgstr "Đang xóa %s" + +#: merge-recursive.c:1766 +msgid "file/directory" +msgstr "tập-tin/thư-mục" + +#: merge-recursive.c:1772 +msgid "directory/file" +msgstr "thư-mục/tập tin" + +#: merge-recursive.c:1777 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là %s" + +#: merge-recursive.c:1787 +#, c-format +msgid "Adding %s" +msgstr "Đang thêm \"%s\"" + +#: merge-recursive.c:1804 +msgid "Fatal merge failure, shouldn't happen." +msgstr "Việc hòa trộn hỏng nghiêm trọng, không nên để xảy ra." + +#: merge-recursive.c:1823 +msgid "Already up-to-date!" +msgstr "Đã cập nhật rồi!" + +#: merge-recursive.c:1832 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "hòa trộn cây (tree) %s và %s gặp lỗi" + +#: merge-recursive.c:1862 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "Đường dẫn chưa được xử lý??? %s" + +#: merge-recursive.c:1907 +msgid "Merging:" +msgstr "Đang trộn:" + +#: merge-recursive.c:1920 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "tìm thấy %u tổ tiên chung:" +msgstr[1] "tìm thấy %u tổ tiên chung:" + +#: merge-recursive.c:1957 +msgid "merge returned no commit" +msgstr "hòa trộn không trả về lần chuyển giao (commit) nào" + +#: merge-recursive.c:2014 +#, c-format +msgid "Could not parse object '%s'" +msgstr "Không thể phân tích đối tượng '%s'" + +#: merge-recursive.c:2026 +#: builtin/merge.c:697 +msgid "Unable to write index." +msgstr "Không thể ghi bảng mục lục" + +#: parse-options.c:494 msgid "..." msgstr "..." -#: parse-options.c:511 +#: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "cách sử dụng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:516 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:518 +#: parse-options.c:519 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1629 +#: remote.c:1632 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Nhánh của bạn là đầu của '%s' bởi %d lần chuyển giao (commit).\n" msgstr[1] "Nhánh của bạn là đầu của '%s' bởi %d lần chuyển giao (commit).\n" -#: remote.c:1635 +#: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể được fast-forward.\n" msgstr[1] "Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể được fast-forward.\n" -#: remote.c:1643 +#: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -628,7 +887,7 @@ msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" #: sequencer.c:805 -#: builtin/apply.c:3697 +#: builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" @@ -660,21 +919,21 @@ msgstr "Không thể revert một lần chuyển giao (commit) khởi tạo" msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" -#: sha1_name.c:864 +#: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "HEAD không chỉ đến một nhánh nào cả" -#: sha1_name.c:867 +#: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "Không có nhánh nào như thế: '%s'" -#: sha1_name.c:869 +#: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Không có dòng ngược (upstream) được cấu hình cho nhánh '%s'" -#: sha1_name.c:872 +#: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Nhánh dòng ngược (upstream) '%s' không được lưu lại như là một nhánh 'remote-tracking'" @@ -688,236 +947,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:140 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:167 +#: wt-status.c:194 #, 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:169 +#: wt-status.c:196 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:173 +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:175 +#: wt-status.c:179 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:177 +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:188 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:170 +#: wt-status.c:206 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:210 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:212 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:213 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:215 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:224 #, c-format msgid "%s files:" msgstr "%s tệp tin:" -#: wt-status.c:191 +#: wt-status.c:227 #, 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:244 msgid "bug" msgstr "lỗi" -#: wt-status.c:213 +#: wt-status.c:249 msgid "both deleted:" msgstr "bị xóa bởi cả hai:" -#: wt-status.c:214 +#: wt-status.c:250 msgid "added by us:" msgstr "được thêm vào bởi chúng tôi:" -#: wt-status.c:215 +#: wt-status.c:251 msgid "deleted by them:" msgstr "bị xóa đi bởi họ:" -#: wt-status.c:216 +#: wt-status.c:252 msgid "added by them:" msgstr "được thêm vào bởi họ:" -#: wt-status.c:217 +#: wt-status.c:253 msgid "deleted by us:" msgstr "bị xóa bởi chúng tôi:" -#: wt-status.c:218 +#: wt-status.c:254 msgid "both added:" msgstr "được thêm vào bởi cả hai:" -#: wt-status.c:219 +#: wt-status.c:255 msgid "both modified:" msgstr "bị sửa bởi cả hai:" -#: wt-status.c:249 +#: wt-status.c:285 msgid "new commits, " msgstr " lần chuyển giao (commit) mới, " -#: wt-status.c:251 +#: wt-status.c:287 msgid "modified content, " msgstr "nội dung được sửa đổi," -#: wt-status.c:253 +#: wt-status.c:289 msgid "untracked content, " msgstr "nội dung chưa được theo dõi" -#: wt-status.c:267 +#: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "tập tin mới: %s" -#: wt-status.c:270 +#: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "đã sao chép: %s -> %s" -#: wt-status.c:273 +#: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "bị xóa: %s" -#: wt-status.c:276 +#: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "bị sửa đổi: %s" -#: wt-status.c:279 +#: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "đã đổi tên: %s -> %s" -#: wt-status.c:282 +#: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "đổi-kiểu: %s" -#: wt-status.c:285 +#: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "không rõ: %s" -#: wt-status.c:288 +#: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "chưa hòa trộn: %s" -#: wt-status.c:291 +#: wt-status.c:327 #, 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:785 +msgid "You have unmerged paths." +msgstr "Bạn có những đường dẫn chưa được hòa trộn." + +#: wt-status.c:788 +#: wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (sửa các xung đột sau đó chạy \"git commit\")" + +#: wt-status.c:791 +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:794 +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:804 +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:807 +msgid "The current patch is empty." +msgstr "Miếng vá hiện tại bị trống rỗng." + +#: wt-status.c:811 +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:813 +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:815 +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:873 +#: wt-status.c:883 +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:876 +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:878 +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:880 +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:886 +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:888 +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:891 +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:893 +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:896 +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:898 +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:908 +msgid "You are currently cherry-picking." +msgstr "Bạn hiện nay đang thực hiện việc cherry-pick." + +#: wt-status.c:915 +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:924 +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:927 +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:978 msgid "On branch " msgstr "Trên nhánh" -#: wt-status.c:744 +#: wt-status.c:985 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:997 msgid "Initial commit" msgstr "Lần chuyển giao (commit) khởi đầu" -#: wt-status.c:769 +#: wt-status.c:1011 msgid "Untracked" msgstr "Không được theo vết" -#: wt-status.c:771 +#: wt-status.c:1013 msgid "Ignored" msgstr "Bị bỏ qua" -#: wt-status.c:773 +#: wt-status.c:1015 #, 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:1017 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:1023 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:785 +#: wt-status.c:1027 #, 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:1029 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:1031 #, 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:1033 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:1035 +#: wt-status.c:1038 +#: wt-status.c:1041 #, 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:1036 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:1039 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:1042 msgid " (working directory clean)" msgstr " (thư mục làm việc sạch sẽ)" -#: wt-status.c:908 +#: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "HEAD (chưa có nhánh nào)" -#: wt-status.c:914 +#: wt-status.c:1156 msgid "Initial commit on " msgstr "Lần chuyển giao (commit) khởi tạo trên" -#: wt-status.c:929 +#: wt-status.c:1171 msgid "behind " msgstr "đằng sau" -#: wt-status.c:932 -#: wt-status.c:935 +#: wt-status.c:1174 +#: wt-status.c:1177 msgid "ahead " msgstr "phía trước" -#: wt-status.c:937 +#: wt-status.c:1179 msgid ", behind " msgstr ", đằng sau" @@ -927,7 +1289,7 @@ msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" #: builtin/add.c:67 -#: builtin/commit.c:226 +#: builtin/commit.c:229 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" @@ -946,7 +1308,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" @@ -1021,161 +1383,161 @@ msgstr "Có lẽ bạn muốn nói là 'git add .' phải không?\n" #: builtin/add.c:420 #: builtin/clean.c:95 -#: builtin/commit.c:286 +#: builtin/commit.c:289 #: builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:476 -#: builtin/apply.c:4108 +#: builtin/add.c:480 +#: builtin/apply.c:4433 #: builtin/mv.c:229 #: builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [các-tùy-chọn] [<miếng-vá>...]" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "không nhận ra tùy chọn về khoảng trắng '%s'" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng '%s'" -#: builtin/apply.c:815 +#: builtin/apply.c:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) %s" -#: builtin/apply.c:824 +#: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "thi hành biểu thức chính quy trả về %d cho kết xuất: %s" -#: builtin/apply.c:905 +#: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d" -#: builtin/apply.c:937 +#: builtin/apply.c:946 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: git-diff sai - mong đợi /dev/null, đã nhận %s trên dòng %d" -#: builtin/apply.c:941 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: git-diff sai - tên tập tin mới mâu thuấn trên dòng %d" -#: builtin/apply.c:942 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: git-diff sai - tên tập tin cũ mâu thuấn trên dòng %d" -#: builtin/apply.c:949 +#: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff sai - mong đợi /dev/null trên dòng %d" -#: builtin/apply.c:1394 +#: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không được mong đợi: %.*s" -#: builtin/apply.c:1451 +#: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" -#: builtin/apply.c:1468 +#: builtin/apply.c:1477 #, c-format msgid "git diff header lacks filename information when removing %d leading pathname component (line %d)" msgid_plural "git diff header lacks filename information when removing %d leading pathname components (line %d)" msgstr[0] "phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong thành phần dẫn đầu tên của đường dẫn (dòng %d)" msgstr[1] "phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong thành phần dẫn đầu tên của đường dẫn (dòng %d)" -#: builtin/apply.c:1628 +#: builtin/apply.c:1637 msgid "new file depends on old contents" msgstr "tập tin mới phụ thuộc vào nội dung cũ" -#: builtin/apply.c:1630 +#: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: builtin/apply.c:1656 +#: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: builtin/apply.c:1692 +#: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" -#: builtin/apply.c:1694 +#: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "tập tin đã xóa %s vẫn còn nội dung" -#: builtin/apply.c:1697 +#: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" -#: builtin/apply.c:1843 +#: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" -#: builtin/apply.c:1958 +#: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ với 'garbage' tại dòng %d" -#: builtin/apply.c:2048 +#: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết tượng trưng %s" -#: builtin/apply.c:2052 +#: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "không thể mở để đọc hay ghi %s" -#: builtin/apply.c:2123 +#: builtin/apply.c:2132 msgid "oops" msgstr "ôi?" -#: builtin/apply.c:2645 +#: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: '%c'" -#: builtin/apply.c:2763 +#: builtin/apply.c:2772 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." msgstr[1] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." -#: builtin/apply.c:2775 +#: builtin/apply.c:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Nội dung được giảm xuống (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: builtin/apply.c:2781 +#: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" @@ -1184,320 +1546,334 @@ msgstr "" "Trong khi đang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2800 +#: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho '%s'" -#: builtin/apply.c:2903 +#: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "miếng vá định dạng nhị phân không được áp dụng cho '%s'" -#: builtin/apply.c:2909 +#: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "vá nhị phân cho '%s' tạo ra kết quả không chính xác (đang chờ %s, đã nhận %s)" -#: builtin/apply.c:2930 +#: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "vá gặp lỗi: %s:%ld" -#: builtin/apply.c:3045 +#: builtin/apply.c:3061 #, c-format -msgid "patch %s has been renamed/deleted" -msgstr "miếng vá %s đã bị xóa/đổi tên" +msgid "cannot checkout %s" +msgstr "không thể \"checkout\" %s" -#: builtin/apply.c:3052 -#: builtin/apply.c:3069 +#: builtin/apply.c:3106 +#: builtin/apply.c:3115 +#: builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "loại bỏ miếng vá để lại nội dung tập tin" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3139 +#: builtin/apply.c:3361 #, c-format -msgid "%s: already exists in working directory" -msgstr "%s: đã sẵn có trong thư mục đang làm việc" +msgid "path %s has been renamed/deleted" +msgstr "đường dẫn %s đã bị xóa/đổi tên" -#: builtin/apply.c:3143 +#: builtin/apply.c:3220 +#: builtin/apply.c:3375 #, c-format -msgid "%s: has been deleted/renamed" -msgstr "%s: đã được xóa/thay-tên" +msgid "%s: does not exist in index" +msgstr "%s: không tồn tại trong bảng mục lục" -#: builtin/apply.c:3148 -#: builtin/apply.c:3179 +#: builtin/apply.c:3224 +#: builtin/apply.c:3367 +#: builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3159 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: không tồn tại trong bảng mục lục" - -#: builtin/apply.c:3173 +#: builtin/apply.c:3229 +#: builtin/apply.c:3383 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3190 +#: builtin/apply.c:3331 +msgid "removal patch leaves file contents" +msgstr "loại bỏ miếng vá để lại nội dung tập tin" + +#: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3192 +#: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, mong chờ %o" -#: builtin/apply.c:3247 +#: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3267 +#: builtin/apply.c:3506 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: đã sẵn có trong thư mục đang làm việc" + +#: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" -#: builtin/apply.c:3272 +#: builtin/apply.c:3531 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" -#: builtin/apply.c:3280 +#: builtin/apply.c:3539 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3293 +#: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s..." -#: builtin/apply.c:3348 -#: builtin/checkout.c:212 +#: builtin/apply.c:3607 +#: builtin/checkout.c:213 #: builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gặp lỗi đối với đường dẫn '%s'" -#: builtin/apply.c:3491 +#: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:3518 +#: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "miếng vá sai hỏng cho dự án con (subproject) %s" -#: builtin/apply.c:3522 +#: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy trạng thái về tập tin %s mới hơn đã được tạo" -#: builtin/apply.c:3527 +#: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "không thể tạo 'backing store' cho tập tin được tạo mới hơn %s" -#: builtin/apply.c:3530 +#: builtin/apply.c:3790 +#: builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ tạm cho %s" -#: builtin/apply.c:3563 +#: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin '%s'" -#: builtin/apply.c:3612 +#: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi vào tập tin '%s' chế độ (mode) %o" -#: builtin/apply.c:3668 +#: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "Đã áp dụng miếng và %s một cách sạch sẽ." -#: builtin/apply.c:3676 +#: builtin/apply.c:3967 msgid "internal error" msgstr "lỗi nội bộ" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:3970 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối..." msgstr[1] "Đang áp dụng miếng vá %%s với %d lần từ chối..." -#: builtin/apply.c:3689 +#: builtin/apply.c:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "đang cắt cụt tên tập tin .rej thành %.*s.rej" -#: builtin/apply.c:3710 +#: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:3713 +#: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "hunk #%d bị từ chối." -#: builtin/apply.c:3844 +#: builtin/apply.c:4154 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:3855 +#: builtin/apply.c:4165 msgid "unable to read index file" msgstr "không thể đọc tập tin lưu bảng mục lục" -#: builtin/apply.c:3970 -#: builtin/apply.c:3973 +#: builtin/apply.c:4284 +#: builtin/apply.c:4287 msgid "path" msgstr "đường-dẫn" -#: builtin/apply.c:3971 +#: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:3974 +#: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: builtin/apply.c:3976 +#: builtin/apply.c:4290 msgid "num" msgstr "số" -#: builtin/apply.c:3977 +#: builtin/apply.c:4291 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bỏ <số> phần dẫn đầu (slashe) từ đường dẫn diff cổ điển" -#: builtin/apply.c:3980 +#: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "lờ đi phần phụ thêm tạo ra bởi miếng vá" -#: builtin/apply.c:3982 +#: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: builtin/apply.c:3986 +#: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: builtin/apply.c:3988 +#: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" -#: builtin/apply.c:3990 +#: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" -#: builtin/apply.c:3992 +#: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" -#: builtin/apply.c:3994 +#: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" -#: builtin/apply.c:3996 +#: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "đồng thời áp dụng miếng vá (sử dụng với tùy chọn --stat/--summary/--check)" -#: builtin/apply.c:3998 +#: builtin/apply.c:4312 +msgid "attempt three-way merge if a patch does not apply" +msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" + +#: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" -#: builtin/apply.c:4000 +#: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" -#: builtin/apply.c:4003 +#: builtin/apply.c:4319 msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" -#: builtin/apply.c:4004 +#: builtin/apply.c:4320 msgid "action" msgstr "hành động" -#: builtin/apply.c:4005 +#: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" -#: builtin/apply.c:4008 -#: builtin/apply.c:4011 +#: builtin/apply.c:4324 +#: builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "lờ đi sự thay đổi do khoảng trắng khi quét nội dung" -#: builtin/apply.c:4014 +#: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4016 +#: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "đừng hy vọng có ít nhất một dòng nội dung" -#: builtin/apply.c:4018 +#: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" -#: builtin/apply.c:4020 +#: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4021 +#: builtin/apply.c:4337 msgid "be verbose" msgstr "chi tiết" -#: builtin/apply.c:4023 +#: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "dung sai không chính xác đã tìm thấy thiếu dòng mới tại cuối tập tin" -#: builtin/apply.c:4026 +#: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: builtin/apply.c:4028 +#: builtin/apply.c:4344 msgid "root" msgstr "root" -#: builtin/apply.c:4029 +#: builtin/apply.c:4345 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> vào tất cả các tên tập tin" -#: builtin/apply.c:4050 +#: builtin/apply.c:4367 +msgid "--3way outside a repository" +msgstr "--3way ở ngoài một kho chứa" + +#: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4053 +#: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4069 +#: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá '%s'" -#: builtin/apply.c:4083 +#: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" msgstr[1] "đã chấm dứt %d lỗi khoảng trắng" -#: builtin/apply.c:4089 -#: builtin/apply.c:4099 +#: builtin/apply.c:4414 +#: builtin/apply.c:4424 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1703,7 +2079,7 @@ msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lỗi khi giải quyết HEAD như là một tham chiếu (ref) hợp lệ." #: builtin/branch.c:788 -#: builtin/clone.c:558 +#: builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD không tìm thấy ở dưới refs/heads!" @@ -1728,107 +2104,107 @@ msgstr "Cần một kho chứa để mà tạo một bundle." msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để mà bung một bundle." -#: builtin/checkout.c:113 -#: builtin/checkout.c:146 +#: builtin/checkout.c:114 +#: builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "đường dẫn '%s' không có các phiên bản của chúng ta" -#: builtin/checkout.c:115 -#: builtin/checkout.c:148 +#: builtin/checkout.c:116 +#: builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "đường dẫn '%s' không có các phiên bản của chúng" -#: builtin/checkout.c:131 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "đường dẫn '%s' không có tất cả các phiên bản cần thiết" -#: builtin/checkout.c:175 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "đường dẫn '%s' không có các phiên bản cần thiết" -#: builtin/checkout.c:192 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "đường dẫn '%s': không thể hòa trộn" -#: builtin/checkout.c:209 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Không thể thêm kết quả hòa trộn cho '%s'" -#: builtin/checkout.c:234 -#: builtin/checkout.c:392 +#: builtin/checkout.c:235 +#: builtin/checkout.c:393 msgid "corrupt index file" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/checkout.c:264 -#: builtin/checkout.c:271 +#: builtin/checkout.c:265 +#: builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "đường dẫn '%s' không được hòa trộn" -#: builtin/checkout.c:302 -#: builtin/checkout.c:498 -#: builtin/clone.c:583 +#: builtin/checkout.c:303 +#: builtin/checkout.c:499 +#: builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" -#: builtin/checkout.c:319 +#: builtin/checkout.c:320 #: builtin/diff.c:302 #: builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done gặp lỗi" -#: builtin/checkout.c:414 +#: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã!" -#: builtin/checkout.c:533 +#: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Không thể thực hiện reflog cho '%s'\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:573 +#: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh '%s'\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên '%s'\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Đã chuyển tới và reset nhánh '%s'\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới '%s'\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh '%s'\n" -#: builtin/checkout.c:640 +#: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr " ... và nhiều hơn %d.\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:647 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1851,7 +2227,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:665 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1866,71 +2242,72 @@ msgstr "" " git branch tên_nhánh_mới %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:695 msgid "internal error in revision walk" msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét lại" -#: builtin/checkout.c:698 +#: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "Vị trí kế trước của HEAD là" -#: builtin/checkout.c:724 +#: builtin/checkout.c:725 +#: builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu sai: %s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là cây:%s" -#: builtin/checkout.c:974 +#: builtin/checkout.c:977 msgid "-B cannot be used with -b" msgstr "-B không thể được sử dụng với -b" -#: builtin/checkout.c:983 +#: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "--patch xung khắc với tất cả các tùy chọn khác" -#: builtin/checkout.c:986 +#: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach không thể được sử dụng với -b/-B/--orphan" -#: builtin/checkout.c:988 +#: builtin/checkout.c:991 msgid "--detach cannot be used with -t" msgstr "--detach không thể được sử dụng với tùy chọn -t" -#: builtin/checkout.c:994 +#: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1001 +#: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "Tùy chọn --orphan và -b|-B loại từ lẫn nhau" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" msgstr "--orphan không thể được sử dụng với tùy chọn -t" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f và -m xung khắc nhau" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -1939,27 +2316,27 @@ msgstr "" "git checkout: việc cập nhật các đường dẫn là xung khắc với việc chuyển đổi các nhánh..\n" "Bạn đã có ý định checkout '%s' cái mà không thể được phân giải như là lần chuyển giao (commit)?" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout: việc cập nhật các đường dẫn là xung khắc với việc chuyển đổi các nhánh." -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" -msgstr "git checkout: --detach không nhận một đối số đường dẫn" +msgstr "git checkout: --detach không nhận một đối số là đường dẫn" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" -"checkout." +"checkout bảng mục lục (index)." -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "Không thể chuyển đến một non-commit." -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs là xung khắc nhau khi chuyển đổi các nhánh." @@ -2008,11 +2385,6 @@ msgstr "Không xóa %s\n" msgid "reference repository '%s' is not a local directory." msgstr "kho tham chiếu '%s' không phải là một thư mục nội bộ." -#: builtin/clone.c:302 -#, c-format -msgid "failed to open '%s'" -msgstr "gặp lỗi khi mở '%s'" - #: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" @@ -2054,79 +2426,79 @@ msgstr "sao chép tệp tin tới '%s' gặp lỗi" msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:549 +#: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể checkout.\n" -#: builtin/clone.c:639 +#: builtin/clone.c:642 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:643 +#: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:654 +#: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:668 +#: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa '%s' chưa tồn tại" -#: builtin/clone.c:673 +#: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:683 +#: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích '%s' đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:693 +#: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc '%s' đã sẵn tồn tại rồi." -#: builtin/clone.c:706 -#: builtin/clone.c:720 +#: builtin/clone.c:709 +#: builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của '%s'" -#: builtin/clone.c:709 +#: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "không thể tạo cây thư mục làm việc dir '%s'." -#: builtin/clone.c:728 +#: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare '%s'...\n" -#: builtin/clone.c:730 +#: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành '%s'...\n" -#: builtin/clone.c:786 +#: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "Không biết làm cách nào để nhân bản (clone) %s" -#: builtin/clone.c:835 +#: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong dòng ngược (upstream) %s" -#: builtin/clone.c:842 +#: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -2185,99 +2557,99 @@ msgstr "" "\n" "Nếu không, hãy thử sử dụng 'git reset'\n" -#: builtin/commit.c:253 +#: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:295 +#: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:301 +#: builtin/commit.c:304 msgid "interactive add failed" msgstr "việc thêm tương tác gặp lỗi" -#: builtin/commit.c:334 -#: builtin/commit.c:355 -#: builtin/commit.c:405 +#: builtin/commit.c:337 +#: builtin/commit.c:358 +#: builtin/commit.c:408 msgid "unable to write new_index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:386 +#: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "không thể thực hiện việc chuyển giao (commit) cục bộ trong khi đang được hòa trộn." -#: builtin/commit.c:388 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "không thể thực hiện việc chuyển giao (commit) bộ phận trong khi đang cherry-pick." -#: builtin/commit.c:398 +#: builtin/commit.c:401 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:418 +#: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:493 -#: builtin/commit.c:499 +#: builtin/commit.c:496 +#: builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "lần chuyển giao (commit) không hợp lệ: %s" -#: builtin/commit.c:522 +#: builtin/commit.c:525 msgid "malformed --author parameter" msgstr "đối số --author bị dị hình" -#: builtin/commit.c:582 +#: builtin/commit.c:585 #, c-format msgid "Malformed ident string: '%s'" msgstr "Chuỗi thụt lề đầu dòng dị hình: '%s'" -#: builtin/commit.c:620 -#: builtin/commit.c:653 -#: builtin/commit.c:967 +#: builtin/commit.c:623 +#: builtin/commit.c:656 +#: builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:632 +#: builtin/commit.c:635 #: builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:634 +#: builtin/commit.c:637 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:638 +#: builtin/commit.c:641 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký '%s'" -#: builtin/commit.c:644 +#: builtin/commit.c:647 msgid "commit has empty message" msgstr "lần chuyển giao (commit) có ghi chú trống rỗng" -#: builtin/commit.c:660 +#: builtin/commit.c:663 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:664 +#: builtin/commit.c:667 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:668 +#: builtin/commit.c:671 #, c-format msgid "could not read '%s'" msgstr "Không thể đọc '%s'." -#: builtin/commit.c:720 +#: builtin/commit.c:723 msgid "could not write commit template" msgstr "không thể ghi mẫu commit" -#: builtin/commit.c:731 +#: builtin/commit.c:734 #, c-format msgid "" "\n" @@ -2292,7 +2664,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:736 +#: builtin/commit.c:739 #, c-format msgid "" "\n" @@ -2307,7 +2679,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:748 +#: builtin/commit.c:751 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -2315,7 +2687,7 @@ msgstr "" "Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng được\n" "bắt đầu bằng '#' sẽ được bỏ qua, phần chú thích này nếu rỗng sẽ làm hủy bỏ lần chuyển giao (commit).\n" -#: builtin/commit.c:753 +#: builtin/commit.c:756 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -2325,164 +2697,164 @@ msgstr "" "bắt đầu bằng '#' sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn.\n" "Phần chú thích này nếu rỗng sẽ làm hủy bỏ lần chuyển giao (commit).\n" -#: builtin/commit.c:766 +#: builtin/commit.c:769 #, c-format msgid "%sAuthor: %s" msgstr "%sTác giả: %s" -#: builtin/commit.c:773 +#: builtin/commit.c:776 #, c-format msgid "%sCommitter: %s" msgstr "%sNgười chuyển giao (commit): %s" -#: builtin/commit.c:793 +#: builtin/commit.c:796 msgid "Cannot read index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:830 +#: builtin/commit.c:833 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:845 +#: builtin/commit.c:848 #: builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy áp dụng thông điệp sử dụng hoặc là tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:942 +#: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" msgstr "Không tìm thấy tác giả đã sẵn có với '%s'" -#: builtin/commit.c:957 -#: builtin/commit.c:1157 +#: builtin/commit.c:960 +#: builtin/commit.c:1160 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin không bị theo vết không hợp lệ '%s'" -#: builtin/commit.c:997 +#: builtin/commit.c:1000 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1008 +#: builtin/commit.c:1011 msgid "You have nothing to amend." msgstr "Không có gì để amend (tu bổ) cả." -#: builtin/commit.c:1011 +#: builtin/commit.c:1014 msgid "You are in the middle of a merge -- cannot amend." msgstr "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện amend (tu bổ)." -#: builtin/commit.c:1013 +#: builtin/commit.c:1016 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện amend (tu bổ)." -#: builtin/commit.c:1016 +#: builtin/commit.c:1019 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Chỉ một tùy chọn trong số -c/-C/-F/--fixup được sử dụng" -#: builtin/commit.c:1028 +#: builtin/commit.c:1031 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup." -#: builtin/commit.c:1036 +#: builtin/commit.c:1039 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1053 +#: builtin/commit.c:1056 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được sử dụng." -#: builtin/commit.c:1055 +#: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." -#: builtin/commit.c:1057 +#: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." msgstr "Giỏi... đang tu bổ cái cuối với bảng mục lục phi nghĩa." -#: builtin/commit.c:1059 +#: builtin/commit.c:1062 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; đang giả định --only những-đường-dẫn..." -#: builtin/commit.c:1069 +#: builtin/commit.c:1072 #: builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1074 +#: builtin/commit.c:1077 msgid "Paths with -a does not make sense." msgstr "Các đường dẫn với tùy chọn -a không hợp lý." -#: builtin/commit.c:1257 +#: builtin/commit.c:1260 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao (commit) mới hơn đã được tạo" -#: builtin/commit.c:1259 +#: builtin/commit.c:1262 msgid "could not parse newly created commit" msgstr "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" -#: builtin/commit.c:1300 +#: builtin/commit.c:1303 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1302 +#: builtin/commit.c:1305 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1446 +#: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1484 +#: builtin/commit.c:1487 #: builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở %s' để đọc" -#: builtin/commit.c:1491 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1498 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1517 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc thông điệp (message) commit (lần chuyển giao): %s" -#: builtin/commit.c:1531 +#: builtin/commit.c:1534 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Đang bỏ qua việc chuyển giao (commit); bạn đã không biên soạn thông điệp (message).\n" -#: builtin/commit.c:1536 +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Đang bỏ qua lần chuyển giao (commit) bởi vì thông điệp của nó trống rỗng.\n" -#: builtin/commit.c:1551 +#: builtin/commit.c:1554 #: builtin/merge.c:936 #: builtin/merge.c:961 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "không thể khóa HEAD ref (tham chiếu)" -#: builtin/commit.c:1576 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "không thể cập nhật HEAD ref (tham chiếu)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2590,22 +2962,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 +3231,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:65 #, 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:93 msgid "Failed to start emacsclient." msgstr "Lỗi khởi chạy emacsclient." -#: builtin/help.c:100 +#: builtin/help.c:106 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:114 #, 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:132 +#: builtin/help.c:160 +#: builtin/help.c:169 +#: builtin/help.c:177 #, 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:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -2894,7 +3266,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:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -2903,271 +3275,281 @@ 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:299 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:367 #, 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:384 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:392 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 -#, 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:447 +#: builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "cách sử dụng: %s%s" -#: builtin/help.c:453 +#: builtin/help.c:470 #, 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:530 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:532 #, 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:558 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:649 +#: builtin/index-pack.c:655 +#: builtin/index-pack.c:678 +#: builtin/index-pack.c:712 +#: builtin/index-pack.c:721 #, 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:652 +#: 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:718 +#, 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:732 #, 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:747 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:749 msgid "Error in object" msgstr "Lỗi trong đối tượng" -#: builtin/index-pack.c:614 +#: builtin/index-pack.c:751 #, 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:821 +#: builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:872 +#: builtin/index-pack.c:1012 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:1017 msgid "cannot fstat packfile" msgstr "không thể fstat packfile" -#: builtin/index-pack.c:880 +#: builtin/index-pack.c:1020 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:1031 +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:1054 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:954 +#: builtin/index-pack.c:1105 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:973 +#: builtin/index-pack.c:1124 #, 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:1149 #, 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:1228 #, 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:1252 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:1265 #, 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:1273 #, 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:1286 msgid "cannot store pack file" msgstr "không thể lưu tập tin pack" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1297 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:1398 #, 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:1400 #, 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:1447 #, 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:1454 #, 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:1481 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:1525 +#: builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1558 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:1562 +#: builtin/index-pack.c:1572 #, 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:1581 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -3241,23 +3623,23 @@ msgstr "không sao chép các mẫu của phiên bản sai định dạng %d t msgid "insane git directory %s" msgstr "thư mục git điên rồ %s" -#: builtin/init-db.c:322 -#: builtin/init-db.c:325 +#: builtin/init-db.c:323 +#: builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s đã tồn tại rồi" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "không thể handle tệp tin kiểu %d" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "không di chuyển được %s vào %s" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Không thể tạo liên kết git '%s'" @@ -3267,148 +3649,148 @@ msgstr "Không thể tạo liên kết git '%s'" #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s kho Git trong %s%s\n" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "Khởi tạo lại đã sẵn có rồi" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "Khởi tạo trống rỗng" -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr " đã chia sẻ" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "không nói chuyện được với lệnh cwd" -#: builtin/init-db.c:521 -#: builtin/init-db.c:528 +#: builtin/init-db.c:522 +#: builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)" msgstr "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-dir=<thư-mục>)" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "Không thể truy cập thư mục làm việc hiện hành" -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format 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:403 +#: builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "Không thể đọc đối tượng %s" -#: builtin/log.c:513 +#: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "Không nhận ra kiểu: %d" -#: builtin/log.c:602 +#: builtin/log.c:608 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:676 +#: builtin/log.c:682 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:693 #, 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:707 msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:709 +#: builtin/log.c:715 msgid "Not a range." msgstr "Không phải là một vùng." -#: builtin/log.c:786 +#: builtin/log.c:792 msgid "Cover letter needs email format" msgstr "'Cover letter' cần cho định dạng thư" -#: builtin/log.c:859 +#: builtin/log.c:865 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:932 +#: builtin/log.c:938 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: builtin/log.c:1153 +#: builtin/log.c:1160 #, 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:1205 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1200 +#: builtin/log.c:1207 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix và -k xung khắc nhau." -#: builtin/log.c:1208 +#: builtin/log.c:1215 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1210 +#: builtin/log.c:1217 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1212 +#: builtin/log.c:1219 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1235 +#: builtin/log.c:1242 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:1244 #, 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:1397 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:1501 #, 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:1517 +#: builtin/log.c:1519 +#: builtin/log.c:1531 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao (commit) %s" @@ -3490,10 +3872,6 @@ msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ tạm" -#: builtin/merge.c:697 -msgid "Unable to write index." -msgstr "Không thể ghi bảng mục lục" - #: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn" @@ -3910,22 +4288,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" @@ -4538,30 +4922,30 @@ msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn." -#: builtin/reset.c:297 +#: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "không thể phân tích đối tượng '%s'." -#: builtin/reset.c:302 +#: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khắc với --{hard,mixed,soft}" -#: builtin/reset.c:311 +#: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh 'git reset -- <đường_dẫn>'." -#: builtin/reset.c:313 +#: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn." -#: builtin/reset.c:325 +#: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset không được phép trên kho bare (trên máy chủ)" -#: builtin/reset.c:341 +#: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét lại '%s'." @@ -4813,7 +5197,7 @@ msgstr "Liệt kê, tạo hay là xóa các nhánh" #: common-cmds.h:11 msgid "Checkout a branch or paths to the working tree" -msgstr "Checkout một nhánh hay các đường dẫn tời cây làm việc" +msgstr "Checkout một nhánh hay các đường dẫn tới cây làm việc" #: common-cmds.h:12 msgid "Clone a repository into a new directory" @@ -4898,13 +5282,13 @@ msgstr "" #: git-am.sh:105 #, sh-format msgid "" -"When you have resolved this problem run \"$cmdline --resolved\".\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." +"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +"To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" "Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --resolved\".\n" "Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"$cmdline --skip\".\n" -"Để phục hồi lại thành nhánh nguyên bản và dừng việc vá lại thì chạy \"$cmdline --abort\"." +"Để 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." @@ -4914,6 +5298,10 @@ msgstr "Đang trở lại để hòa trộn kiểu 'three-way'." msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên '3-way merge'." +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở..." + #: git-am.sh:154 msgid "" "Did you hand edit your patch?\n" @@ -4926,42 +5314,50 @@ msgstr "" msgid "Falling back to patching base and 3-way merge..." msgstr "Đang trở lại để vá cơ sở và '3-way merge'..." -#: git-am.sh:275 +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "Gặp lỗi khi trộn vào các thay đổi." + +#: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" -#: git-am.sh:362 +#: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Định dạng miếng vá $patch_format không được hỗ trợ." -#: git-am.sh:364 +#: git-am.sh:363 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: git-am.sh:418 -msgid "-d option is no longer supported. Do not use." -msgstr "Tùy chọn -d không còn được hỗ trợ nữa. Xin đừng sử dụng." +#: git-am.sh:389 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" +"nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: git-am.sh:481 +#: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "thư mục rebase trước $dotest vẫn chưa sẵn sàng nhưng mbox được đưa ra." -#: git-am.sh:486 +#: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "Xin hãy rõ ràng. --skip hay --abort?" -#: git-am.sh:513 +#: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không đang được tiến hành, chúng ta không phục hồi lại." -#: git-am.sh:579 +#: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Bảng mục lục sai: không thể áp dụng các miếng vá (sai: $files)" -#: git-am.sh:671 +#: git-am.sh:679 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -4970,33 +5366,33 @@ 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 +#: git-am.sh:706 msgid "Patch does not have a valid e-mail address." msgstr "Miếng vá không có địa chỉ e-mail hợp lệ." -#: git-am.sh:755 +#: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối" -#: git-am.sh:759 +#: git-am.sh:757 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao (commit) là:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:766 +#: git-am.sh:764 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Áp dụng? đồng ý [y]/không [n]/chỉnh sửa [e]/hiển thị miếng [v]á/đồng ý tất cả [a]" -#: git-am.sh:802 +#: git-am.sh:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Đang áp dụng (miếng vá): $FIRSTLINE" -#: git-am.sh:823 +#: git-am.sh:821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5006,7 +5402,7 @@ msgstr "" "Nếu ở đây không có gì còn lại stage, tình cờ là có một số thứ khác\n" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng vá này." -#: git-am.sh:831 +#: git-am.sh:829 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -5014,16 +5410,16 @@ msgstr "" "Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình\n" "bạn đã quên sử dụng lệnh 'git add' à?" -#: git-am.sh:847 +#: git-am.sh:845 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: git-am.sh:857 +#: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Vá gặp lỗi tại $msgnum $FIRSTLINE" -#: git-am.sh:873 +#: git-am.sh:876 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" @@ -5135,8 +5531,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" @@ -5223,6 +5619,127 @@ msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống r msgid "Cannot rebase onto multiple branches" msgstr "Không thể thực hiện lệnh rebase (cơ cấu lại) trên nhiều nhánh" +#: git-rebase.sh:52 +msgid "" +"When you have resolved this problem, run \"git rebase --continue\".\n" +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +"To check out the original branch and stop rebasing, run \"git rebase --abort\"." +msgstr "" +"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"git rebase --continue\".\n" +"Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"git rebase --skip\".\n" +"Để 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 \"git rebase --abort\"." + +#: git-rebase.sh:159 +msgid "The pre-rebase hook refused to rebase." +msgstr "hook (chương trình móc vào git) pre-rebase từ chối rebase." + +#: git-rebase.sh:164 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh rebase." + +#: git-rebase.sh:295 +msgid "The --exec option must be used with the --interactive option" +msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive" + +#: git-rebase.sh:300 +msgid "No rebase in progress?" +msgstr "Không phải đang rebase?" + +#: git-rebase.sh:313 +msgid "Cannot read HEAD" +msgstr "Không thể đọc HEAD" + +#: git-rebase.sh:316 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n" +"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add" + +#: git-rebase.sh:334 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Không thể quay trở lại $head_name" + +#: git-rebase.sh:350 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" +"Hình như là ở đây sẵn có một thư mục $state_dir_base directory, và\n" +"Tôi tự hỏi có phải bạn đang ở giữa một lệnh rebase khác. Nếu đúng là\n" +"như vậy, xin hãy thử\n" +"\t$cmd_live_rebase\n" +"Nếu không phải thế, hãy thử\n" +"\t$cmd_clear_stale_rebase\n" +"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n" +"có một số thứ quý giá ở đây.\n" +"\n" +"TÔI: là lệnh bạn vừa gọi!" + +#: git-rebase.sh:395 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "dòng ngược không hợp lệ $upstream_name" + +#: git-rebase.sh:419 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: ở đây có nhiều hơn một " + +#: git-rebase.sh:422 +#: git-rebase.sh:426 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: ở đây không có gì để hòa trộn" + +#: git-rebase.sh:431 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "Không chỉ đến một lần chuyển giao (commit) không hợp lệ: $onto_name" + +#: git-rebase.sh:454 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "nghiêm trọng: không có nhánh như thế: $branch_name" + +#: git-rebase.sh:474 +msgid "Please commit or stash them." +msgstr "Xin hãy commit hoặc stash chúng." + +#: git-rebase.sh:492 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi." + +#: git-rebase.sh:495 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc." + +#: git-rebase.sh:506 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "Thay đổi từ $mb thành $onto:" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:515 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó..." + +#: git-rebase.sh:523 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "Fast-forward $branch_name thành $onto_name." + #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear với các tham số là chưa được thực hiện (không nhận đối số)" @@ -5353,37 +5870,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:189 #, 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:201 #, 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:290 #, 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:307 #, 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:311 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5394,62 +5911,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:322 #, 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:324 #, 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:338 #, 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:343 #, 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:348 #, 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:390 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Đang nhập '$prefix$sm_path'" -#: git-submodule.sh:363 +#: git-submodule.sh:404 #, 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:447 #, 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:456 #, 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:458 #, 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:466 #, 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:565 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5458,98 +5975,103 @@ 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:578 #, 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:597 #, 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:611 #, 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:612 #, 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:617 #, 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:618 #, 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:623 #, 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:624 #, 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:646 +#: git-submodule.sh:969 #, 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 -msgid "--cached cannot be used with --files" -msgstr "--cached không thể được sử dụng cùng với --files" +#: git-submodule.sh:754 +msgid "The --cached option cannot be used with the --files option" +msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" #. unexpected type -#: git-submodule.sh:753 +#: git-submodule.sh:794 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:771 +#: git-submodule.sh:812 #, 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:815 #, 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:818 #, 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:843 msgid "blob" msgstr "blob" -#: git-submodule.sh:803 -msgid "submodule" -msgstr "mô-đun con" - -#: git-submodule.sh:840 +#: git-submodule.sh:881 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:883 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:1027 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'" +#~ msgid "-d option is no longer supported. Do not use." +#~ msgstr "Tùy chọn -d không còn được hỗ trợ nữa. Xin đừng sử dụng." + +#~ msgid "%s: has been deleted/renamed" +#~ msgstr "%s: đã được xóa/thay-tên" + +#~ msgid "'%s': not a documentation directory." +#~ msgstr "'%s': không phải là một thư mục tài liệu." + #~ msgid "--" #~ msgstr "--" diff --git a/po/zh_CN.po b/po/zh_CN.po index b46b53e..354bf4d 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-08-06 23:47+0800\n" +"PO-Revision-Date: 2012-08-07 01:07+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -52,7 +52,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:89 builtin/commit.c:696 +#: bundle.c:89 builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -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:726 builtin/log.c:1316 builtin/log.c:1535 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:1212 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 终止" @@ -233,8 +237,8 @@ msgstr "" "%s" #: diff.c:1400 -msgid " 0 files changed\n" -msgstr " 0 个文件被修改\n" +msgid " 0 files changed" +msgstr " 0 个文件被修改" #: diff.c:1404 #, c-format @@ -257,7 +261,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] "，删除 %d 行(-)" msgstr[1] "，删除 %d 行(-)" -#: diff.c:3478 +#: diff.c:3461 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -293,16 +297,16 @@ msgstr "'%s'：%s" msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" -#: help.c:207 +#: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:214 +#: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:270 +#: help.c:275 #, 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:332 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:349 +#: help.c:354 #, 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:359 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:361 +#: help.c:366 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:365 +#: help.c:370 msgid "" "\n" "Did you mean this?" @@ -346,38 +350,300 @@ msgstr[0] "" "您指的是这个么？" msgstr[1] "" "\n" -"您指的是这些其中一个么？" +"您指的是这其中的某一个么？" + +#: merge-recursive.c:190 +#, c-format +msgid "(bad commit)\n" +msgstr "（坏提交）\n" + +#: merge-recursive.c:206 +#, c-format +msgid "addinfo_cache failed for path '%s'" +msgstr "为路径 '%s' addinfo_cache 失败" + +#: merge-recursive.c:268 +msgid "error building trees" +msgstr "无法创建树" + +#: merge-recursive.c:497 +msgid "diff setup failed" +msgstr "diff 设置失败" + +#: merge-recursive.c:627 +msgid "merge-recursive: disk full?" +msgstr "merge-recursive：磁盘已满？" + +#: merge-recursive.c:690 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "无法创建路径 '%s'%s" + +#: merge-recursive.c:701 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "删除 %s 以便为子目录留出空间\n" + +#. something else exists +#. .. but not some other error (who really cares what?) +#: merge-recursive.c:715 merge-recursive.c:736 +msgid ": perhaps a D/F conflict?" +msgstr "：可能是一个目录/文件冲突？" + +#: merge-recursive.c:726 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "拒绝丢弃 '%s' 中的未跟踪文件" + +#: merge-recursive.c:766 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "不能读取对象 %s '%s'" + +#: merge-recursive.c:768 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "%s '%s' 应为二进制对象（blob）" + +#: merge-recursive.c:791 builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "无法打开 '%s'" + +#: merge-recursive.c:799 +#, c-format +msgid "failed to symlink '%s'" +msgstr "无法创建符号链接 '%s'" -#: parse-options.c:493 +#: merge-recursive.c:802 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "不知道如何处理 %06o %s '%s'" + +#: merge-recursive.c:939 +msgid "Failed to execute internal merge" +msgstr "无法执行内部合并" + +#: merge-recursive.c:943 +#, c-format +msgid "Unable to add %s to database" +msgstr "不能添加 %s 至对象库" + +#: merge-recursive.c:959 +msgid "unsupported object type in the tree" +msgstr "在树中有不支持的对象类型" + +#: merge-recursive.c:1038 merge-recursive.c:1052 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" +"的版本被保留。" + +#: merge-recursive.c:1044 merge-recursive.c:1057 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" +"的版本保留于 %8$s 中。" + +#: merge-recursive.c:1098 +msgid "rename" +msgstr "重命名" + +#: merge-recursive.c:1098 +msgid "renamed" +msgstr "重命名" + +#: merge-recursive.c:1154 +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" + +#: merge-recursive.c:1176 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " +"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" + +#: merge-recursive.c:1181 +msgid " (left unresolved)" +msgstr "（留下未解决）" + +#: merge-recursive.c:1235 +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" +"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->" +"%5$s" + +#: merge-recursive.c:1265 +#, c-format +msgid "Renaming %s to %s and %s to %s instead" +msgstr "而是重命名 %s 至 %s 以及 %s 至 %s" + +#: merge-recursive.c:1464 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" + +#: merge-recursive.c:1474 +#, c-format +msgid "Adding merged %s" +msgstr "添加合并后的 %s" + +#: merge-recursive.c:1479 merge-recursive.c:1677 +#, c-format +msgid "Adding as %s instead" +msgstr "而是以 %s 为名添加" + +#: merge-recursive.c:1530 +#, c-format +msgid "cannot read object %s" +msgstr "不能读取对象 %s" + +#: merge-recursive.c:1533 +#, c-format +msgid "object %s is not a blob" +msgstr "对象 %s 不是一个二进制对象（blob）" + +#: merge-recursive.c:1581 +msgid "modify" +msgstr "修改" + +#: merge-recursive.c:1581 +msgid "modified" +msgstr "修改" + +#: merge-recursive.c:1591 +msgid "content" +msgstr "内容" + +#: merge-recursive.c:1598 +msgid "add/add" +msgstr "添加/添加" + +#: merge-recursive.c:1632 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "略过 %s（已经做过相同合并）" + +#: merge-recursive.c:1646 +#, c-format +msgid "Auto-merging %s" +msgstr "自动合并 %s" + +#: merge-recursive.c:1650 git-submodule.sh:844 +msgid "submodule" +msgstr "子模组" + +#: merge-recursive.c:1651 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "冲突（%s）：合并冲突于 %s" + +#: merge-recursive.c:1741 +#, c-format +msgid "Removing %s" +msgstr "删除 %s" + +#: merge-recursive.c:1766 +msgid "file/directory" +msgstr "文件/目录" + +#: merge-recursive.c:1772 +msgid "directory/file" +msgstr "目录/文件" + +#: merge-recursive.c:1777 +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" + +#: merge-recursive.c:1787 +#, c-format +msgid "Adding %s" +msgstr "添加 %s" + +#: merge-recursive.c:1804 +msgid "Fatal merge failure, shouldn't happen." +msgstr "严重的合并错误，不应发生。" + +#: merge-recursive.c:1823 +msgid "Already up-to-date!" +msgstr "已经是最新的！" + +#: merge-recursive.c:1832 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "无法合并树 %s 和 %s" + +#: merge-recursive.c:1862 +#, c-format +msgid "Unprocessed path??? %s" +msgstr "未处理的路径??? %s" + +#: merge-recursive.c:1907 +msgid "Merging:" +msgstr "合并：" + +#: merge-recursive.c:1920 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "发现 %u 个共同祖先：" +msgstr[1] "发现 %u 个共同祖先：" + +#: merge-recursive.c:1957 +msgid "merge returned no commit" +msgstr "合并未返回提交" + +#: merge-recursive.c:2014 +#, c-format +msgid "Could not parse object '%s'" +msgstr "不能解析对象 '%s'" + +#: merge-recursive.c:2026 builtin/merge.c:697 +msgid "Unable to write index." +msgstr "不能写入索引。" + +#: parse-options.c:494 msgid "..." msgstr "..." -#: parse-options.c:511 +#: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:515 +#: parse-options.c:516 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:518 +#: parse-options.c:519 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1629 +#: remote.c:1632 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:1635 +#: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -385,7 +651,7 @@ msgid_plural "" msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" -#: remote.c:1643 +#: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -395,10 +661,10 @@ msgid_plural "" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "您的分支和 '%s' 出现了偏离，\n" -"并且各自分别有 %d 和 %d 处不同的提交。\n" +"并且分别有 %d 和 %d 处不同的提交。\n" msgstr[1] "" "您的分支和 '%s' 出现了偏离，\n" -"并且各自分别有 %d 和 %d 处不同的提交。\n" +"并且分别有 %d 和 %d 处不同的提交。\n" #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 #: builtin/merge.c:1088 builtin/merge.c:1098 @@ -598,7 +864,7 @@ msgstr "错误收尾 %s。" #: sequencer.c:779 sequencer.c:913 msgid "no cherry-pick or revert in progress" -msgstr "没有拣选或还原操作在进行" +msgstr "拣选或还原操作并未进行" #: sequencer.c:781 msgid "cannot resolve HEAD" @@ -608,7 +874,7 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:805 builtin/apply.c:3697 +#: sequencer.c:805 builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" @@ -620,7 +886,7 @@ msgstr "不能读取 %s：%s" #: sequencer.c:809 msgid "unexpected end of file" -msgstr "未预期的文件结束" +msgstr "意外的文件结束" #: sequencer.c:815 #, c-format @@ -640,21 +906,21 @@ msgstr "不能作为初始提交还原" msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" -#: sha1_name.c:864 +#: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: sha1_name.c:867 +#: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支：'%s'" -#: sha1_name.c:869 +#: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: sha1_name.c:872 +#: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" @@ -662,267 +928,384 @@ msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" #: wrapper.c:413 #, c-format msgid "unable to look up current user in the passwd file: %s" -msgstr "无法在 passwd 文件中查询到当前用户：%s" +msgstr "无法在 passwd 文件中查询到该用户：%s" #: wrapper.c:414 msgid "no such user" msgstr "无此用户" -#: wt-status.c:135 +#: wt-status.c:140 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:141 wt-status.c:158 +#: wt-status.c:167 wt-status.c:194 #, 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:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:144 +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " （使用 \"git add <file>...\" 标记解决方案）" + +# 译者：注意保持前导空格 +#: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" -#: wt-status.c:152 +# 译者：注意保持前导空格 +#: wt-status.c:177 +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " （使用 \"git rm <file>...\" 标记解决方案）" + +#: wt-status.c:188 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:170 +#: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:174 +#: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:176 +#: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:177 +#: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:179 +#: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" -#: wt-status.c:188 +#: wt-status.c:224 #, c-format msgid "%s files:" msgstr "%s文件：" # 译者：注意保持前导空格 -#: wt-status.c:191 +#: wt-status.c:227 #, 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:244 msgid "bug" msgstr "bug" -#: wt-status.c:213 +#: wt-status.c:249 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:214 +#: wt-status.c:250 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:215 +#: wt-status.c:251 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:216 +#: wt-status.c:252 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:217 +#: wt-status.c:253 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:218 +#: wt-status.c:254 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:219 +#: wt-status.c:255 msgid "both modified:" msgstr "双方修改：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:249 +#: wt-status.c:285 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:251 +#: wt-status.c:287 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:253 +#: wt-status.c:289 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:267 +#: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "新文件： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:270 +#: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "拷贝： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:273 +#: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "删除： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:276 +#: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "修改： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:279 +#: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "重命名： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:282 +#: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "类型变更： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:285 +#: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "未知： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:288 +#: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "未合并： %s" -#: wt-status.c:291 +#: wt-status.c:327 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" -#: wt-status.c:737 +#: wt-status.c:785 +msgid "You have unmerged paths." +msgstr "您有尚未合并的路径。" + +# 译者：注意保持前导空格 +#: wt-status.c:788 wt-status.c:912 +msgid " (fix conflicts and run \"git commit\")" +msgstr " （解决冲突并运行 \"git commit\"）" + +#: wt-status.c:791 +msgid "All conflicts fixed but you are still merging." +msgstr "所有冲突已解决但您仍处于合并中。" + +# 译者：注意保持前导空格 +#: wt-status.c:794 +msgid " (use \"git commit\" to conclude merge)" +msgstr " （使用 \"git commit\" 结束合并）" + +#: wt-status.c:804 +msgid "You are in the middle of an am session." +msgstr "您正处于一个 am 过程中。" + +#: wt-status.c:807 +msgid "The current patch is empty." +msgstr "当前的补丁为空。" + +# 译者：注意保持前导空格 +#: wt-status.c:811 +msgid " (fix conflicts and then run \"git am --resolved\")" +msgstr " （解决冲突，然后运行 \"git am --resolved\"）" + +# 译者：注意保持前导空格 +#: wt-status.c:813 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " （使用 \"git am --skip\" 跳过此补丁）" + +# 译者：注意保持前导空格 +#: wt-status.c:815 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " （使用 \"git am --abort\" 恢复原有分支）" + +#: wt-status.c:873 wt-status.c:883 +msgid "You are currently rebasing." +msgstr "您正在变基。" + +# 译者：注意保持前导空格 +#: wt-status.c:876 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" + +# 译者：注意保持前导空格 +#: wt-status.c:878 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" + +# 译者：注意保持前导空格 +#: wt-status.c:880 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" + +# 译者：注意保持前导空格 +#: wt-status.c:886 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" + +#: wt-status.c:888 +msgid "You are currently splitting a commit during a rebase." +msgstr "您正在变基过程中拆分一个提交。" + +# 译者：注意保持前导空格 +#: wt-status.c:891 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" + +#: wt-status.c:893 +msgid "You are currently editing a commit during a rebase." +msgstr "您正在变基过程中编辑一个提交。" + +# 译者：注意保持前导空格 +#: wt-status.c:896 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " （使用 \"git commit --amend\" 修补当前提交）" + +# 译者：注意保持前导空格 +#: wt-status.c:898 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" + +#: wt-status.c:908 +msgid "You are currently cherry-picking." +msgstr "您正在做拣选操作。" + +# 译者：注意保持前导空格 +#: wt-status.c:915 +msgid " (all conflicts fixed: run \"git commit\")" +msgstr " （解决所有冲突后，执行 \"git commit\"）" + +#: wt-status.c:924 +msgid "You are currently bisecting." +msgstr "您正在做二分查找。" + +# 译者：注意保持前导空格 +#: wt-status.c:927 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " （使用 \"git bisect reset\" 以回到原有分支）" + +#: wt-status.c:978 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:744 +#: wt-status.c:985 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:755 +#: wt-status.c:997 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:769 +#: wt-status.c:1011 msgid "Untracked" msgstr "未跟踪的" -#: wt-status.c:771 +#: wt-status.c:1013 msgid "Ignored" msgstr "忽略的" -#: wt-status.c:773 +#: wt-status.c:1015 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:775 +#: wt-status.c:1017 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:781 +#: wt-status.c:1023 msgid "No changes" msgstr "没有修改" -#: wt-status.c:785 +#: wt-status.c:1027 #, c-format msgid "no changes added to commit%s\n" msgstr "修改尚未加入提交%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:787 +#: wt-status.c:1029 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）" -#: wt-status.c:789 +#: wt-status.c:1031 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "空提交但存在未跟踪文件%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:791 +#: wt-status.c:1033 msgid " (use \"git add\" to track)" msgstr "（使用 \"git add\" 建立跟踪）" -#: wt-status.c:793 wt-status.c:796 wt-status.c:799 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "无须提交%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:794 +#: wt-status.c:1036 msgid " (create/copy files and use \"git add\" to track)" msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:797 +#: wt-status.c:1039 msgid " (use -u to show untracked files)" msgstr "（使用 -u 显示未跟踪文件）" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:800 +#: wt-status.c:1042 msgid " (working directory clean)" msgstr "（干净的工作区）" -#: wt-status.c:908 +#: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:914 +#: wt-status.c:1156 msgid "Initial commit on " msgstr "初始提交于 " # 译者：注意保持句尾空格 -#: wt-status.c:929 +#: wt-status.c:1171 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:932 wt-status.c:935 +#: wt-status.c:1174 wt-status.c:1177 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:937 +#: wt-status.c:1179 msgid ", behind " msgstr "，落后 " @@ -931,7 +1314,7 @@ msgstr "，落后 " msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:67 builtin/commit.c:226 +#: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "更新文件失败" @@ -949,7 +1332,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' 未匹配任何文件" @@ -966,11 +1349,11 @@ msgstr "不能读取索引" #: builtin/add.c:286 #, c-format msgid "Could not open '%s' for writing." -msgstr "不能为写入打开 '%s'。" +msgstr "不能打开 '%s' 以写入。" #: builtin/add.c:290 msgid "Could not write patch" -msgstr "不能写补丁" +msgstr "不能生成补丁" #: builtin/add.c:295 #, c-format @@ -988,7 +1371,7 @@ msgstr "不能应用 '%s'" #: builtin/add.c:312 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n" +msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" #: builtin/add.c:352 #, c-format @@ -1009,7 +1392,7 @@ msgstr "-A 和 -u 选项互斥" #: builtin/add.c:393 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "选项 --ignore-missing 只能和 --dry-run 共用" +msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" #: builtin/add.c:413 #, c-format @@ -1021,75 +1404,75 @@ msgstr "没有指定文件，也没有文件被添加。\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 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:4433 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: builtin/apply.c:53 +#: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [选项] [<补丁>...]" -#: builtin/apply.c:106 +#: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: builtin/apply.c:121 +#: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: builtin/apply.c:815 +#: builtin/apply.c:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: builtin/apply.c:824 +#: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:905 +#: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: builtin/apply.c:937 +#: builtin/apply.c:946 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s" +msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:941 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: builtin/apply.c:942 +#: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: builtin/apply.c:949 +#: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行" +msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: builtin/apply.c:1394 +#: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1451 +#: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1468 +#: builtin/apply.c:1477 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1100,82 +1483,82 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1628 +#: builtin/apply.c:1637 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1630 +#: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1656 +#: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" -msgstr "补丁损坏位于第 %d 行" +msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1692 +#: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1694 +#: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1697 +#: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1843 +#: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1872 +#: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:1958 +#: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2048 +#: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2052 +#: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2123 +#: builtin/apply.c:2132 msgid "oops" msgstr "哎哟" -#: builtin/apply.c:2645 +#: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2763 +#: builtin/apply.c:2772 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行）" msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行）" -#: builtin/apply.c:2775 +#: builtin/apply.c:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2781 +#: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" @@ -1184,313 +1567,321 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2800 +#: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:2903 +#: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:2909 +#: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）" +msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:2930 +#: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3045 +#: builtin/apply.c:3061 #, c-format -msgid "patch %s has been renamed/deleted" -msgstr "补丁 %s 已经被重命名/删除" +msgid "cannot checkout %s" +msgstr "不能检出 %s" -#: builtin/apply.c:3052 builtin/apply.c:3069 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3084 -msgid "removal patch leaves file contents" -msgstr "移除补丁仍留下了文件内容" - -#: builtin/apply.c:3105 +#: builtin/apply.c:3139 builtin/apply.c:3361 #, c-format -msgid "%s: already exists in working directory" -msgstr "%s：已经存在于工作区中" +msgid "path %s has been renamed/deleted" +msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3143 +#: builtin/apply.c:3220 builtin/apply.c:3375 #, c-format -msgid "%s: has been deleted/renamed" -msgstr "%s：已经被删除/重命名" +msgid "%s: does not exist in index" +msgstr "%s：不存在于索引中" -#: builtin/apply.c:3148 builtin/apply.c:3179 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3159 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s：不存在于索引中" - -#: builtin/apply.c:3173 +#: builtin/apply.c:3229 builtin/apply.c:3383 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3190 +#: builtin/apply.c:3331 +msgid "removal patch leaves file contents" +msgstr "移除补丁仍留下了文件内容" + +#: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3192 +#: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" -msgstr "%s 的类型是 %o，预期是 %o" +msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3247 +#: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3267 +#: builtin/apply.c:3506 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s：已经存在于工作区中" + +#: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3272 +#: builtin/apply.c:3531 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" -#: builtin/apply.c:3280 +#: builtin/apply.c:3539 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3293 +#: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3491 +#: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3518 +#: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "子项目 %s 损坏的补丁" -#: builtin/apply.c:3522 +#: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3527 +#: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3530 +#: builtin/apply.c:3790 builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3563 +#: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3612 +#: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:3668 +#: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:3676 +#: builtin/apply.c:3967 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose -#: builtin/apply.c:3679 +#: builtin/apply.c:3970 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..." -msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..." +msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." +msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." -#: builtin/apply.c:3689 +#: builtin/apply.c:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:3710 +#: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:3713 +#: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:3844 +#: builtin/apply.c:4154 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:3855 +#: builtin/apply.c:4165 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:3970 builtin/apply.c:3973 +#: builtin/apply.c:4284 builtin/apply.c:4287 msgid "path" msgstr "路径" -#: builtin/apply.c:3971 +#: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:3974 +#: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:3976 +#: builtin/apply.c:4290 msgid "num" msgstr "数字" -#: builtin/apply.c:3977 +#: builtin/apply.c:4291 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" -#: builtin/apply.c:3980 +#: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:3982 +#: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:3986 +#: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "以数字方式显示添加或删除行的数量" -#: builtin/apply.c:3988 +#: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:3990 +#: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:3992 +#: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:3994 +#: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:3996 +#: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）" +msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:3998 +#: builtin/apply.c:4312 +msgid "attempt three-way merge if a patch does not apply" +msgstr "如果一个补丁不能应用则尝试三路合并" + +#: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4000 +#: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4003 +#: builtin/apply.c:4319 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4004 +#: builtin/apply.c:4320 msgid "action" msgstr "动作" -#: builtin/apply.c:4005 +#: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4008 builtin/apply.c:4011 +#: builtin/apply.c:4324 builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4014 +#: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4016 +#: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4018 +#: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4020 +#: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4021 +#: builtin/apply.c:4337 msgid "be verbose" msgstr "冗长输出" -#: builtin/apply.c:4023 +#: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "宽容不正确的文件末尾换行符" +msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4026 +#: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4028 +#: builtin/apply.c:4344 msgid "root" msgstr "根目录" -#: builtin/apply.c:4029 +#: builtin/apply.c:4345 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4050 +#: builtin/apply.c:4367 +msgid "--3way outside a repository" +msgstr "--3way 在一个版本库之外" + +#: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4053 +#: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4069 +#: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4083 +#: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4089 builtin/apply.c:4099 +#: builtin/apply.c:4414 builtin/apply.c:4424 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1504,7 +1895,7 @@ msgstr "不能创建归档文件 '%s'" #: builtin/archive.c:20 msgid "could not redirect output" -msgstr "不能输出重定向" +msgstr "不能重定向输出" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" @@ -1512,7 +1903,7 @@ msgstr "git archive：未提供远程URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" -msgstr "git archive：期待ACK/NACK，却得到EOF" +msgstr "git archive：应为ACK/NACK，却得到EOF" #: builtin/archive.c:63 #, c-format @@ -1530,7 +1921,7 @@ msgstr "git archive：协议错误" #: builtin/archive.c:71 msgid "git archive: expected a flush" -msgstr "git archive：预期一个刷新" +msgstr "git archive：应为刷新" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:144 @@ -1554,7 +1945,7 @@ msgstr "" #: builtin/branch.c:180 msgid "cannot use -a with -d" -msgstr "不能将 -a 和 -d 共用" +msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c:186 msgid "Couldn't look up commit object for HEAD" @@ -1697,7 +2088,7 @@ msgstr "不能写分支描述模版：%s" msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:788 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" @@ -1722,100 +2113,100 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:131 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:175 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:192 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:209 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:234 builtin/checkout.c:392 +#: builtin/checkout.c:235 builtin/checkout.c:393 msgid "corrupt index file" msgstr "损坏的索引文件" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done 失败" -#: builtin/checkout.c:414 +#: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:533 +#: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:573 +#: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:640 +#: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:647 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -1836,7 +2227,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:665 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -1851,71 +2242,71 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:695 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:698 +#: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:724 +#: builtin/checkout.c:725 builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:974 +#: builtin/checkout.c:977 msgid "-B cannot be used with -b" -msgstr "-B 不能和 -b 共用" +msgstr "-B 不能和 -b 同时使用" -#: builtin/checkout.c:983 +#: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "--patch 选项和其他选项不兼容" -#: builtin/checkout.c:986 +#: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detach 不能和 -b/-B/--orphan 共用" +msgstr "--detach 不能和 -b/-B/--orphan 同时使用" -#: builtin/checkout.c:988 +#: builtin/checkout.c:991 msgid "--detach cannot be used with -t" -msgstr "--detach 不能和 -t 共用" +msgstr "--detach 不能和 -t 同时使用" -#: builtin/checkout.c:994 +#: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1001 +#: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan 和 -b|-B 互斥" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" -msgstr "--orphan 不能和 -t 共用" +msgstr "--orphan 不能和 -t 同时使用" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout：-f 和 -m 不兼容" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -1924,32 +2315,32 @@ msgstr "" "git checkout：更新路径和切换分支不兼容。\n" "您是想要检出 '%s' 但未能将其解析为提交么？" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout：更新路径和切换分支不兼容。" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout：--detach 不跟路径参数" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "无法切换分支到一个非提交。" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs 和切换分支不兼容。" #: builtin/clean.c:78 msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能共用" +msgstr "-x 和 -X 不能同时使用" #: builtin/clean.c:82 msgid "" @@ -1994,11 +2385,6 @@ msgstr "未删除 %s\n" msgid "reference repository '%s' is not a local directory." msgstr "引用版本库 '%s' 不是一个本地目录。" -#: builtin/clone.c:302 -#, c-format -msgid "failed to open '%s'" -msgstr "无法打开 '%s'" - #: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" @@ -2039,78 +2425,78 @@ msgstr "无法拷贝文件至 '%s'" msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:549 +#: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:639 +#: builtin/clone.c:642 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:643 +#: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:654 +#: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:668 +#: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:673 +#: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:683 +#: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:693 +#: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/clone.c:709 builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:709 +#: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:728 +#: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" -#: builtin/clone.c:730 +#: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:786 +#: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:835 +#: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:842 +#: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" @@ -2166,93 +2552,93 @@ msgstr "" "\n" "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:253 +#: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:295 +#: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:301 +#: builtin/commit.c:304 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:386 +#: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:388 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:398 +#: builtin/commit.c:401 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:418 +#: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:493 builtin/commit.c:499 +#: builtin/commit.c:496 builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:522 +#: builtin/commit.c:525 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:582 +#: builtin/commit.c:585 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:632 builtin/shortlog.c:296 +#: builtin/commit.c:635 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:634 +#: builtin/commit.c:637 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:638 +#: builtin/commit.c:641 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:644 +#: builtin/commit.c:647 msgid "commit has empty message" msgstr "提交说明为空" -#: builtin/commit.c:660 +#: builtin/commit.c:663 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:664 +#: builtin/commit.c:667 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:668 +#: builtin/commit.c:671 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:720 +#: builtin/commit.c:723 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:731 +#: builtin/commit.c:734 #, c-format msgid "" "\n" @@ -2262,11 +2648,11 @@ msgid "" "and try again.\n" msgstr "" "\n" -"看起来您正在做一个合并提交。如果不对，请删除文件\n" +"似乎您正在做一个合并提交。如果不对，请删除文件\n" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:736 +#: builtin/commit.c:739 #, c-format msgid "" "\n" @@ -2276,11 +2662,11 @@ msgid "" "and try again.\n" msgstr "" "\n" -"看起来您正在做一个拣选提交。如果不对，请删除文件\n" +"似乎您正在做一个拣选提交。如果不对，请删除文件\n" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:748 +#: builtin/commit.c:751 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -2288,7 +2674,7 @@ msgstr "" "请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:753 +#: builtin/commit.c:756 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -2298,160 +2684,160 @@ msgstr "" "如果您想这样做的话。而一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:766 +#: builtin/commit.c:769 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:773 +#: builtin/commit.c:776 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:793 +#: builtin/commit.c:796 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:830 +#: builtin/commit.c:833 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:845 builtin/tag.c:361 +#: builtin/commit.c:848 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" -#: builtin/commit.c:942 +#: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:957 builtin/commit.c:1157 +#: builtin/commit.c:960 builtin/commit.c:1160 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:997 +#: builtin/commit.c:1000 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1008 +#: builtin/commit.c:1011 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1011 +#: builtin/commit.c:1014 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1013 +#: builtin/commit.c:1016 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1016 +#: builtin/commit.c:1019 msgid "Options --squash and --fixup cannot be used together" -msgstr "选项 --squash 和 --fixup 不能共用" +msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1028 +#: builtin/commit.c:1031 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" +msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1036 +#: builtin/commit.c:1039 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" +msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1053 +#: builtin/commit.c:1056 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1055 +#: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1057 +#: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1059 +#: builtin/commit.c:1062 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." -#: builtin/commit.c:1069 builtin/tag.c:577 +#: builtin/commit.c:1072 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1074 +#: builtin/commit.c:1077 msgid "Paths with -a does not make sense." -msgstr "路径和 -a 选项共用没有意义。" +msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1257 +#: builtin/commit.c:1260 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1259 +#: builtin/commit.c:1262 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1300 +#: builtin/commit.c:1303 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1302 +#: builtin/commit.c:1305 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1446 +#: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1484 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1491 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1498 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1517 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1531 +#: builtin/commit.c:1534 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1536 +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1576 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2542,7 +2928,7 @@ msgstr "没有发现名称，无法描述任何东西。" #: builtin/describe.c:482 msgid "--dirty is incompatible with committishes" -msgstr "--dirty 不能与提交共用" +msgstr "--dirty 不能与提交同时使用" #: builtin/diff.c:77 #, c-format @@ -2558,22 +2944,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'" +msgstr "提供了超过两个二进制对象（blob）：'%s'" -#: builtin/diff.c:370 +#: builtin/diff.c:364 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" @@ -2808,11 +3194,11 @@ msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c:963 msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached 或 --untracked 不能与 --no-index 共用。" +msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" #: builtin/grep.c:968 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index 或 --untracked 不能和版本共用。" +msgstr "--no-index 或 --untracked 不能和版本同时使用。" #: builtin/grep.c:971 msgid "--[no-]exclude-standard cannot be used for tracked contents." @@ -2822,30 +3208,30 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/help.c:59 +#: builtin/help.c:65 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:87 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:100 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:108 +#: builtin/help.c:114 #, 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:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s'：%s" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -2854,7 +3240,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" -#: builtin/help.c:223 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -2863,266 +3249,272 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:287 +#: builtin/help.c:299 msgid "The most commonly used git commands are:" msgstr "最常用的 git 命令有：" -#: builtin/help.c:355 +#: builtin/help.c:367 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:372 +#: builtin/help.c:384 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:380 +#: builtin/help.c:392 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:391 -#, c-format -msgid "'%s': not a documentation directory." -msgstr "'%s'：不是一个文档目录。" - -#: builtin/help.c:432 builtin/help.c:439 +#: builtin/help.c:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:453 +#: builtin/help.c:470 #, 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:530 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:497 +#: builtin/index-pack.c:532 #, 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:558 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:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:598 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:262 +#, c-format +msgid "unable to read %s" +msgstr "不能读 %s" + +#: builtin/index-pack.c:718 +#, c-format +msgid "cannot read existing object %s" +msgstr "不能读取现存对象 %s" + +#: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" -msgstr "无效的 blob 对象 %s" +msgstr "无效的二进制对象（blob）%s" -#: builtin/index-pack.c:610 +#: builtin/index-pack.c:747 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:749 msgid "Error in object" msgstr "对象中出错" -#: builtin/index-pack.c:614 +#: builtin/index-pack.c:751 #, 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:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:872 +#: builtin/index-pack.c:1012 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:877 +#: builtin/index-pack.c:1017 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" -#: builtin/index-pack.c:880 +#: builtin/index-pack.c:1020 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:903 +#: builtin/index-pack.c:1031 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "parse_pack_objects() 中遇到不可理喻的问题" + +#: builtin/index-pack.c:1054 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:954 +#: builtin/index-pack.c:1105 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:973 +#: builtin/index-pack.c:1124 #, 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:1149 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能缩小附加对象（%d）" -#: builtin/index-pack.c:1077 +#: builtin/index-pack.c:1228 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1101 +#: builtin/index-pack.c:1252 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1114 +#: builtin/index-pack.c:1265 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1122 +#: builtin/index-pack.c:1273 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1286 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1146 +#: builtin/index-pack.c:1297 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1398 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1400 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1447 #, 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:1454 #, 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:1481 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:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1558 msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin 不能和 --stdin 共用" +msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1581 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -3196,22 +3588,22 @@ msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" msgid "insane git directory %s" msgstr "不正常的 git 目录 %s" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:354 +#: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:357 +#: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:362 +#: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "不能创建 git link %s" @@ -3221,39 +3613,39 @@ msgstr "不能创建 git link %s" #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. -#: builtin/init-db.c:419 +#: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 版本库于 %s%s\n" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "重新初始化现存的" -#: builtin/init-db.c:420 +#: builtin/init-db.c:421 msgid "Initialized empty" msgstr "初始化空的" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/init-db.c:421 +#: builtin/init-db.c:422 msgid " shared" msgstr "共享" -#: builtin/init-db.c:440 +#: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "无法获知当前路径" -#: builtin/init-db.c:521 builtin/init-db.c:528 +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -3262,109 +3654,109 @@ msgstr "" "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" "dir=<directory>）" -#: builtin/init-db.c:578 +#: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "不能访问当前工作目录" -#: builtin/init-db.c:585 +#: builtin/init-db.c:586 #, c-format 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:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:513 +#: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:602 +#: builtin/log.c:608 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:676 +#: builtin/log.c:682 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:687 +#: builtin/log.c:693 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:701 +#: builtin/log.c:707 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:709 +#: builtin/log.c:715 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:786 +#: builtin/log.c:792 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:859 +#: builtin/log.c:865 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:932 +#: builtin/log.c:938 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1153 +#: builtin/log.c:1160 #, c-format msgid "bogus committer info %s" msgstr "虚假的提交者信息 %s" -#: builtin/log.c:1198 +#: builtin/log.c:1205 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1200 +#: builtin/log.c:1207 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1208 +#: builtin/log.c:1215 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1210 +#: builtin/log.c:1217 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1212 +#: builtin/log.c:1219 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1235 +#: builtin/log.c:1242 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1237 +#: builtin/log.c:1244 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1390 +#: builtin/log.c:1397 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1494 +#: builtin/log.c:1501 #, 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:1517 builtin/log.c:1519 builtin/log.c:1531 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" @@ -3446,10 +3838,6 @@ msgstr "git write-tree 无法写入一树对象" msgid "failed to read the cache" msgstr "无法读取缓存" -#: builtin/merge.c:697 -msgid "Unable to write index." -msgstr "不能写索引。" - #: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" @@ -3558,11 +3946,11 @@ msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" #: builtin/merge.c:1249 msgid "You cannot combine --squash with --no-ff." -msgstr "您不能将 --squash 与 --no-ff 共用。" +msgstr "您不能将 --squash 与 --no-ff 同时使用。" #: builtin/merge.c:1254 msgid "You cannot combine --no-ff with --ff-only." -msgstr "您不能将 --no-ff 与 --ff-only 共用。" +msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" #: builtin/merge.c:1261 msgid "No commit specified and merge.defaultToUpstream not set." @@ -3845,22 +4233,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'" @@ -4027,7 +4420,7 @@ msgstr "--all 和 --tags 不兼容" #: builtin/push.c:286 msgid "--all can't be combined with refspecs" -msgstr "--all 不能和引用表达式共用" +msgstr "--all 不能和引用表达式同时使用" #: builtin/push.c:291 msgid "--mirror and --tags are incompatible" @@ -4035,7 +4428,7 @@ msgstr "--mirror 和 --tags 不兼容" #: builtin/push.c:292 msgid "--mirror can't be combined with refspecs" -msgstr "--mirror 不能和引用表达式共用" +msgstr "--mirror 不能和引用表达式同时使用" #: builtin/push.c:297 msgid "--all and --mirror are incompatible" @@ -4073,7 +4466,7 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "指定要跟踪的分支只在与获取镜像共用才有意义" +msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" #: builtin/remote.c:195 builtin/remote.c:646 #, c-format @@ -4456,32 +4849,32 @@ msgstr "重置后撤出暂存区的变更：" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:297 +#: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:302 +#: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard,mixed,soft} 不兼容" -#: builtin/reset.c:311 +#: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。" +msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:313 +#: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:325 +#: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" -#: builtin/reset.c:341 +#: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" @@ -4489,7 +4882,7 @@ msgstr "不能重置索引文件至版本 '%s'。" #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" -msgstr "%s：%s 不能和 %s 共用" +msgstr "%s：%s 不能和 %s 同时使用" #: builtin/revert.c:131 msgid "program error" @@ -4639,15 +5032,15 @@ msgstr "--column 和 -n 不兼容" #: builtin/tag.c:523 msgid "-n option is only allowed with -l." -msgstr "-n 选项只允许和 -l 共用。" +msgstr "-n 选项只允许和 -l 同时使用。" #: builtin/tag.c:525 msgid "--contains option is only allowed with -l." -msgstr "--contains 选项只允许和 -l 共用。" +msgstr "--contains 选项只允许和 -l 同时使用。" #: builtin/tag.c:527 msgid "--points-at option is only allowed with -l." -msgstr "--points-at 选项只允许和 -l 共用。" +msgstr "--points-at 选项只允许和 -l 同时使用。" #: builtin/tag.c:535 msgid "only one -F or -m option is allowed." @@ -4810,15 +5203,14 @@ 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 msgid "" -"When you have resolved this problem run \"$cmdline --resolved\".\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." +"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +"To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" "当您解决了此问题后，执行 \"$cmdline --resolved\"。\n" "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" @@ -4830,7 +5222,11 @@ msgstr "无法求助于三路合并。" #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "版本库缺乏必要的 blob 数据以进行三路合并。" +msgstr "版本库缺乏必要的二进制对象（blob）以进行三路合并。" + +#: git-am.sh:139 +msgid "Using index info to reconstruct a base tree..." +msgstr "更新索引信息以重建基树..." #: git-am.sh:154 msgid "" @@ -4838,48 +5234,56 @@ msgid "" "It does not apply to blobs recorded in its index." msgstr "" "您是否曾手动编辑过您的补丁？\n" -"无法应用补丁到索引中的数据上。" +"无法应用补丁到索引中的二进制对象（blob）上。" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." msgstr "转而在基础版本上打补丁及进行三路合并..." -#: git-am.sh:275 +#: git-am.sh:179 +msgid "Failed to merge in the changes." +msgstr "无法合并变更。" + +#: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: git-am.sh:362 +#: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "不支持 $patch_format 补丁格式。" -#: git-am.sh:364 +#: git-am.sh:363 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" -#: git-am.sh:418 -msgid "-d option is no longer supported. Do not use." -msgstr "不再支持 -d 选项。不要使用。" +#: git-am.sh:389 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n" +"请不要再使用它了。" -#: git-am.sh:481 +#: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" -#: git-am.sh:486 +#: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ？" -#: git-am.sh:513 +#: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: git-am.sh:579 +#: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引：不能应用补丁（脏文件：$files）" -#: git-am.sh:671 +#: git-am.sh:679 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -4890,15 +5294,15 @@ msgstr "" "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" -#: git-am.sh:708 +#: git-am.sh:706 msgid "Patch does not have a valid e-mail address." msgstr "补丁中没有一个有效的邮件地址。" -#: git-am.sh:755 +#: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: git-am.sh:759 +#: git-am.sh:757 msgid "Commit Body is:" msgstr "提交内容为：" @@ -4906,16 +5310,16 @@ msgstr "提交内容为：" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:766 +#: git-am.sh:764 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:802 +#: git-am.sh:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" -#: git-am.sh:823 +#: git-am.sh:821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4925,23 +5329,22 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: git-am.sh:831 +#: git-am.sh:829 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 +#: git-am.sh:845 msgid "No changes -- Patch already applied." msgstr "没有变更 -- 补丁已经应用过。" -#: git-am.sh:857 +#: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" -#: git-am.sh:873 +#: git-am.sh:876 msgid "applying to an empty history" msgstr "正应用到一个空历史上" @@ -5142,6 +5545,123 @@ msgstr "无法将多个分支合并到空分支" msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" +#: git-rebase.sh:52 +msgid "" +"When you have resolved this problem, run \"git rebase --continue\".\n" +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." +msgstr "" +"当您解决了此问题后，执行 \"git rebase --continue\"。\n" +"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" +"要恢复原分支并停止变基，执行 \"git rebase --abort\"。" + +#: git-rebase.sh:159 +msgid "The pre-rebase hook refused to rebase." +msgstr "钩子 pre-rebase 拒绝变基。" + +#: git-rebase.sh:164 +msgid "It looks like git-am is in progress. Cannot rebase." +msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" + +#: git-rebase.sh:295 +msgid "The --exec option must be used with the --interactive option" +msgstr "选项 --exec 必须和选项 --interactive 同时使用" + +#: git-rebase.sh:300 +msgid "No rebase in progress?" +msgstr "没有正在进行的变基？" + +#: git-rebase.sh:313 +msgid "Cannot read HEAD" +msgstr "不能读取 HEAD" + +#: git-rebase.sh:316 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"您必须编辑所有的合并冲突，然后通过 git add\n" +"命令将它们标记为已解决" + +#: git-rebase.sh:334 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "无法移回 $head_name" + +#: git-rebase.sh:350 +#, sh-format +msgid "" +"It seems that there is already a $state_dir_base directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t$cmd_live_rebase\n" +"If that is not the case, please\n" +"\t$cmd_clear_stale_rebase\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there." +msgstr "" +"好像已有一个 $state_dir_base 目录，我怀疑您正处于另外一个变基过程中。\n" +"如果是这样，请尝试执行\n" +"\t$cmd_live_rebase\n" +"如果不是这样，请执行\n" +"\t$cmd_clear_stale_rebase\n" +"然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。" + +#: git-rebase.sh:395 +#, sh-format +msgid "invalid upstream $upstream_name" +msgstr "无效的上游 $upstream_name" + +#: git-rebase.sh:419 +#, sh-format +msgid "$onto_name: there are more than one merge bases" +msgstr "$onto_name: 有一个以上的合并基准" + +#: git-rebase.sh:422 git-rebase.sh:426 +#, sh-format +msgid "$onto_name: there is no merge base" +msgstr "$onto_name: 没有合并基准" + +#: git-rebase.sh:431 +#, sh-format +msgid "Does not point to a valid commit: $onto_name" +msgstr "没有指向一个有效的提交：$onto_name" + +#: git-rebase.sh:454 +#, sh-format +msgid "fatal: no such branch: $branch_name" +msgstr "严重错误：无此分支：$branch_name" + +#: git-rebase.sh:474 +msgid "Please commit or stash them." +msgstr "请提交或为它们保存进度。" + +#: git-rebase.sh:492 +#, sh-format +msgid "Current branch $branch_name is up to date." +msgstr "当前分支 $branch_name 是最新的。" + +#: git-rebase.sh:495 +#, sh-format +msgid "Current branch $branch_name is up to date, rebase forced." +msgstr "当前分支 $branch_name 是最新的，强制变基。" + +#: git-rebase.sh:506 +#, sh-format +msgid "Changes from $mb to $onto:" +msgstr "变更从 $mb 到 $onto：" + +#. Detach HEAD and reset the tree +#: git-rebase.sh:515 +msgid "First, rewinding head to replay your work on top of it..." +msgstr "首先，重置头指针以便在上面重放您的工作..." + +#: git-rebase.sh:523 +#, sh-format +msgid "Fast-forwarded $branch_name to $onto_name." +msgstr "快进 $branch_name 至 $onto_name。" + #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支持参数" @@ -5271,37 +5791,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:189 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" -#: git-submodule.sh:160 +#: git-submodule.sh:201 #, 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:290 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:266 +#: git-submodule.sh:307 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:270 +#: git-submodule.sh:311 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5312,62 +5832,62 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:281 +#: git-submodule.sh:322 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" -#: git-submodule.sh:283 +#: git-submodule.sh:324 #, 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:338 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:302 +#: git-submodule.sh:343 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:307 +#: git-submodule.sh:348 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:349 +#: git-submodule.sh:390 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "正在进入 '$prefix$sm_path'" -#: git-submodule.sh:363 +#: git-submodule.sh:404 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "停止于 '$sm_path'，脚本返回非零值。" -#: git-submodule.sh:406 +#: git-submodule.sh:447 #, 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:456 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册 url" -#: git-submodule.sh:417 +#: git-submodule.sh:458 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" -#: git-submodule.sh:425 +#: git-submodule.sh:466 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册更新模式" -#: git-submodule.sh:524 +#: git-submodule.sh:565 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5376,96 +5896,92 @@ msgstr "" "子模组路径 '$sm_path' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:537 +#: git-submodule.sh:578 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" -#: git-submodule.sh:556 +#: git-submodule.sh:597 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:570 +#: git-submodule.sh:611 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" -#: git-submodule.sh:571 +#: git-submodule.sh:612 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "子模组路径 '$sm_path'：变基至 '$sha1'" -#: git-submodule.sh:576 +#: git-submodule.sh:617 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" -#: git-submodule.sh:577 +#: git-submodule.sh:618 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'" -#: git-submodule.sh:582 +#: git-submodule.sh:623 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" -#: git-submodule.sh:583 +#: git-submodule.sh:624 #, 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:646 git-submodule.sh:969 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:713 -msgid "--cached cannot be used with --files" -msgstr "--cached 不能和 --files 共用" +#: git-submodule.sh:754 +msgid "The --cached option cannot be used with the --files option" +msgstr "选项 --cached 不能和选项 --files 同时使用" #. unexpected type -#: git-submodule.sh:753 +#: git-submodule.sh:794 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:771 +#: git-submodule.sh:812 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " 警告：$name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:774 +#: git-submodule.sh:815 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:777 +#: git-submodule.sh:818 #, 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:843 msgid "blob" -msgstr "blob" - -#: git-submodule.sh:803 -msgid "submodule" -msgstr "子模组" +msgstr "二进制对象" -#: git-submodule.sh:840 +#: git-submodule.sh:881 msgid "# Submodules changed but not updated:" msgstr "# 子模组已修改但尚未更新：" -#: git-submodule.sh:842 +#: git-submodule.sh:883 msgid "# Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: git-submodule.sh:974 +#: git-submodule.sh:1027 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "为 '$name' 同步子模组 url" |