diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/TEAMS | 1 | ||||
| -rw-r--r-- | po/de.po | 5944 | ||||
| -rw-r--r-- | po/git.pot | 5297 | ||||
| -rw-r--r-- | po/sv.po | 5623 | ||||
| -rw-r--r-- | po/vi.po | 6317 | ||||
| -rw-r--r-- | po/zh_CN.po | 5657 |
6 files changed, 23526 insertions, 5313 deletions
@@ -46,3 +46,4 @@ Members: Riku <lu.riku AT gmail.com> Yichao Yu <yyc1992 AT gmail.com> ws3389 <willsmith3389 AT gmail.com> Thynson <lanxingcan AT gmail.com> + Wang Sheng <wangsheng2008love@163.com> @@ -1,23 +1,23 @@ # German translations for Git. -# Copyright (C) 2010-2012 Ralf Thielow <ralf.thielow@googlemail.com> +# Copyright (C) 2010-2012 Ralf Thielow <ralf.thielow@gmail.com> # This file is distributed under the same license as the Git package. -# Ralf Thielow <ralf.thielow@googlemail.com>, 2010, 2011, 2012. +# Ralf Thielow <ralf.thielow@gmail.com>, 2010, 2011, 2012. # msgid "" msgstr "" -"Project-Id-Version: git 1.7.12\n" +"Project-Id-Version: git 1.8.2\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-09-05 06:20+0800\n" -"PO-Revision-Date: 2012-03-28 18:46+0200\n" -"Last-Translator: Ralf Thielow <ralf.thielow@googlemail.com>\n" -"Language-Team: German\n" +"POT-Creation-Date: 2013-01-25 12:33+0800\n" +"PO-Revision-Date: 2012-10-02 19:35+0200\n" +"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" +"Language-Team: German <>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: advice.c:40 +#: advice.c:45 #, c-format msgid "hint: %.*s\n" msgstr "Hinweis: %.*s\n" @@ -26,17 +26,112 @@ msgstr "Hinweis: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:75 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" "appropriate to mark resolution and make a commit,\n" "or use 'git commit -a'." msgstr "" -"Korrigiere dies im Arbeitsbaum,\n" -"und benutze dann 'git add/rm <Datei>'\n" +"Korrigieren Sie dies im Arbeitsbaum,\n" +"und benutzen Sie dann 'git add/rm <Datei>'\n" "um die Auflösung entsprechend zu markieren und einzutragen,\n" -"oder benutze 'git commit -a'." +"oder benutzen Sie 'git commit -a'." + +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [Optionen] <Versionsreferenz> [<Pfad>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <Projektarchiv> [--exec <Programm>] [Optionen] " +"<Versionsreferenz> [Pfad...]" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <Projektarchiv> [--exec <Programm>] --list" + +#: archive.c:323 +msgid "fmt" +msgstr "Format" + +#: archive.c:323 +msgid "archive format" +msgstr "Ausgabeformat" + +#: archive.c:324 builtin/log.c:1115 +msgid "prefix" +msgstr "Prefix" + +#: archive.c:325 +msgid "prepend prefix to each pathname in the archive" +msgstr "stellt einen Präfix vor jeden Pfadnamen in der Ausgabe" + +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380 +#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 +#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "Datei" + +#: archive.c:327 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "schreibt die Ausgabe in diese Datei" + +#: archive.c:329 +msgid "read .gitattributes in working directory" +msgstr "liest .gitattributes aus dem Arbeitsverzeichnis" + +#: archive.c:330 +msgid "report archived files on stderr" +msgstr "gibt archivierte Dateien in der Standard-Fehlerausgabe aus" + +#: archive.c:331 +msgid "store only" +msgstr "nur speichern" + +#: archive.c:332 +msgid "compress faster" +msgstr "schneller komprimieren" + +#: archive.c:340 +msgid "compress better" +msgstr "besser komprimieren" + +#: archive.c:343 +msgid "list supported archive formats" +msgstr "listet unterstützte Ausgabeformate auf" + +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "Projektarchiv" + +#: archive.c:346 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "ruft das Archiv von externem Projektarchiv <Projektarchiv> ab" + +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619 +msgid "command" +msgstr "Programm" + +#: archive.c:348 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "Pfad zum externen \"git-upload-archive\"-Programm" + +#: attr.c:259 +msgid "" +"Negative patterns are forbidden in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"Verneinende Muster sind in Git-Attributen verboten.\n" +"Benutzen Sie '\\!' für führende Ausrufezeichen." #: bundle.c:36 #, c-format @@ -48,18 +143,18 @@ 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:699 +#: bundle.c:89 builtin/commit.c:674 #, 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:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -85,7 +180,7 @@ msgstr[1] "Das Paket benötigt diese %d Referenzen" msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" @@ -116,12 +211,12 @@ msgstr "kann '%s' nicht erstellen" msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ist keine Version!" @@ -211,18 +306,23 @@ msgid_plural "%lu years ago" msgstr[0] "vor %lu Jahr" msgstr[1] "vor %lu Jahren" -#: diff.c:105 +#: diff.c:111 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%.*s'\n" +" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:110 +#: diff.c:116 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " Unbekannter \"dirstat\" Parameter '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:210 +#: diff.c:194 +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" + +#: diff.c:237 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -231,32 +331,7 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:1401 -msgid " 0 files changed" -msgstr " 0 Dateien geändert" - -#: diff.c:1405 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d Datei geändert" -msgstr[1] " %d Dateien geändert" - -#: diff.c:1422 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] ", %d Zeile hinzugefügt(+)" -msgstr[1] ", %d Zeilen hinzugefügt(+)" - -#: diff.c:1433 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] ", %d Zeile entfernt(-)" -msgstr[1] ", %d Zeilen entfernt(-)" - -#: diff.c:3460 +#: diff.c:3494 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -265,6 +340,11 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" +#: diff.c:3508 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" + #: gpg-interface.c:59 msgid "could not run gpg." msgstr "konnte gpg nicht ausführen" @@ -277,17 +357,17 @@ msgstr "gpg hat die Daten nicht akzeptiert" msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: grep.c:1320 +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte nicht lesen %s" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" msgstr "'%s': %s" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" msgstr "'%s': read() zu kurz %s" @@ -299,7 +379,7 @@ msgstr "Vorhandene Git-Kommandos in '%s'" #: help.c:219 msgid "git commands available from elsewhere on your $PATH" -msgstr "Vorhandene Git-Kommandos irgendwo in deinem $PATH" +msgstr "Vorhandene Git-Kommandos irgendwo in Ihrem $PATH" #: help.c:275 #, c-format @@ -312,7 +392,7 @@ msgstr "" #: help.c:332 msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Uh oh. Keine Git-Kommandos auf deinem System vorhanden." +msgstr "Uh oh. Keine Git-Kommandos auf Ihrem System vorhanden." #: help.c:354 #, c-format @@ -320,8 +400,8 @@ msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -"Warnung: Du hast das nicht existierende Git-Kommando '%s' ausgeführt.\n" -"Setze fort unter der Annahme das du '%s' gemeint hast" +"Warnung: Sie haben das nicht existierende Git-Kommando '%s' ausgeführt.\n" +"Setze fort unter der Annahme, dass Sie '%s' gemeint haben" #: help.c:359 #, c-format @@ -342,10 +422,19 @@ msgid_plural "" "Did you mean one of these?" msgstr[0] "" "\n" -"Hast du das gemeint?" +"Haben Sie das gemeint?" msgstr[1] "" "\n" -"Hast du eines von diesen gemeint?" +"Haben Sie eines von diesen gemeint?" + +#: merge.c:56 +msgid "failed to read the cache" +msgstr "Lesen des Zwischenspeichers fehlgeschlagen" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +msgid "unable to write new index file" +msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." #: merge-recursive.c:190 #, c-format @@ -407,20 +496,20 @@ msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'" 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:921 +#: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung der internen Zusammenführung" -#: merge-recursive.c:925 +#: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:941 +#: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "nicht unterstützter Objekttyp im Baum" -#: merge-recursive.c:1020 merge-recursive.c:1034 +#: merge-recursive.c:1021 merge-recursive.c:1035 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -429,7 +518,7 @@ 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:1026 merge-recursive.c:1039 +#: merge-recursive.c:1027 merge-recursive.c:1040 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -438,20 +527,20 @@ 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:1080 +#: merge-recursive.c:1081 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1080 +#: merge-recursive.c:1081 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1136 +#: merge-recursive.c:1137 #, 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:1158 +#: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -460,191 +549,200 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Zweig \"%s\" " "und \"%s\"->\"%s\" in Zweig \"%s\"%s" -#: merge-recursive.c:1163 +#: merge-recursive.c:1164 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1217 +#: merge-recursive.c:1218 #, 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:1247 +#: merge-recursive.c:1248 #, 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:1446 +#: merge-recursive.c:1447 #, 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:1456 +#: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:1461 merge-recursive.c:1659 +#: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:1512 +#: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:1515 +#: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modify" msgstr "ändern" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modified" msgstr "geändert" -#: merge-recursive.c:1573 +#: merge-recursive.c:1574 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:1580 +#: merge-recursive.c:1581 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:1614 +#: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis der Zusammenführung existiert bereits)" -#: merge-recursive.c:1628 +#: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "automatische Zusammenführung von %s" -#: merge-recursive.c:1632 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "Unterprojekt" -#: merge-recursive.c:1633 +#: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s" -#: merge-recursive.c:1723 +#: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:1748 +#: merge-recursive.c:1749 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:1754 +#: merge-recursive.c:1755 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:1759 +#: merge-recursive.c:1760 #, 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:1769 +#: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1786 +#: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "Fataler Fehler bei der Zusammenführung. Sollte nicht passieren." -#: merge-recursive.c:1805 +#: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1814 +#: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der Bäume %s und %s fehlgeschlagen" -#: merge-recursive.c:1844 +#: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "unverarbeiteter Pfad??? %s" -#: merge-recursive.c:1889 +#: merge-recursive.c:1890 msgid "Merging:" msgstr "Zusammenführung:" -#: merge-recursive.c:1902 +#: merge-recursive.c:1903 #, 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:1939 +#: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "Zusammenführung hat keine Version zurückgegeben" -#: merge-recursive.c:1996 +#: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2008 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "Konnte Bereitstellung nicht schreiben." -#: parse-options.c:494 +#: parse-options.c:485 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:503 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:507 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:519 +#: parse-options.c:510 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: remote.c:1686 #, 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" +msgstr[0] "Ihr Zweig ist vor '%s' um %d Version.\n" +msgstr[1] "Ihr Zweig ist vor '%s' um %d Versionen.\n" + +#: remote.c:1692 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (benutzen Sie \"git push\" um lokalen Versionen herauszubringen)\n" -#: remote.c:1638 +#: remote.c:1695 #, 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] "" -"Dein Zweig ist zu '%s' um %d Version hinterher, und kann vorgespult werden.\n" +"Ihr Zweig ist zu '%s' um %d Version hinterher, und kann vorgespult werden.\n" msgstr[1] "" -"Dein Zweig ist zu '%s' um %d Versionen hinterher, und kann vorgespult " +"Ihr Zweig ist zu '%s' um %d Versionen hinterher, und kann vorgespult " "werden.\n" -#: remote.c:1646 +#: remote.c:1703 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr "" +" (benutzen Sie \"git pull\" um Ihren lokalen Zweig zu aktualisieren)\n" + +#: remote.c:1706 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -653,110 +751,113 @@ msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" -"Dein Zweig und '%s' sind divergiert,\n" +"Ihr Zweig und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Versionen.\n" msgstr[1] "" -"Dein Zweig und '%s' sind divergiert,\n" +"Ihr Zweig und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Versionen.\n" -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +#: remote.c:1716 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr "" +" (benutzen Sie \"git pull\" um Ihren Zweig mit dem externen " +"zusammenzuführen)\n" + +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -"nach Auflösung der Konflikte, markiere die korrigierten Pfade\n" +"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -"nach Auflösung der Konflikte, markiere die korrigierten Pfade\n" -"mit 'git add <Pfade>' oder 'git rm <Pfade>'und trage das Ergebnis ein mit " -"'git commit'" +"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n" +"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" +"'git commit' ein" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "Fehler bei Nachbereitung von %s" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -"Deine lokalen Änderungen würden von \"cherry-pick\" überschrieben werden." +"Ihre lokalen Änderungen würden von \"cherry-pick\" überschrieben werden." -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." -msgstr "Deine lokalen Änderungen würden von \"revert\" überschrieben werden." +msgstr "Ihre lokalen Änderungen würden von \"revert\" überschrieben werden." -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." -msgstr "Trage deine Änderungen ein oder benutze \"stash\" um fortzufahren." +msgstr "" +"Tragen Sie Ihre Änderungen ein oder benutzen Sie \"stash\" um fortzufahren." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Bereitstellungsdatei nicht schreiben" -#: sequencer.c:261 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "Konnte Version der Zweigspitze (HEAD) nicht auflösen\n" -#: sequencer.c:282 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "Konnte zwischengespeicherten Baum nicht aktualisieren\n" -#: sequencer.c:324 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "Konnte Version %s nicht parsen\n" -#: sequencer.c:329 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Konnte Elternversion %s nicht parsen\n" -#: sequencer.c:395 +#: sequencer.c:404 msgid "Your index file is unmerged." -msgstr "Deine Bereitstellungsdatei ist nicht zusammengeführt." +msgstr "Ihre Bereitstellungsdatei ist nicht zusammengeführt." -#: sequencer.c:398 -msgid "You do not have a valid HEAD" -msgstr "Du hast keine gültige Zweigspitze (HEAD)" - -#: sequencer.c:413 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" "Version %s ist eine Zusammenführung, aber die Option -m wurde nicht " "angegeben." -#: sequencer.c:421 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "Version %s hat keinen Elternteil %d" -#: sequencer.c:425 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -764,145 +865,145 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:436 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Elternversion %s nicht parsen" -#: sequencer.c:440 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "Kann keine Versionsbeschreibung für %s bekommen" -#: sequencer.c:524 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "Konnte %s nicht zurücksetzen... %s" -#: sequencer.c:525 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s nicht anwenden... %s" -#: sequencer.c:553 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "leere Menge von Versionen übergeben" -#: sequencer.c:561 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen der Bereitstellung" -#: sequencer.c:566 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren der Bereitstellung" -#: sequencer.c:624 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "Kann %s nicht während eines %s durchführen" -#: sequencer.c:646 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "Konnte Zeile %d nicht parsen." -#: sequencer.c:651 +#: sequencer.c:667 msgid "No commits parsed." msgstr "Keine Versionen geparst." -#: sequencer.c:664 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "Konnte %s nicht öffnen" -#: sequencer.c:668 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "Konnte %s nicht lesen." -#: sequencer.c:675 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Unbenutzbares Instruktionsblatt: %s" -#: sequencer.c:703 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:706 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:718 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "Fehlerhaftes Optionsblatt: %s" -#: sequencer.c:739 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:740 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "versuche \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:744 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:781 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "kann Zweigspitze (HEAD) nicht auflösen" -#: sequencer.c:783 +#: sequencer.c:799 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:3987 +#: sequencer.c:821 builtin/apply.c:4016 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" -#: sequencer.c:808 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:809 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:815 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "gespeicherte \"pre-cherry-pick\" Datei der Zweigspitze (HEAD) '%s' ist " "beschädigt" -#: sequencer.c:838 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:1000 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "Kann nicht zu initialer Version zurücksetzen." -#: sequencer.c:1001 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "Kann \"cherry-pick\" nicht in einem leerem Kopf ausführen." @@ -926,12 +1027,22 @@ msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "Zweig '%s' des entfernten Projektarchivs ist kein gefolgter Übernahmezweig" -#: wrapper.c:413 +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "konnte nicht auf '%s' zugreifen: %s" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "konnte nicht auf '%s' zugreifen" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s" -#: wrapper.c:414 +#: wrapper.c:435 msgid "no such user" msgstr "kein solcher Benutzer" @@ -943,28 +1054,30 @@ msgstr "Nicht zusammengeführte Pfade:" #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -" (benutze \"git reset %s <Datei>...\" zum Herausnehmen aus der " +" (benutzen Sie \"git reset %s <Datei>...\" zum Herausnehmen aus der " "Bereitstellung)" #: 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 " +" (benutzen Sie \"git rm --cached <Datei>...\" zum Herausnehmen aus der " "Bereitstellung)" #: wt-status.c:173 msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)" +msgstr "" +" (benutzen Sie \"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 " +" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung entsprechend zu " "markieren)" #: wt-status.c:177 msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " (benutze \"git add/rm <Datei>...\" um die Auflösung zu markieren)" +msgstr "" +" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" #: wt-status.c:188 msgid "Changes to be committed:" @@ -976,34 +1089,29 @@ msgstr "Änderungen, die nicht zum Eintragen bereitgestellt sind:" #: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " (benutze \"git add <Datei>...\" zum Bereitstellen)" +msgstr " (benutzen Sie \"git add <Datei>...\" zum Bereitstellen)" #: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " (benutze \"git add/rm <Datei>...\" zum Bereitstellen)" +msgstr " (benutzen Sie \"git add/rm <Datei>...\" zum Bereitstellen)" #: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -" (benutze \"git checkout -- <Datei>...\" um die Änderungen im " +" (benutzen Sie \"git checkout -- <Datei>...\" um die Änderungen im " "Arbeitsverzeichnis zu verwerfen)" #: 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:224 -#, c-format -msgid "%s files:" -msgstr "%s Dateien:" +" (tragen Sie ein oder verwerfen Sie den unbeobachteten oder geänderten " +"Inhalt in den Unterprojekten)" #: 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)" +msgstr " (benutzen Sie \"git %s <Datei>...\" zum Einfügen in die Eintragung)" #: wt-status.c:244 msgid "bug" @@ -1094,215 +1202,234 @@ msgstr "nicht zusammengeführt: %s" msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:785 +#: wt-status.c:787 msgid "You have unmerged paths." -msgstr "Du hast nicht zusammengeführte Pfade." +msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:790 wt-status.c:914 msgid " (fix conflicts and run \"git commit\")" -msgstr " (behebe die Konflikte und führe \"git commit\" aus)" +msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:791 +#: wt-status.c:793 msgid "All conflicts fixed but you are still merging." msgstr "" -"Alle Konflikte sind behoben, aber du bist immer noch beim Zusammenführen." +"Alle Konflikte sind behoben, aber Sie sind immer noch beim Zusammenführen." -#: wt-status.c:794 +#: wt-status.c:796 msgid " (use \"git commit\" to conclude merge)" -msgstr " (benutze \"git commit\" um die Zusammenführung abzuschließen)" +msgstr " (benutzen Sie \"git commit\" um die Zusammenführung abzuschließen)" -#: wt-status.c:804 +#: wt-status.c:806 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:807 +#: wt-status.c:809 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:811 +#: wt-status.c:813 msgid " (fix conflicts and then run \"git am --resolved\")" -msgstr " (behebe die Konflikte und führe dann \"git am --resolved\" aus)" +msgstr "" +" (beheben Sie die Konflikte und führen Sie dann \"git am --resolved\" aus)" -#: wt-status.c:813 +#: wt-status.c:815 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (benutze \"git am --skip\" um diesen Patch auszulassen)" +msgstr " (benutzen Sie \"git am --skip\" um diesen Patch auszulassen)" -#: wt-status.c:815 +#: wt-status.c:817 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -" (benutze \"git am --abort\" um den ursprünglichen Zweig wiederherzustellen)" +" (benutzen Sie \"git am --abort\" um den ursprünglichen Zweig " +"wiederherzustellen)" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:875 wt-status.c:885 msgid "You are currently rebasing." -msgstr "Du bist gerade beim Neuaufbau." +msgstr "Sie sind gerade beim Neuaufbau." -#: wt-status.c:876 +#: wt-status.c:878 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (behebe die Konflikte und führe dann \"git rebase --continue\" aus)" +msgstr "" +" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " +"aus)" -#: wt-status.c:878 +#: wt-status.c:880 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (benutze \"git rebase --skip\" um diesen Patch auszulassen)" +msgstr " (benutzen Sie \"git rebase --skip\" um diesen Patch auszulassen)" -#: wt-status.c:880 +#: wt-status.c:882 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -" (benutze \"git rebase --abort\" um den ursprünglichen Zweig auszuchecken)" +" (benutzen Sie \"git rebase --abort\" um den ursprünglichen Zweig " +"auszuchecken)" -#: wt-status.c:886 +#: wt-status.c:888 msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " (alle Konflikte behoben: führe \"git rebase --continue\" aus)" +msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:888 +#: wt-status.c:890 msgid "You are currently splitting a commit during a rebase." -msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf." +msgstr "Sie teilen gerade eine Version während eines Neuaufbaus auf." -#: wt-status.c:891 +#: wt-status.c:893 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -" (Sobald dein Arbeitsverzeichnis sauber ist, führe \"git rebase --continue" -"\" aus)" +" (Sobald Ihr Arbeitsverzeichnis sauber ist, führen Sie \"git rebase --" +"continue\" aus)" -#: wt-status.c:893 +#: wt-status.c:895 msgid "You are currently editing a commit during a rebase." -msgstr "Du editierst gerade eine Version während eines Neuaufbaus." +msgstr "Sie editieren gerade eine Version während eines Neuaufbaus." -#: wt-status.c:896 +#: wt-status.c:898 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -" (benutze \"git commit --amend\" um die aktuelle Version nachzubessern)" +" (benutzen Sie \"git commit --amend\" um die aktuelle Version nachzubessern)" -#: wt-status.c:898 +#: wt-status.c:900 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (benutze \"git rebase --continue\" sobald deine Änderungen abgeschlossen " -"sind)" +" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " +"abgeschlossen sind)" -#: wt-status.c:908 +#: wt-status.c:910 msgid "You are currently cherry-picking." -msgstr "Du führst gerade \"cherry-pick\" aus." +msgstr "Sie führen gerade \"cherry-pick\" aus." -#: wt-status.c:915 +#: wt-status.c:917 msgid " (all conflicts fixed: run \"git commit\")" -msgstr " (alle Konflikte behoben: führe \"git commit\" aus)" +msgstr " (alle Konflikte behoben: führen Sie \"git commit\" aus)" -#: wt-status.c:924 +#: wt-status.c:926 msgid "You are currently bisecting." -msgstr "Du bist gerade beim Halbieren." +msgstr "Sie sind gerade beim Halbieren." -#: wt-status.c:927 +#: wt-status.c:929 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -" (benutze \"git bisect reset\" um zum ursprünglichen Zweig zurückzukehren)" +" (benutzen Sie \"git bisect reset\" um zum ursprünglichen Zweig " +"zurückzukehren)" -#: wt-status.c:978 +#: wt-status.c:980 msgid "On branch " msgstr "Auf Zweig " -#: wt-status.c:985 +#: wt-status.c:987 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Zweig." -#: wt-status.c:997 +#: wt-status.c:999 msgid "Initial commit" msgstr "Initiale Version" -#: wt-status.c:1011 -msgid "Untracked" -msgstr "Unbeobachtete" - #: wt-status.c:1013 -msgid "Ignored" -msgstr "Ignorierte" +msgid "Untracked files" +msgstr "Unbeobachtete Dateien" #: wt-status.c:1015 +msgid "Ignored files" +msgstr "Ignorierte Dateien" + +#: wt-status.c:1017 #, c-format msgid "Untracked files not listed%s" msgstr "Unbeobachtete Dateien nicht aufgelistet%s" -#: wt-status.c:1017 +#: wt-status.c:1019 msgid " (use -u option to show untracked files)" -msgstr " (benutze die Option -u um unbeobachteten Dateien anzuzeigen)" +msgstr " (benutzen Sie die Option -u um unbeobachteten Dateien anzuzeigen)" -#: wt-status.c:1023 +#: wt-status.c:1025 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1027 +#: wt-status.c:1030 #, c-format -msgid "no changes added to commit%s\n" -msgstr "keine Änderungen zum Eintragen hinzugefügt%s\n" - -#: 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:1031 -#, c-format -msgid "nothing added to commit but untracked files present%s\n" +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien%s\n" +"keine Änderungen zum Eintragen hinzugefügt (benutzen Sie \"git add\" und/" +"oder \"git commit -a\")\n" #: wt-status.c:1033 -msgid " (use \"git add\" to track)" -msgstr " (benutze \"git add\" zum Beobachten)" - -#: 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" +msgid "no changes added to commit\n" +msgstr "keine Änderungen zum Eintragen hinzugefügt\n" #: wt-status.c:1036 -msgid " (create/copy files and use \"git add\" to track)" -msgstr " (Erstelle/Kopiere Dateien und benutze \"git add\" zum Beobachten)" +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien " +"(benutzen Sie \"git add\" zum Beobachten)\n" #: wt-status.c:1039 -msgid " (use -u to show untracked files)" -msgstr " (benutze die Option -u um unbeobachtete Dateien anzuzeigen)" +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien\n" #: wt-status.c:1042 -msgid " (working directory clean)" -msgstr " (Arbeitsverzeichnis sauber)" +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" +"nichts einzutragen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git add" +"\" zum Beobachten)\n" + +#: wt-status.c:1045 wt-status.c:1050 +#, c-format +msgid "nothing to commit\n" +msgstr "nichts einzutragen\n" + +#: wt-status.c:1048 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" +"nichts einzutragen (benutzen Sie die Option -u, um unbeobachtete Dateien " +"anzuzeigen)\n" -#: wt-status.c:1150 +#: wt-status.c:1052 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "nichts einzutragen, Arbeitsverzeichnis sauber\n" + +#: wt-status.c:1160 msgid "HEAD (no branch)" msgstr "HEAD (kein Zweig)" -#: wt-status.c:1156 +#: wt-status.c:1166 msgid "Initial commit on " msgstr "Initiale Version auf " -#: wt-status.c:1171 +#: wt-status.c:1181 msgid "behind " msgstr "hinterher " -#: wt-status.c:1174 wt-status.c:1177 +#: wt-status.c:1184 wt-status.c:1187 msgid "ahead " msgstr "voraus " -#: wt-status.c:1179 +#: wt-status.c:1189 msgid ", behind " msgstr ", hinterher " -#: compat/precompose_utf8.c:58 builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "Konnte '%s' nicht entfernen" +#: builtin/add.c:19 +msgid "git add [options] [--] <filepattern>..." +msgstr "git add [Optionen] [--] [<Dateimuster>...]" #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:67 builtin/commit.c:229 +#: builtin/add.c:67 builtin/commit.c:231 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" #: builtin/add.c:77 #, c-format msgid "remove '%s'\n" -msgstr "entferne '%s'\n" +msgstr "lösche '%s'\n" #: builtin/add.c:176 #, c-format @@ -1314,7 +1441,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht bereitgestellte Änderungen nach Aktualisierung der Bereitstellung:" -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -1351,50 +1478,105 @@ msgstr "Leerer Patch. Abgebrochen." msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:312 +#: builtin/add.c:313 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -"Die folgenden Pfade werden durch eine deiner \".gitignore\" Dateien " +"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:352 +#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253 +#: builtin/rm.c:206 +msgid "dry run" +msgstr "Probelauf" + +#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522 +#: builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "erweiterte Ausgaben" + +#: builtin/add.c:322 +msgid "interactive picking" +msgstr "interaktives Auswählen" + +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258 +msgid "select hunks interactively" +msgstr "interaktiv Bereiche auswählen" + +#: builtin/add.c:324 +msgid "edit current diff and apply" +msgstr "aktuelle Unterschiede editieren und anwenden" + +#: builtin/add.c:325 +msgid "allow adding otherwise ignored files" +msgstr "erlaubt das Hinzufügen andernfalls ignorierter Dateien" + +#: builtin/add.c:326 +msgid "update tracked files" +msgstr "aktualisiert beobachtete Dateien" + +#: builtin/add.c:327 +msgid "record only the fact that the path will be added later" +msgstr "speichert nur, dass der Pfad später hinzugefügt werden soll" + +#: builtin/add.c:328 +msgid "add changes from all tracked and untracked files" +msgstr "" +"fügt Änderungen von allen beobachteten und unbeobachteten Dateien hinzu" + +#: builtin/add.c:329 +msgid "don't add, only refresh the index" +msgstr "fügt nichts hinzu, aktualisiert nur die Bereitstellung" + +#: builtin/add.c:330 +msgid "just skip files which cannot be added because of errors" +msgstr "" +"überspringt Dateien, die aufgrund von Fehlern nicht hinzugefügt werden " +"konnten" + +#: builtin/add.c:331 +msgid "check if - even missing - files are ignored in dry run" +msgstr "prüft ob - auch fehlende - Dateien im Probelauf ignoriert werden" + +#: builtin/add.c:353 #, c-format msgid "Use -f if you really want to add them.\n" -msgstr "Verwende -f wenn du diese wirklich hinzufügen möchtest.\n" +msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n" -#: builtin/add.c:353 +#: builtin/add.c:354 msgid "no files added" msgstr "keine Dateien hinzugefügt" -#: builtin/add.c:359 +#: builtin/add.c:360 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:391 +#: builtin/add.c:392 msgid "-A and -u are mutually incompatible" -msgstr "-A und -u sind zueinander inkompatibel" +msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:393 +#: builtin/add.c:394 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -"Die Option --ignore-missing kann nur zusammen mit --dry-run benutzt werden." +"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden." -#: builtin/add.c:413 +#: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:414 +#: builtin/add.c:415 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Wolltest du vielleicht 'git add .' sagen?\n" +msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82 +#: builtin/rm.c:235 msgid "index file corrupt" msgstr "Bereitstellungsdatei beschädigt" -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." @@ -1451,17 +1633,17 @@ msgstr "" 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:1402 +#: builtin/apply.c:1420 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1459 +#: builtin/apply.c:1477 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1476 +#: builtin/apply.c:1494 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1476,70 +1658,66 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: builtin/apply.c:1636 +#: builtin/apply.c:1654 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1638 +#: builtin/apply.c:1656 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1664 +#: builtin/apply.c:1682 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1700 +#: builtin/apply.c:1718 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1702 +#: builtin/apply.c:1720 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1705 +#: builtin/apply.c:1723 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1851 +#: builtin/apply.c:1869 #, 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:1880 +#: builtin/apply.c:1898 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:1966 +#: builtin/apply.c:1984 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2056 +#: builtin/apply.c:2074 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2060 +#: builtin/apply.c:2078 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2131 -msgid "oops" -msgstr "Ups" - -#: builtin/apply.c:2653 +#: builtin/apply.c:2682 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2771 +#: builtin/apply.c:2800 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -1547,12 +1725,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:2783 +#: builtin/apply.c:2812 #, 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:2789 +#: builtin/apply.c:2818 #, c-format msgid "" "while searching for:\n" @@ -1561,339 +1739,340 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2808 +#: builtin/apply.c:2837 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:2911 +#: builtin/apply.c:2940 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:2917 +#: builtin/apply.c:2946 #, 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:2938 +#: builtin/apply.c:2967 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3060 +#: builtin/apply.c:3089 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 +#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3138 builtin/apply.c:3360 +#: builtin/apply.c:3167 builtin/apply.c:3389 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3219 builtin/apply.c:3374 +#: builtin/apply.c:3248 builtin/apply.c:3403 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht bereitgestellt" -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 +#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3228 builtin/apply.c:3382 +#: builtin/apply.c:3257 builtin/apply.c:3411 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Bereitstellung" -#: builtin/apply.c:3330 +#: builtin/apply.c:3359 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3399 +#: builtin/apply.c:3428 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3401 +#: builtin/apply.c:3430 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3502 +#: builtin/apply.c:3531 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3505 +#: builtin/apply.c:3534 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3525 +#: builtin/apply.c:3554 #, 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:3530 +#: builtin/apply.c:3559 #, 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:3538 +#: builtin/apply.c:3567 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3551 +#: builtin/apply.c:3580 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s..." -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:3749 +#: builtin/apply.c:3778 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus der Bereitstellung entfernen" -#: builtin/apply.c:3777 +#: builtin/apply.c:3806 #, c-format msgid "corrupt patch for subproject %s" msgstr "fehlerhafter Patch für Unterprojekt %s" -#: builtin/apply.c:3781 +#: builtin/apply.c:3810 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:3786 +#: builtin/apply.c:3815 #, 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:3789 builtin/apply.c:3897 +#: builtin/apply.c:3818 builtin/apply.c:3926 #, 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:3822 +#: builtin/apply.c:3851 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:3871 +#: builtin/apply.c:3900 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:3958 +#: builtin/apply.c:3987 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:3966 +#: builtin/apply.c:3995 msgid "internal error" msgstr "interner Fehler" #. Say this even without --verbose -#: builtin/apply.c:3969 +#: builtin/apply.c:3998 #, 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:3979 +#: builtin/apply.c:4008 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4000 +#: builtin/apply.c:4029 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4003 +#: builtin/apply.c:4032 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Bereich #%d zurückgewiesen." -#: builtin/apply.c:4153 +#: builtin/apply.c:4182 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4164 +#: builtin/apply.c:4193 msgid "unable to read index file" msgstr "Konnte Bereitstellungsdatei nicht lesen" -#: builtin/apply.c:4283 builtin/apply.c:4286 +#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91 +#: builtin/fetch.c:63 msgid "path" msgstr "Pfad" -#: builtin/apply.c:4284 +#: builtin/apply.c:4313 msgid "don't apply changes matching the given path" msgstr "wendet keine Änderungen im angegebenen Pfad an" -#: builtin/apply.c:4287 +#: builtin/apply.c:4316 msgid "apply changes matching the given path" msgstr "wendet Änderungen nur im angegebenen Pfad an" -#: builtin/apply.c:4289 +#: builtin/apply.c:4318 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:4290 +#: builtin/apply.c:4319 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:4293 +#: builtin/apply.c:4322 msgid "ignore additions made by the patch" msgstr "ignoriert hinzugefügte Zeilen des Patches" -#: builtin/apply.c:4295 +#: builtin/apply.c:4324 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:4299 -msgid "shows number of added and deleted lines in decimal notation" +#: builtin/apply.c:4328 +msgid "show number of added and deleted lines in decimal notation" msgstr "" "zeigt die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation" -#: builtin/apply.c:4301 +#: builtin/apply.c:4330 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:4303 +#: builtin/apply.c:4332 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:4305 +#: builtin/apply.c:4334 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:4307 +#: builtin/apply.c:4336 msgid "apply a patch without touching the working tree" msgstr "wendet einen Patch an, ohne Änderungen im Arbeitszweig vorzunehmen" -#: builtin/apply.c:4309 +#: builtin/apply.c:4338 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4311 +#: builtin/apply.c:4340 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:4313 +#: builtin/apply.c:4342 msgid "build a temporary index based on embedded index information" msgstr "" "erstellt eine temporäre Bereitstellung basierend auf den integrierten " "Bereitstellungsinformationen" -#: builtin/apply.c:4315 +#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4318 +#: builtin/apply.c:4347 msgid "ensure at least <n> lines of context match" -msgstr "" -"stellt sicher, dass mindestens <Anzahl> Zeilen des Kontextes übereinstimmen" +msgstr "stellt sicher, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4319 +#: builtin/apply.c:4348 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4320 +#: builtin/apply.c:4349 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:4323 builtin/apply.c:4326 +#: builtin/apply.c:4352 builtin/apply.c:4355 msgid "ignore changes in whitespace when finding context" msgstr "ignoriert Änderungen in Leerzeichen bei der Suche des Kontextes" -#: builtin/apply.c:4329 +#: builtin/apply.c:4358 msgid "apply the patch in reverse" msgstr "wendet den Patch in umgekehrter Reihenfolge an" -#: builtin/apply.c:4331 +#: builtin/apply.c:4360 msgid "don't expect at least one line of context" msgstr "erwartet keinen Kontext" -#: builtin/apply.c:4333 +#: builtin/apply.c:4362 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "hinterlässt zurückgewiesene Patch-Bereiche in den entsprechenden *.rej " "Dateien" -#: builtin/apply.c:4335 +#: builtin/apply.c:4364 msgid "allow overlapping hunks" msgstr "erlaubt sich überlappende Patch-Bereiche" -#: builtin/apply.c:4336 -msgid "be verbose" -msgstr "erweiterte Ausgaben" - -#: builtin/apply.c:4338 +#: builtin/apply.c:4367 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "toleriert fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende" -#: builtin/apply.c:4341 +#: builtin/apply.c:4370 msgid "do not trust the line counts in the hunk headers" msgstr "vertraut nicht den Zeilennummern im Kopf des Patch-Bereiches" -#: builtin/apply.c:4343 +#: builtin/apply.c:4372 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4344 +#: builtin/apply.c:4373 msgid "prepend <root> to all filenames" msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen" -#: builtin/apply.c:4366 +#: builtin/apply.c:4395 msgid "--3way outside a repository" -msgstr "--3way außerhalb eines Projektarchivs" +msgstr "" +"Die Option --3way kann nicht außerhalb eines Projektarchivs verwendet werden." -#: builtin/apply.c:4374 +#: builtin/apply.c:4403 msgid "--index outside a repository" -msgstr "--index außerhalb eines Projektarchivs" +msgstr "" +"Die Option --index kann nicht außerhalb eines Projektarchivs verwendet " +"werden." -#: builtin/apply.c:4377 +#: builtin/apply.c:4406 msgid "--cached outside a repository" -msgstr "--cached außerhalb eines Projektarchivs" +msgstr "" +"Die Option --cached kann nicht außerhalb eines Projektarchivs verwendet " +"werden." -#: builtin/apply.c:4393 +#: builtin/apply.c:4422 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4407 +#: builtin/apply.c:4436 #, 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:4413 builtin/apply.c:4423 +#: builtin/apply.c:4442 builtin/apply.c:4452 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1935,7 +2114,136 @@ msgstr "git archive: Protokollfehler" msgid "git archive: expected a flush" msgstr "git archive: erwartete eine Spülung (flush)" -#: builtin/branch.c:144 +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "führt 'git bisect next' aus" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "aktualisiert BISECT_HEAD, anstatt die aktuelle Version auszuchecken" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [Optionen] [rev-opts] [rev] [--] Datei" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[rev-opts] sind dokumentiert in git-rev-list(1)" + +#: builtin/blame.c:2364 +msgid "Show blame entries as we find them, incrementally" +msgstr "Zeigt \"blame\"-Einträge schrittweise, während wir sie generieren" + +#: builtin/blame.c:2365 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "Zeigt leere SHA-1 für Grenzversionen (Standard: aus)" + +#: builtin/blame.c:2366 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Behandelt Ursprungsversionen nicht als Grenzen (Standard: aus)" + +#: builtin/blame.c:2367 +msgid "Show work cost statistics" +msgstr "Zeigt Statistiken zum Arbeitsaufwand" + +#: builtin/blame.c:2368 +msgid "Show output score for blame entries" +msgstr "Zeigt Ausgabebewertung für \"blame\"-Einträge" + +#: builtin/blame.c:2369 +msgid "Show original filename (Default: auto)" +msgstr "Zeigt ursprünglichen Dateinamen (Standard: auto)" + +#: builtin/blame.c:2370 +msgid "Show original linenumber (Default: off)" +msgstr "Zeigt ursprüngliche Zeilennummer (Standard: aus)" + +#: builtin/blame.c:2371 +msgid "Show in a format designed for machine consumption" +msgstr "Anzeige in einem Format für maschinelle Auswertung" + +#: builtin/blame.c:2372 +msgid "Show porcelain format with per-line commit information" +msgstr "" +"Anzeige in Format für Fremdprogramme mit Versionsinformationen pro Zeile" + +#: builtin/blame.c:2373 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "Benutzt den gleichen Ausgabemodus wie \"git-annotate\" (Standard: aus)" + +#: builtin/blame.c:2374 +msgid "Show raw timestamp (Default: off)" +msgstr "Zeigt unbearbeiteten Zeitstempel (Standard: aus)" + +#: builtin/blame.c:2375 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Zeigt langen Versions-SHA1 (Standard: aus)" + +#: builtin/blame.c:2376 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Unterdrückt den Namen des Autors und den Zeitstempel (Standard: aus)" + +#: builtin/blame.c:2377 +msgid "Show author email instead of name (Default: off)" +msgstr "Zeigt anstatt des Namens die Email-Adresse des Autors (Standard: aus)" + +#: builtin/blame.c:2378 +msgid "Ignore whitespace differences" +msgstr "Ignoriert Unterschiede in Leerzeichen" + +#: builtin/blame.c:2379 +msgid "Spend extra cycles to find better match" +msgstr "arbeite länger, um bessere Übereinstimmungen zu finden" + +#: builtin/blame.c:2380 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "Benutzt Revisionen von <Datei> anstatt \"git-rev-list\" aufzurufen" + +#: builtin/blame.c:2381 +msgid "Use <file>'s contents as the final image" +msgstr "Benutzt Inhalte der <Datei>en als entgültiges Abbild" + +#: builtin/blame.c:2382 builtin/blame.c:2383 +msgid "score" +msgstr "Bewertung" + +#: builtin/blame.c:2382 +msgid "Find line copies within and across files" +msgstr "Findet kopierte Zeilen innerhalb oder zwischen Dateien" + +#: builtin/blame.c:2383 +msgid "Find line movements within and across files" +msgstr "Findet verschobene Zeilen innerhalb oder zwischen Dateien" + +#: builtin/blame.c:2384 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:2384 +msgid "Process only line range n,m, counting from 1" +msgstr "Verarbeitet nur Zeilen im Bereich n,m, gezählt von 1" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [Optionen] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "git branch [Optionen] [-l] [-f] <Zweigname> [<Startpunkt>]" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git branch [Optionen] [-r] (-d | -D) <Zweigname>..." + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [Optionen] (-m | -M) [<alterZweig>] <neuerZweig>" + +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -1945,7 +2253,7 @@ msgstr "" " '%s', aber noch nicht mit der Zweigspitze (HEAD) zusammengeführt " "wurde." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -1954,168 +2262,300 @@ msgstr "" "entferne Zweig '%s' nicht, der noch nicht zusammengeführt wurde mit\n" " '%s', obwohl er mit der Zweigspitze (HEAD) zusammengeführt wurde." +#: builtin/branch.c:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Konnte Versionsobjekt für '%s' nicht nachschlagen." + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"Der Zweig '%s' ist nicht vollständig zusammengeführt.\n" +"Wenn Sie sicher sind diesen Zweig zu entfernen, führen Sie 'git branch -D " +"%s' aus." + #: builtin/branch.c:180 +msgid "Update of config-file failed" +msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:186 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Versionsobjekt für Zweigspitze (HEAD) nicht nachschlagen." -#: builtin/branch.c:191 +#: builtin/branch.c:222 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -"Kann Zweig '%s' nicht entfernen, da du dich gerade auf diesem befindest." +"Kann Zweig '%s' nicht entfernen, da Sie sich gerade auf diesem befinden." -#: builtin/branch.c:202 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." msgstr "externer Zweig '%s' nicht gefunden" -#: builtin/branch.c:203 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "Zweig '%s' nicht gefunden." -#: builtin/branch.c:210 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "Konnte Versionsobjekt für '%s' nicht nachschlagen." - -#: builtin/branch.c:216 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"Der Zweig '%s' ist nicht vollständig zusammengeführt.\n" -"Wenn du sicher bist diesen Zweig zu entfernen, führe 'git branch -D %s' aus." - -#: builtin/branch.c:225 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Fehler beim Entfernen des externen Zweiges '%s'" -#: builtin/branch.c:226 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Zweiges '%s'" -#: builtin/branch.c:233 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Externer Zweig %s entfernt (war %s).\n" -#: builtin/branch.c:234 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Zweig %s entfernt (war %s).\n" -#: builtin/branch.c:239 -msgid "Update of config-file failed" -msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." - -#: builtin/branch.c:337 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" msgstr "Zweig '%s' zeigt auf keine Version" -#: builtin/branch.c:409 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %d hinterher]" -#: builtin/branch.c:411 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "[%d hinterher]" -#: builtin/branch.c:415 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %d voraus]" -#: builtin/branch.c:417 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "[%d voraus]" -#: builtin/branch.c:420 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %d voraus, %d hinterher]" -#: builtin/branch.c:423 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%d voraus, %d hinterher]" -#: builtin/branch.c:535 +#: builtin/branch.c:560 msgid "(no branch)" msgstr "(kein Zweig)" -#: builtin/branch.c:600 +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" -#: builtin/branch.c:613 +#: builtin/branch.c:638 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 Sie sich auf keinem befinden." -#: builtin/branch.c:623 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Zweig-Name: '%s'" -#: builtin/branch.c:638 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "Umbenennung des Zweiges fehlgeschlagen" -#: builtin/branch.c:642 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Zweig '%s' umbenannt" -#: builtin/branch.c:646 +#: builtin/branch.c:671 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Zweig umbenannt zu %s, aber Zweigspitze (HEAD) ist nicht aktualisiert!" -#: builtin/branch.c:653 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Zweig ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:668 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: builtin/branch.c:692 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "Konnte Beschreibungsvorlage für Zweig nicht schreiben: %s" -#: builtin/branch.c:783 +#: builtin/branch.c:747 +msgid "Generic options" +msgstr "Allgemeine Optionen" + +#: builtin/branch.c:749 +msgid "show hash and subject, give twice for upstream branch" +msgstr "Zeigt Hash und Betreff; -vv: zusätzlich externen Übernahmezweig" + +#: builtin/branch.c:750 +msgid "suppress informational messages" +msgstr "unterdrückt Informationsmeldungen" + +#: builtin/branch.c:751 +msgid "set up tracking mode (see git-pull(1))" +msgstr "stellt den Übernahmemodus ein (siehe git-pull(1))" + +#: builtin/branch.c:753 +msgid "change upstream info" +msgstr "ändert Informationen zum externen Übernahmezweig" + +#: builtin/branch.c:757 +msgid "use colored output" +msgstr "verwendet farbliche Ausgaben" + +#: builtin/branch.c:758 +msgid "act on remote-tracking branches" +msgstr "wirkt auf externe Übernahmezweige" + +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379 +#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470 +msgid "commit" +msgstr "Version" + +#: builtin/branch.c:762 builtin/branch.c:768 +msgid "print only branches that contain the commit" +msgstr "gibt nur Zweige aus, welche diese Version beinhalten" + +#: builtin/branch.c:774 +msgid "Specific git-branch actions:" +msgstr "spezifische Aktionen für \"git-branch\":" + +#: builtin/branch.c:775 +msgid "list both remote-tracking and local branches" +msgstr "listet externe Übernahmezweige und lokale Zweige auf" + +#: builtin/branch.c:777 +msgid "delete fully merged branch" +msgstr "entfernt vollständig zusammengeführten Zweig" + +#: builtin/branch.c:778 +msgid "delete branch (even if not merged)" +msgstr "löscht Zweig (auch wenn nicht zusammengeführt)" + +#: builtin/branch.c:779 +msgid "move/rename a branch and its reflog" +msgstr "verschiebt/benennt einen Zweig und dessen Referenzprotokoll um" + +#: builtin/branch.c:780 +msgid "move/rename a branch, even if target exists" +msgstr "" +"verschiebt/benennt einen Zweig um, auch wenn das Ziel bereits existiert" + +#: builtin/branch.c:781 +msgid "list branch names" +msgstr "listet Zweignamen auf" + +#: builtin/branch.c:782 +msgid "create the branch's reflog" +msgstr "erzeugt das Referenzprotokoll des Zweiges" + +#: builtin/branch.c:784 +msgid "edit the description for the branch" +msgstr "bearbeitet die Beschreibung für den Zweig" + +#: builtin/branch.c:785 +msgid "force creation (when already exists)" +msgstr "erzeuge auch, wenn der Zweig bereits existiert" + +#: builtin/branch.c:788 +msgid "print only not merged branches" +msgstr "gibt nur Zweige aus, die nicht zusammengeführt sind" + +#: builtin/branch.c:794 +msgid "print only merged branches" +msgstr "gibt nur Zweige aus, die zusammengeführt sind" + +#: builtin/branch.c:798 +msgid "list branches in columns" +msgstr "listet Zweige in Spalten auf" + +#: builtin/branch.c:811 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:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "Zweigspitze (HEAD) wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:808 +#: builtin/branch.c:836 msgid "--column and --verbose are incompatible" -msgstr "--column und --verbose sind inkompatibel" +msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:857 +#: builtin/branch.c:887 +#, c-format +msgid "branch '%s' does not exist" +msgstr "Zweig '%s' existiert nicht" + +#: builtin/branch.c:899 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Zweig '%s' hat keinen externen Übernahmezweig gesetzt" + +#: builtin/branch.c:914 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -"Die Optionen -a und -r bei 'git branch' machen mit einem Zweignamen keinen " -"Sinn." +"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " +"Zweignamen verwendet werden." + +#: builtin/branch.c:917 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" +"track oder --set-upstream-to\n" + +#: builtin/branch.c:934 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"Wenn Sie wollten, dass '%s' den Zweig '%s' als externen Übernahmezweig hat, " +"führen Sie aus:\n" + +#: builtin/branch.c:935 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" + +#: builtin/branch.c:936 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" #: builtin/bundle.c:47 #, c-format @@ -2130,95 +2570,229 @@ 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:114 builtin/checkout.c:147 +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "git cat-file (-t|-s|-e|-p|<Art>|--textconv) <Objekt>" + +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <Liste_von_Objekten>" + +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<Art> kann sein: blob, tree, commit, tag" + +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "zeigt Objektart" + +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "zeigt Objektgröße" + +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" +msgstr "beendet mit Rückgabewert 0, wenn kein Fehler aufgetreten ist" + +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" +msgstr "ansprechende Anzeige des Objektinhaltes" + +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" +msgstr "führt eine Textkonvertierung auf den Inhalt von Blob-Objekten aus" + +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" +msgstr "" +"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" +"Eingabe" + +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" +msgstr "" +"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | Attribut...] [--] Pfadname..." + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "" +"git check-attr --stdin [-z] [-a | --all | Attribut...] < <Liste-von-Pfaden>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "gibt alle Attribute einer Datei aus" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "verwendet .gitattributes nur von der Bereitstellung" + +#: builtin/check-attr.c:21 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "liest Dateinamen von der Standard-Eingabe" + +#: builtin/check-attr.c:23 +msgid "input paths are terminated by a null character" +msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [Optionen] [--] [<Datei>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "checkt alle Dateien in der Bereitstellung aus" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "erzwingt das Überschreiben bereits existierender Dateien" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "" +"keine Warnung für existierende Dateien, und Dateien, die sich nicht in der " +"Bereitstellung befinden" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "checkt keine neuen Dateien aus" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "aktualisiert Dateiinformationen in der Bereitstellungsdatei" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "liest eine Liste von Pfaden von der Standard-Eingabe" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "schreibt den Inhalt in temporäre Dateien" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "Zeichenkette" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "" +"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "kopiert Dateien von dem benannten Stand" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [Optionen] <Zweig>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [Optionen] [Zweig>] -- <Datei>..." + +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:118 builtin/checkout.c:151 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:132 +#: builtin/checkout.c:134 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:176 +#: builtin/checkout.c:178 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:193 +#: builtin/checkout.c:195 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:210 +#: builtin/checkout.c:212 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Ergebnis der Zusammenführung von '%s' nicht hinzufügen." -#: builtin/checkout.c:235 builtin/checkout.c:392 +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' kann nicht mit Pfaden verwendet werden" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "'%s' kann nicht mit '%s' verwendet werden" + +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "Kann nicht gleichzeitig Pfade aktualisieren und zu Zweig '%s' wechseln" + +#: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" msgstr "beschädigte Bereitstellungsdatei" -#: builtin/checkout.c:265 builtin/checkout.c:272 +#: builtin/checkout.c:295 builtin/checkout.c:302 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" -msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." - -#: builtin/checkout.c:414 +#: builtin/checkout.c:448 msgid "you need to resolve your current index first" -msgstr "Du musst zuerst deine aktuelle Bereitstellung auflösen." +msgstr "Sie müssen zuerst Ihre aktuelle Bereitstellung auflösen." -#: builtin/checkout.c:533 +#: builtin/checkout.c:569 #, 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:602 msgid "HEAD is now at" msgstr "Zweigspitze (HEAD) ist jetzt bei" -#: builtin/checkout.c:573 +#: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" -msgstr "Setze Zweig '%s' zurück\n" +msgstr "Setze Zweig '%s' neu\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:612 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:616 #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "Gewechselt zu zurückgesetztem Zweig '%s'\n" +msgstr "Gewechselt zu neu gesetztem Zweig '%s'\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:618 builtin/checkout.c:955 #, 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:620 #, c-format msgid "Switched to branch '%s'\n" msgstr "Gewechselt zu Zweig '%s'\n" -#: builtin/checkout.c:640 +#: builtin/checkout.c:676 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:682 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2231,17 +2805,17 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Warnung: Du bist um %d Version hinterher, nicht verbunden zu\n" -"einem deiner Zweige:\n" +"Warnung: Sie sind um %d Version hinterher, nicht verbunden zu\n" +"einem Ihrer Zweige:\n" "\n" "%s\n" msgstr[1] "" -"Warnung: Du bist um %d Versionen hinterher, nicht verbunden zu\n" -"einem deiner Zweige:\n" +"Warnung: Sie sind um %d Versionen hinterher, nicht verbunden zu\n" +"einem Ihrer Zweige:\n" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:700 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2250,125 +2824,234 @@ msgid "" " git branch new_branch_name %s\n" "\n" msgstr "" -"Wenn du diese durch einen neuen Zweig behalten möchtest, dann könnte jetzt\n" +"Wenn Sie diese durch einen neuen Zweig behalten möchten, dann könnte jetzt\n" "ein guter Zeitpunkt sein dies zu tun mit:\n" "\n" " git branch neuer_zweig_name %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:730 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:698 +#: builtin/checkout.c:734 msgid "Previous HEAD position was" msgstr "Vorherige Position der Zweigspitze (HEAD) war" -#: builtin/checkout.c:724 builtin/checkout.c:919 +#: builtin/checkout.c:761 builtin/checkout.c:950 msgid "You are on a branch yet to be born" -msgstr "du bist auf einem Zweig, der noch geboren wird" +msgstr "Sie sind auf einem Zweig, der noch geboren wird" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:886 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:925 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein Baum: %s" -#: builtin/checkout.c:976 -msgid "-B cannot be used with -b" -msgstr "-B kann nicht mit -b benutzt werden" +#: builtin/checkout.c:964 +msgid "paths cannot be used with switching branches" +msgstr "Pfade können nicht beim Wechseln von Zweigen verwendet werden" -#: builtin/checkout.c:985 -msgid "--patch is incompatible with all other options" -msgstr "--patch ist inkompatibel mit allen anderen Optionen" +#: builtin/checkout.c:967 builtin/checkout.c:971 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' kann nicht beim Wechseln von Zweigen verwendet werden" -#: builtin/checkout.c:988 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden" +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:990 -msgid "--detach cannot be used with -t" -msgstr "--detach kann nicht mit -t benutzt werden" +#: builtin/checkout.c:991 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Kann Zweig nicht zu Nicht-Version '%s' wechseln" -#: builtin/checkout.c:996 -msgid "--track needs a branch name" -msgstr "--track benötigt einen Zweignamen" +#: builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "unterdrückt Fortschrittsanzeige" -#: builtin/checkout.c:1003 -msgid "Missing branch name; try -b" -msgstr "Vermisse Zweignamen; versuche -b" +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "Zweig" -#: builtin/checkout.c:1009 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan und -b|-B sind gegenseitig exklusiv" +#: builtin/checkout.c:1014 +msgid "create and checkout a new branch" +msgstr "erzeugt und checkt einen neuen Zweig aus" -#: builtin/checkout.c:1011 -msgid "--orphan cannot be used with -t" -msgstr "--orphan kann nicht mit -t benutzt werden" +#: builtin/checkout.c:1016 +msgid "create/reset and checkout a branch" +msgstr "erzeugt/setzt neu und checkt einen Zweig aus" + +#: builtin/checkout.c:1017 +msgid "create reflog for new branch" +msgstr "erzeugt Referenzprotokoll für den neuen Zweig" + +#: builtin/checkout.c:1018 +msgid "detach the HEAD at named commit" +msgstr "setzt die Zweigspitze (HEAD) zu benannter Version" + +#: builtin/checkout.c:1019 +msgid "set upstream info for new branch" +msgstr "setzt Informationen zum externen Übernahmezweig für den neuen Zweig" + +#: builtin/checkout.c:1021 +msgid "new branch" +msgstr "neuer Zweig" #: builtin/checkout.c:1021 -msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout: -f und -m sind inkompatibel" +msgid "new unparented branch" +msgstr "neuer Zweig ohne Elternversion" + +#: builtin/checkout.c:1022 +msgid "checkout our version for unmerged files" +msgstr "checkt unsere Variante für nicht zusammengeführte Dateien aus" + +#: builtin/checkout.c:1024 +msgid "checkout their version for unmerged files" +msgstr "checkt ihre Variante für nicht zusammengeführte Dateien aus" + +#: builtin/checkout.c:1026 +msgid "force checkout (throw away local modifications)" +msgstr "erzwingt Auschecken (verwirft lokale Änderungen)" + +#: builtin/checkout.c:1027 +msgid "perform a 3-way merge with the new branch" +msgstr "führt eine 3-Wege-Zusammenführung mit dem neuen Zweig aus" + +#: builtin/checkout.c:1028 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "aktualisiert ignorierte Dateien (Standard)" + +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 +msgid "style" +msgstr "Stil" + +#: builtin/checkout.c:1030 +msgid "conflict style (merge or diff3)" +msgstr "Konfliktstil (merge oder diff3)" + +#: builtin/checkout.c:1033 +msgid "second guess 'git checkout no-such-branch'" +msgstr "second guess 'git checkout no-such-branch'" + +#: builtin/checkout.c:1057 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1074 +msgid "--track needs a branch name" +msgstr "Bei der Option --track muss ein Zweigname angegeben werden." + +#: builtin/checkout.c:1081 +msgid "Missing branch name; try -b" +msgstr "Vermisse Zweignamen; versuchen Sie -b" + +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1123 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" +"Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " -"von Zweigen.\n" -"Hast du beabsichtigt '%s' auszuchecken, welcher nicht als Version aufgelöst " -"werden kann?" - -#: builtin/checkout.c:1065 -msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "" -"git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " -"von Zweigen." +"Kann nicht gleichzeitig Pfade aktualisieren und zu Zweig '%s' wechseln.\n" +"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Version " +"aufgelöst werden kann?" -#: builtin/checkout.c:1070 -msgid "git checkout: --detach does not take a path argument" -msgstr "git checkout: --detach nimmt kein Pfad-Argument" +#: builtin/checkout.c:1128 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1073 +#: builtin/checkout.c:1132 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" -"du aus der Bereitstellung auscheckst." +"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" +"Sie aus der Bereitstellung auschecken." + +#: builtin/clean.c:20 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "git clean [-d] [-f] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..." + +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "Lösche %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "Würde %s löschen\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Überspringe Projektarchiv %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Würde Projektarchiv %s überspringen\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "Fehler beim Löschen von %s" + +#: builtin/clean.c:159 +msgid "do not print names of files removed" +msgstr "gibt keine Namen von gelöschten Dateien aus" + +#: builtin/clean.c:161 +msgid "force" +msgstr "erzwingt Aktion" + +#: builtin/clean.c:163 +msgid "remove whole directories" +msgstr "löscht ganze Verzeichnisse" + +#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182 +msgid "pattern" +msgstr "Muster" -#: builtin/checkout.c:1092 -msgid "Cannot switch branch to a non-commit." -msgstr "Kann Zweig nur zu einer Version wechseln." +#: builtin/clean.c:165 +msgid "add <pattern> to ignore rules" +msgstr "fügt <Muster> zu den Regeln für ignorierte Pfade hinzu" -#: builtin/checkout.c:1095 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs ist inkompatibel mit den Wechseln von Zweigen." +#: builtin/clean.c:166 +msgid "remove ignored files, too" +msgstr "löscht auch ignorierte Dateien" + +#: builtin/clean.c:168 +msgid "remove only ignored files" +msgstr "löscht nur ignorierte Dateien" -#: builtin/clean.c:78 +#: builtin/clean.c:186 msgid "-x and -X cannot be used together" -msgstr "-x und -X können nicht zusammen benutzt werden" +msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:82 +#: builtin/clean.c:190 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -n noch -f gegeben; " "Säuberung verweigert" -#: builtin/clean.c:85 +#: builtin/clean.c:193 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" @@ -2376,30 +3059,99 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -n noch -f " "gegeben; Säuberung verweigert" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "Würde %s entfernen\n" +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [Optionen] [--] <Projektarchiv> [<Verzeichnis>]" -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "Entferne %s\n" +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:407 +msgid "force progress reporting" +msgstr "erzwingt Fortschrittsanzeige" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "Fehler beim Entfernen von %s" +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "kein Auschecken" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "Würde nicht entfernen %s\n" +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "erstellt ein bloßes Projektarchiv" -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "Entferne nicht %s\n" +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "erstellt ein Spiegelarchiv (impliziert bloßes Projektarchiv)" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "um von einem lokalen Projektarchiv zu klonen" + +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" +msgstr "verwendet lokal keine harten Links, immer Kopien" + +#: builtin/clone.c:78 +msgid "setup as shared repository" +msgstr "Einrichtung als verteiltes Projektarchiv" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "initialisiert Unterprojekte im Klon" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "Vorlagenverzeichnis" + +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" + +#: builtin/clone.c:86 +msgid "reference repository" +msgstr "referenziert Projektarchiv" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "Name" + +#: builtin/clone.c:88 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "verwendet <Name> statt 'origin' für externes Projektarchiv" + +#: builtin/clone.c:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "" +"checkt <Zweig> aus, anstatt Zweigspitze (HEAD) des externen Projektarchivs" + +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" +msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" + +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 +msgid "depth" +msgstr "Tiefe" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "erstellt einen flachen Klon mit dieser Tiefe" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "klont nur einen Zweig, Zweigspitze (HEAD) oder --branch" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr ".git-Verzeichnis" + +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "separiert Git-Verzeichnis vom Arbeitsbaum" + +#: builtin/clone.c:99 +msgid "key=value" +msgstr "Schlüssel=Wert" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" +msgstr "setzt Konfiguration innerhalb des neuen Projektarchivs" #: builtin/clone.c:243 #, c-format @@ -2426,6 +3178,11 @@ msgstr "%s existiert und ist kein Verzeichnis" msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" +#: builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "Konnte '%s' nicht entfernen" + #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -2452,77 +3209,119 @@ msgstr "" "Externe Zweigspitze (HEAD) bezieht sich auf eine nicht existierende Referenz " "und kann nicht ausgecheckt werden.\n" -#: builtin/clone.c:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:646 +#: builtin/clone.c:694 msgid "You must specify a repository to clone." -msgstr "Du musst ein Projektarchiv zum Klonen angeben." +msgstr "Sie müssen ein Projektarchiv zum Klonen angeben." -#: builtin/clone.c:657 +#: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." -msgstr "--bare und --origin %s Optionen sind inkompatibel." +msgstr "Die Optionen --bare und --origin %s sind inkompatibel." + +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:671 +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "Projektarchiv '%s' existiert nicht." -#: builtin/clone.c:676 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth wird in lokalen Klonen ignoriert; benutze stattdessen file://." +msgstr "" +"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " +"stattdessen file://" -#: builtin/clone.c:686 +#: builtin/clone.c:736 #, 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:696 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsbaum '%s' existiert bereits." -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:759 builtin/clone.c:773 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:712 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." -#: builtin/clone.c:731 +#: builtin/clone.c:783 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in bloßes Projektarchiv '%s'...\n" -#: builtin/clone.c:733 +#: builtin/clone.c:785 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s'...\n" -#: builtin/clone.c:789 +#: builtin/clone.c:827 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:838 +#: builtin/clone.c:876 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "externer Zweig %s nicht im anderen Projektarchiv %s gefunden" -#: builtin/clone.c:845 +#: builtin/clone.c:883 msgid "You appear to have cloned an empty repository." -msgstr "Du scheinst ein leeres Projektarchiv geklont zu haben." +msgstr "Sie scheinen ein leeres Projektarchiv geklont zu haben." + +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [Optionen]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "schlägt Konfigurationsvariablen nach" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "zu verwendende Anordnung" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "maximale Breite" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "Abstand zum linken Rand" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "Abstand zur rechten Rand" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "Abstand zwischen Spalten" #: builtin/column.c:51 msgid "--command must be the first argument" -msgstr "Option --command muss zuerst angegeben werden" +msgstr "Die Option --command muss an erster Stelle stehen." -#: builtin/commit.c:43 +#: builtin/commit.c:34 +msgid "git commit [options] [--] <filepattern>..." +msgstr "git commit [Optionen] [--] <Dateimuster>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <filepattern>..." +msgstr "git status [Optionen] [--] <Dateimuster>..." + +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2535,30 +3334,30 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Dein Name und E-Mail Adresse wurden automatisch auf Basis\n" -"deines Benutzer- und Rechnernamens konfiguriert. Bitte prüfe, dass diese\n" -"zutreffend sind. Du kannst diese Meldung unterdrücken, indem du diese\n" -"explizit setzt:\n" +"Ihr Name und E-Mail Adresse wurden automatisch auf Basis\n" +"Ihres Benutzer- und Rechnernamens konfiguriert. Bitte prüfen Sie, dass\n" +"diese zutreffend sind. Sie können diese Meldung unterdrücken, indem Sie\n" +"diese explizit setzen:\n" "\n" -" git config --global user.name \"Dein Name\"\n" -" git config --global user.email deine@emailadresse.de\n" +" git config --global user.name \"Ihr Name\"\n" +" git config --global user.email ihre@emailadresse.de\n" "\n" -"Nachdem du das getan hast, kannst du deine Identität für diese Version " +"Nachdem Sie das getan hast, können Sie Ihre Identität für diese Version " "ändern mit:\n" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Du fragtest die jüngste Version nachzubessern, aber das würde diese leer\n" -"machen. Du kannst Dein Kommando mit --allow-empty wiederholen, oder die\n" +"Sie fragten die jüngste Version nachzubessern, aber das würde diese leer\n" +"machen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder die\n" "Version mit \"git reset HEAD^\" vollständig entfernen.\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -2569,103 +3368,103 @@ msgid "" msgstr "" "Der letzte \"cherry-pick\" ist jetzt leer, möglicherweise durch eine " "Konfliktauflösung.\n" -"Wenn du dies trotzdem eintragen willst, benutze:\n" +"Wenn Sie dies trotzdem eintragen wollen, benutzen Sie:\n" "\n" " git commit --allow-empty\n" "\n" -"Andernfalls benutze bitte 'git reset'\n" +"Andernfalls benutzen Sie bitte 'git reset'\n" -#: builtin/commit.c:256 +#: builtin/commit.c:258 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des Baum-Objektes der Zweigspitze (HEAD)." -#: builtin/commit.c:298 +#: builtin/commit.c:300 msgid "unable to create temporary index" msgstr "Konnte temporäre Bereitstellung nicht erstellen." -#: builtin/commit.c:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:389 +#: builtin/commit.c:391 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:391 +#: builtin/commit.c:393 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:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "Kann Bereitstellung nicht lesen" -#: builtin/commit.c:421 +#: builtin/commit.c:423 msgid "unable to write temporary index file" msgstr "Konnte temporäre Bereitstellungsdatei nicht schreiben." -#: builtin/commit.c:496 builtin/commit.c:502 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "Ungültige Version: %s" -#: builtin/commit.c:525 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:585 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" msgstr "Fehlerhafte Identifikations-String: '%s'" -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Version %s nicht nachschlagen" -#: builtin/commit.c:635 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:637 +#: builtin/commit.c:612 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:641 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:647 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "Version hat eine leere Beschreibung" -#: builtin/commit.c:663 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:667 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:671 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/commit.c:723 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "Konnte Versionsvorlage nicht schreiben" -#: builtin/commit.c:734 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -2675,12 +3474,12 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Es sieht so aus, als trägst du eine Zusammenführung ein.\n" -"Falls das nicht korrekt ist, entferne bitte die Datei\n" +"Es sieht so aus, als tragen Sie eine Zusammenführung ein.\n" +"Falls das nicht korrekt ist, löschen Sie bitte die Datei\n" "\t%s\n" -"und versuche es erneut.\n" +"und versuchen Sie es erneut.\n" -#: builtin/commit.c:739 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -2690,199 +3489,535 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Es sieht so aus, als trägst du ein \"cherry-pick\" ein.\n" -"Falls das nicht korrekt ist, entferne bitte die Datei\n" +"Es sieht so aus, als tragen Sie ein \"cherry-pick\" ein.\n" +"Falls das nicht korrekt ist, löschen Sie bitte die Datei\n" "\t%s\n" -"und versuche es erneut.\n" +"und versuchen Sie es erneut.\n" -#: builtin/commit.c:751 +#: builtin/commit.c:735 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 "" -"Bitte gebe eine Versionsbeschreibung für deine Änderungen ein. Zeilen,\n" +"Bitte geben Sie eine Versionsbeschreibung für Ihre Änderungen ein. Zeilen,\n" "die mit '#' beginnen, werden ignoriert, und eine leere Versionsbeschreibung\n" "bricht die Eintragung ab.\n" -#: builtin/commit.c:756 +#: builtin/commit.c:740 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 "" -"Bitte gebe eine Versionsbeschreibung für deine Änderungen ein. Zeilen, die\n" -"mit '#' beginnen, werden beibehalten; wenn du möchtest, kannst du diese " +"Bitte geben Sie eine Versionsbeschreibung für Ihre Änderungen ein. Zeilen, " +"die\n" +"mit '#' beginnen, werden beibehalten; wenn Sie möchten, können Sie diese " "entfernen.\n" "Eine leere Versionsbeschreibung bricht die Eintragung ab.\n" -#: builtin/commit.c:769 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "%sAutor: %s" -#: builtin/commit.c:776 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "%sEintragender: %s" -#: builtin/commit.c:796 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "Kann Bereitstellung nicht lesen" -#: builtin/commit.c:833 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "Fehler beim Erzeugen der Zweige" -#: builtin/commit.c:848 builtin/tag.c:361 +#: builtin/commit.c:832 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:945 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" msgstr "Kein existierender Autor mit '%s' gefunden." -#: builtin/commit.c:960 builtin/commit.c:1160 +#: builtin/commit.c:944 builtin/commit.c:1148 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien" -#: builtin/commit.c:1000 +#: builtin/commit.c:984 msgid "Using both --reset-author and --author does not make sense" -msgstr "Verwendung von --reset-author und --author macht keinen Sinn." +msgstr "" +"Die Optionen --reset-author und --author können nicht gemeinsam verwendet " +"werden." -#: builtin/commit.c:1011 +#: builtin/commit.c:995 msgid "You have nothing to amend." -msgstr "Du hast nichts zum nachbessern." +msgstr "Sie haben nichts zum nachbessern." -#: builtin/commit.c:1014 +#: builtin/commit.c:998 msgid "You are in the middle of a merge -- cannot amend." msgstr "Eine Zusammenführung ist im Gange -- kann nicht nachbessern." -#: builtin/commit.c:1016 +#: builtin/commit.c:1000 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann nicht nachbessern." -#: builtin/commit.c:1019 +#: builtin/commit.c:1003 msgid "Options --squash and --fixup cannot be used together" msgstr "" -"Die Optionen --squash und --fixup können nicht gemeinsam benutzt werden." +"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1029 +#: builtin/commit.c:1013 msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "Nur eines von -c/-C/-F/--fixup kann benutzt werden." +msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1031 +#: builtin/commit.c:1015 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden" +msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden." -#: builtin/commit.c:1039 +#: builtin/commit.c:1023 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "--reset--author kann nur mit -C, -c oder --amend benutzt werden" +msgstr "" +"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1056 +#: builtin/commit.c:1040 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -"Nur eines von --include/--only/--all/--interactive/--patch kann benutzt " -"werden." +"Es kann nur eine Option von --include/--only/--all/--interactive/--patch " +"verwendet werden." -#: builtin/commit.c:1058 +#: builtin/commit.c:1042 msgid "No paths with --include/--only does not make sense." -msgstr "--include/--only machen ohne Pfade keinen Sinn." +msgstr "" +"Die Optionen --include und --only können nur mit der Angabe von Pfaden " +"verwendet werden." -#: builtin/commit.c:1060 +#: builtin/commit.c:1044 msgid "Clever... amending the last one with dirty index." msgstr "" "Klug... die letzte Version mit einer unsauberen Bereitstellung nachbessern." -#: builtin/commit.c:1062 +#: builtin/commit.c:1046 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:1072 builtin/tag.c:577 +#: builtin/commit.c:1056 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1077 +#: builtin/commit.c:1061 msgid "Paths with -a does not make sense." -msgstr "Pfade mit -a machen keinen Sinn." +msgstr "Die Option -a kann nur mit der Angabe von Pfaden verwendet werden." + +#: builtin/commit.c:1067 builtin/commit.c:1202 +msgid "--long and -z are incompatible" +msgstr "Die Optionen --long und -z sind inkompatibel." + +#: builtin/commit.c:1162 builtin/commit.c:1400 +msgid "show status concisely" +msgstr "zeigt Status im Kurzformat" + +#: builtin/commit.c:1164 builtin/commit.c:1402 +msgid "show branch information" +msgstr "zeigt Zweiginformationen" + +#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397 +msgid "machine-readable output" +msgstr "maschinenlesbare Ausgabe" + +#: builtin/commit.c:1169 builtin/commit.c:1406 +msgid "show status in long format (default)" +msgstr "zeigt Status im Langformat (Standard)" + +#: builtin/commit.c:1172 builtin/commit.c:1409 +msgid "terminate entries with NUL" +msgstr "schließt Einträge mit NUL-Zeichen ab" + +#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:461 +msgid "mode" +msgstr "Modus" + +#: builtin/commit.c:1175 builtin/commit.c:1412 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" +"zeigt nicht beobachtete Dateien, optionale Modi: all, normal, no. (Standard: " +"all)" + +#: builtin/commit.c:1178 +msgid "show ignored files" +msgstr "zeigt ignorierte Dateien" + +#: builtin/commit.c:1179 parse-options.h:151 +msgid "when" +msgstr "wann" + +#: builtin/commit.c:1180 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ignoriert Änderungen in Unterprojekten, optional wenn: all, dirty, " +"untracked. (Standard: all)" -#: builtin/commit.c:1260 +#: builtin/commit.c:1182 +msgid "list untracked files in columns" +msgstr "listet unbeobachtete Dateien in Spalten auf" + +#: builtin/commit.c:1256 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellte Version nicht nachschlagen." -#: builtin/commit.c:1262 +#: builtin/commit.c:1258 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellte Version nicht analysieren." -#: builtin/commit.c:1303 +#: builtin/commit.c:1299 msgid "detached HEAD" msgstr "losgelöste Zweigspitze (HEAD)" -#: builtin/commit.c:1305 +#: builtin/commit.c:1301 msgid " (root-commit)" msgstr " (Basis-Version)" -#: builtin/commit.c:1449 +#: builtin/commit.c:1370 +msgid "suppress summary after successful commit" +msgstr "unterdrückt Zusammenfassung nach erfolgreicher Eintragung" + +#: builtin/commit.c:1371 +msgid "show diff in commit message template" +msgstr "zeigt Unterschiede in Versionsbeschreibungsvorlage an" + +#: builtin/commit.c:1373 +msgid "Commit message options" +msgstr "Optionen für Versionsbeschreibung" + +#: builtin/commit.c:1374 builtin/tag.c:459 +msgid "read message from file" +msgstr "liest Beschreibung von Datei" + +#: builtin/commit.c:1375 +msgid "author" +msgstr "Autor" + +#: builtin/commit.c:1375 +msgid "override author for commit" +msgstr "überschreibt Autor von Version" + +#: builtin/commit.c:1376 builtin/gc.c:178 +msgid "date" +msgstr "Datum" + +#: builtin/commit.c:1376 +msgid "override date for commit" +msgstr "überschreibt Datum von Version" + +#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/tag.c:457 +msgid "message" +msgstr "Beschreibung" + +#: builtin/commit.c:1377 +msgid "commit message" +msgstr "Versionsbeschreibung" + +#: builtin/commit.c:1378 +msgid "reuse and edit message from specified commit" +msgstr "verwendet wieder und editiert Beschreibung von der angegebenen Version" + +#: builtin/commit.c:1379 +msgid "reuse message from specified commit" +msgstr "verwendet Beschreibung der angegebenen Version wieder" + +#: builtin/commit.c:1380 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"verwendet eine automatisch zusammengesetzte Beschreibung zum Nachbessern der " +"angegebenen Version" + +#: builtin/commit.c:1381 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" +"verwendet eine automatisch zusammengesetzte Beschreibung zum Zusammenführen " +"der angegebenen Version" + +#: builtin/commit.c:1382 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "Setzt Sie als Autor der Version (verwendet mit -C/-c/--amend)" + +#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "fügt 'Signed-off-by:'-Zeile hinzu" + +#: builtin/commit.c:1384 +msgid "use specified template file" +msgstr "verwendet angegebene Vorlagendatei" + +#: builtin/commit.c:1385 +msgid "force edit of commit" +msgstr "erzwingt Bearbeitung der Version" + +#: builtin/commit.c:1386 +msgid "default" +msgstr "Standard" + +#: builtin/commit.c:1386 builtin/tag.c:462 +msgid "how to strip spaces and #comments from message" +msgstr "" +"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" + +#: builtin/commit.c:1387 +msgid "include status in commit message template" +msgstr "fügt Status in die Versionsbeschreibungsvorlage ein" + +#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463 +msgid "key id" +msgstr "Schlüssel-ID" + +#: builtin/commit.c:1389 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "signiert Version mit GPG" + +#. end commit message options +#: builtin/commit.c:1392 +msgid "Commit contents options" +msgstr "Optionen für Versionsinhalt" + +#: builtin/commit.c:1393 +msgid "commit all changed files" +msgstr "trägt alle geänderten Dateien ein" + +#: builtin/commit.c:1394 +msgid "add specified files to index for commit" +msgstr "trägt die angegebenen Dateien zusätzlich zur Bereitstellung ein" + +#: builtin/commit.c:1395 +msgid "interactively add files" +msgstr "interaktives Hinzufügen von Dateien" + +#: builtin/commit.c:1396 +msgid "interactively add changes" +msgstr "interaktives Hinzufügen von Änderungen" + +#: builtin/commit.c:1397 +msgid "commit only specified files" +msgstr "trägt nur die angegebenen Dateien ein" + +#: builtin/commit.c:1398 +msgid "bypass pre-commit hook" +msgstr "umgeht \"pre-commit hook\"" + +#: builtin/commit.c:1399 +msgid "show what would be committed" +msgstr "zeigt an, was eingetragen werden würde" + +#: builtin/commit.c:1410 +msgid "amend previous commit" +msgstr "ändert vorherige Version" + +#: builtin/commit.c:1411 +msgid "bypass post-rewrite hook" +msgstr "umgeht \"post-rewrite hook\"" + +#: builtin/commit.c:1416 +msgid "ok to record an empty change" +msgstr "erlaubt Aufzeichnung einer leeren Änderung" + +#: builtin/commit.c:1419 +msgid "ok to record a change with an empty message" +msgstr "erlaubt Aufzeichnung einer Änderung mit einer leeren Beschreibung" + +#: builtin/commit.c:1451 msgid "could not parse HEAD commit" msgstr "Konnte Version der Zweigspitze (HEAD) nicht analysieren." -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1489 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1494 +#: builtin/commit.c:1496 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1503 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1520 +#: builtin/commit.c:1522 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Versionsbeschreibung nicht lesen: %s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1536 #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "Eintragung abgebrochen; du hast die Beschreibung nicht editiert.\n" +msgstr "Eintragung abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1541 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Eintragung aufgrund leerer Versionsbeschreibung abgebrochen.\n" -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Versionsobjektes." -#: builtin/commit.c:1575 +#: builtin/commit.c:1577 msgid "cannot lock HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht sperren." -#: builtin/commit.c:1579 +#: builtin/commit.c:1581 msgid "cannot update HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht aktualisieren." -#: builtin/commit.c:1590 +#: builtin/commit.c:1592 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 deine Festplatte nicht\n" -"voll und Dein Kontingent nicht aufgebraucht ist und führe\n" +"konnte nicht geschrieben werden. Prüfen Sie, dass Ihre Festplatte nicht\n" +"voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n" "anschließend \"git reset HEAD\" zu Wiederherstellung aus." +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [Optionen]" + +#: builtin/config.c:51 +msgid "Config file location" +msgstr "Ort der Konfigurationsdatei" + +#: builtin/config.c:52 +msgid "use global config file" +msgstr "verwendet globale Konfigurationsdatei" + +#: builtin/config.c:53 +msgid "use system config file" +msgstr "verwendet systemweite Konfigurationsdatei" + +#: builtin/config.c:54 +msgid "use repository config file" +msgstr "verwendet Konfigurationsdatei des Projektarchivs" + +#: builtin/config.c:55 +msgid "use given config file" +msgstr "verwendet die angegebene Konfigurationsdatei" + +#: builtin/config.c:56 +msgid "Action" +msgstr "Aktion" + +#: builtin/config.c:57 +msgid "get value: name [value-regex]" +msgstr "gibt Wert zurück: Name [Wert-regex]" + +#: builtin/config.c:58 +msgid "get all values: key [value-regex]" +msgstr "gibt alle Werte zurück: Schlüssel [Wert-regex]" + +#: builtin/config.c:59 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "gibt Werte für den regulären Ausdruck zurück: Name-regex [Wert-regex]" + +#: builtin/config.c:60 +msgid "replace all matching variables: name value [value_regex]" +msgstr "ersetzt alle passenden Variablen: Name Wert [Wert-regex] " + +#: builtin/config.c:61 +msgid "add a new variable: name value" +msgstr "fügt neue Variable hinzu: Name Wert" + +#: builtin/config.c:62 +msgid "remove a variable: name [value-regex]" +msgstr "entfernt eine Variable: Name [Wert-regex]" + +#: builtin/config.c:63 +msgid "remove all matches: name [value-regex]" +msgstr "entfernt alle Übereinstimmungen: Name [Wert-regex]" + +#: builtin/config.c:64 +msgid "rename section: old-name new-name" +msgstr "benennt eine Sektion um: alter-Name neuer-Name" + +#: builtin/config.c:65 +msgid "remove a section: name" +msgstr "entfernt eine Sektion: Name" + +#: builtin/config.c:66 +msgid "list all" +msgstr "listet alles auf" + +#: builtin/config.c:67 +msgid "open an editor" +msgstr "öffnet einen Editor" + +#: builtin/config.c:68 builtin/config.c:69 +msgid "slot" +msgstr "Slot" + +#: builtin/config.c:68 +msgid "find the color configured: [default]" +msgstr "findet die konfigurierte Farbe: [Standard]" + +#: builtin/config.c:69 +msgid "find the color setting: [stdout-is-tty]" +msgstr "findet die Farbeinstellung: [Standard-Ausgabe-ist-Terminal]" + +#: builtin/config.c:70 +msgid "Type" +msgstr "Typ" + +#: builtin/config.c:71 +msgid "value is \"true\" or \"false\"" +msgstr "Wert ist \"true\" oder \"false\"" + +#: builtin/config.c:72 +msgid "value is decimal number" +msgstr "Wert ist eine Dezimalzahl" + +#: builtin/config.c:73 +msgid "value is --bool or --int" +msgstr "Wert ist --bool oder --int" + +#: builtin/config.c:74 +msgid "value is a path (file or directory name)" +msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" + +#: builtin/config.c:75 +msgid "Other" +msgstr "Sonstiges" + +#: builtin/config.c:76 +msgid "terminate values with NUL byte" +msgstr "schließt Werte mit NUL-Byte ab" + +#: builtin/config.c:77 +msgid "respect include directives on lookup" +msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "git count-objects [-v]" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [Optionen] <committish>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [Optionen] --dirty" + #: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" @@ -2930,7 +4065,7 @@ msgid "" "However, there were unannotated tags: try --tags." msgstr "" "Keine annotierten Markierungen können '%s' beschreiben.\n" -"Jedoch gab es nicht annotierte Markierungen: versuche --tags." +"Jedoch gab es nicht annotierte Markierungen: versuchen Sie --tags." #: builtin/describe.c:357 #, c-format @@ -2939,7 +4074,7 @@ msgid "" "Try --always, or create some tags." msgstr "" "Keine Markierungen können '%s' beschreiben.\n" -"Versuche --always oder erstelle einige Markierungen." +"Versuchen Sie --always oder erstellen Sie einige Markierungen." #: builtin/describe.c:378 #, c-format @@ -2955,9 +4090,54 @@ msgstr "" "mehr als %i Markierungen gefunden; Führe die ersten %i auf\n" "Suche bei %s aufgegeben\n" +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "findet die Markierung, die nach der Version kommt" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "protokolliert die Suchstrategie in der Standard-Fehlerausgabe" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "verwendet alle Referenzen in .git/refs" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "verwendet alle Markierungen in .git/refs/tags" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "verwendet immer langes Format" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "gibt nur exakte Übereinstimmungen aus" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "betrachtet die jüngsten <n> Markierungen (Standard: 10)" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "betrachtet nur Markierungen die <Muster> entsprechen" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "zeigt gekürztes Versionsobjekt, wenn sonst nichts zutrifft" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "Kennzeichen" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "" +"fügt <Kennzeichen> bei geändertem Arbeitsbaum hinzu (Standard: \"-dirty\")" + #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" -msgstr "--long ist inkompatibel mit --abbrev=0" +msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." #: builtin/describe.c:462 msgid "No names found, cannot describe anything." @@ -2965,47 +4145,169 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben." #: builtin/describe.c:482 msgid "--dirty is incompatible with committishes" -msgstr "--dirty ist inkompatibel mit Versionen" +msgstr "Die Option --dirty kann nicht mit Versionen verwendet werden." #: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': keine reguläre Datei oder symbolischer Link" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "Kein Git-Projektarchiv" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "Mehr als %d Zweige angegeben: '%s'" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" -#: builtin/fetch.c:200 +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-opts]" + +#: builtin/fast-export.c:646 +msgid "show progress after <n> objects" +msgstr "zeigt Fortschritt nach <n> Objekten an" + +#: builtin/fast-export.c:648 +msgid "select handling of signed tags" +msgstr "wählt Behandlung von signierten Markierungen" + +#: builtin/fast-export.c:651 +msgid "select handling of tags that tag filtered objects" +msgstr "wählt Behandlung von Markierungen, die gefilterte Objekte markieren" + +#: builtin/fast-export.c:654 +msgid "Dump marks to this file" +msgstr "Schreibt Kennzeichen in diese Datei" + +#: builtin/fast-export.c:656 +msgid "Import marks from this file" +msgstr "Importiert Kennzeichen von dieser Datei" + +#: builtin/fast-export.c:658 +msgid "Fake a tagger when tags lack one" +msgstr "" +"erzeugt künstlich einen Markierungsersteller, wenn die Markierung keinen hat" + +#: builtin/fast-export.c:660 +msgid "Output full tree for each commit" +msgstr "gibt für jede Version den gesamten Baum aus" + +#: builtin/fast-export.c:662 +msgid "Use the done feature to terminate the stream" +msgstr "Benutzt die \"done\"-Funktion um den Strom abzuschließen" + +#: builtin/fast-export.c:663 +msgid "Skip output of blob data" +msgstr "Überspringt Ausgabe von Blob-Daten" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<Optionen>] [<Projektarchiv> [<Referenzspezifikation>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<Optionen>] <Gruppe>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<Optionen>] [(<Projektarchiv> | <Gruppe>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<Optionen>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "fordert von allen externen Projektarchiven an" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "hängt an .git/FETCH_HEAD an, anstatt zu überschreiben" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "erzwingt das Überschreiben von lokalen Zweigen" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "fordert von mehreren externen Projektarchiven an" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "fordert alle Markierungen und verbundene Objekte an" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "fordert nicht alle Markierungen an (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "" +"entfernt externe Übernahmezweige, die sich nicht mehr im Fernarchiv befinden" + +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "bei-Bedarf" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "kontrolliert rekursive Anforderungen von Unterprojekten" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "behält heruntergeladenes Paket" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "erlaubt Aktualisierung der \"HEAD\"-Referenz" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "vertieft die Historie eines flachen Klon" + +#: builtin/fetch.c:85 builtin/log.c:1119 +msgid "dir" +msgstr "Verzeichnis" + +#: builtin/fetch.c:86 +msgid "prepend this to submodule path output" +msgstr "stellt dies an die Ausgabe der Unterprojekt-Pfade voran" + +#: builtin/fetch.c:89 +msgid "default mode for recursion" +msgstr "Standard-Modus für Rekursion" + +#: builtin/fetch.c:201 msgid "Couldn't find remote ref HEAD" msgstr "Konnte externe Referenz der Zweigspitze (HEAD) nicht finden." -#: builtin/fetch.c:253 +#: builtin/fetch.c:254 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" @@ -3076,8 +4378,8 @@ msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"Einige lokale Referenzen konnten nicht aktualisiert werden; versuche\n" -"'git remote prune %s' um jeden älteren, widersprüchlichen Zweig zu entfernen." +"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" +"'git remote prune %s' um jeden älteren, widersprüchlichen Zweig zu löschen." #: builtin/fetch.c:549 #, c-format @@ -3119,47 +4421,166 @@ msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:891 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:890 builtin/remote.c:100 +#: builtin/fetch.c:893 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:907 +#: builtin/fetch.c:912 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Kein externes Projektarchiv angegeben. Bitte gebe entweder eine URL\n" +"Kein externes Projektarchiv angegeben. Bitte geben Sie entweder eine URL\n" "oder den Namen des externen Archivs an, von welchem neue\n" -"Versionen angefordert werden sollen." +"Revisionen angefordert werden sollen." -#: builtin/fetch.c:927 +#: builtin/fetch.c:932 msgid "You need to specify a tag name." -msgstr "Du musst den Namen der Markierung angeben." +msgstr "Sie müssen den Namen der Markierung angeben." -#: builtin/fetch.c:979 +#: builtin/fetch.c:984 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Projektarchiv als Argument" -#: builtin/fetch.c:981 +#: builtin/fetch.c:986 msgid "fetch --all does not make sense with refspecs" -msgstr "fetch --all macht keinen Sinn mit Referenzspezifikationen" +msgstr "fetch --all kann nicht mit Referenzspezifikationen verwendet werden." -#: builtin/fetch.c:992 +#: builtin/fetch.c:997 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein externes Archiv (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1005 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -"Abholen einer Gruppe mit Angabe von Referenzspezifikationen macht keinen " -"Sinn." +"Das Abholen einer Gruppe von externen Archiven kann nicht mit der Angabe\n" +"von Referenzspezifikationen verwendet werden." + +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>]|--no-log] [--file <Datei>]" + +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239 +msgid "n" +msgstr "Anzahl" + +#: builtin/fmt-merge-msg.c:660 +msgid "populate log with at most <n> entries from shortlog" +msgstr "fügt Historie mit höchstens <n> Einträgen von \"shortlog\" hinzu" + +#: builtin/fmt-merge-msg.c:663 +msgid "alias for --log (deprecated)" +msgstr "Alias für --log (veraltet)" + +#: builtin/fmt-merge-msg.c:666 +msgid "text" +msgstr "Text" + +#: builtin/fmt-merge-msg.c:667 +msgid "use <text> as start of message" +msgstr "verwendet <Text> als Beschreibungsanfang" + +#: builtin/fmt-merge-msg.c:668 +msgid "file to read from" +msgstr "Datei zum Einlesen" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [Optionen] [<Muster>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "formatiert Platzhalter als Shell-String" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "formatiert Platzhalter als Perl-String" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "formatiert Platzhalter als Python-String" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "formatiert Platzhalter als TCL-String" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "zeigt nur <n> passende Referenzen" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "Format" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "für die Ausgabe zu verwendendes Format" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "Schüssel" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "sortiere nach diesem Feld" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [Optionen] [<Objekt>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "zeigt unerreichbare Objekte" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "zeigt unreferenzierte Objekte" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "meldet Markierungen" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "meldet Hauptwurzeln" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "erzeugt Kopfknoten der Bereitstellungsobjekte" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "erzeugt Kopfknoten des Referenzprotokolls (Standard)" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "aktiviert genauere Prüfung" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "schreibt unreferenzierte Objekte nach .git/lost-found" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "zeigt Fortschrittsanzeige" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [Optionen]" #: builtin/gc.c:63 #, c-format @@ -3171,89 +4592,332 @@ msgstr "Ungültiger %s: '%s'" msgid "insanely long object directory %.*s" msgstr "zu langes Objekt-Verzeichnis %.*s" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "" -"Die Datenbank des Projektarchivs wird für eine optimale Performance " -"komprimiert.\n" +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "entfernt unreferenzierte Objekte" -#: builtin/gc.c:224 +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "mehr Gründlichkeit (erhöht Laufzeit)" + +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "aktiviert \"auto-gc\" Modus" + +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance\n" -"komprimiert. Du kannst auch \"git gc\" manuell ausführen.\n" +"komprimiert. Sie können auch \"git gc\" manuell ausführen.\n" "Siehe \"git help gc\" für weitere Informationen.\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -"Es gibt zu viele unerreichbare lose Objekte; führe 'git prune' aus, um diese " -"zu entfernen." +"Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um " +"diese zu löschen." + +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [Optionen] [-e] <Muster> [<Revision>...] [[--] <Pfad>...]" -#: builtin/grep.c:216 +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: Fehler beim Erzeugen eines Thread: %s" -#: builtin/grep.c:454 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "Fehler beim Verzeichniswechsel: %s" -#: builtin/grep.c:530 builtin/grep.c:564 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "konnte Zweig (%s) nicht lesen" -#: builtin/grep.c:578 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:636 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:653 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: builtin/grep.c:917 +#: builtin/grep.c:643 +msgid "search in index instead of in the work tree" +msgstr "sucht in der Bereitstellung anstatt im Arbeitsbaum" + +#: builtin/grep.c:645 +msgid "find in contents not managed by git" +msgstr "findet auch in Inhalten, die nicht von Git verwaltet werden" + +#: builtin/grep.c:647 +msgid "search in both tracked and untracked files" +msgstr "sucht in beobachteten und unbeobachteten Dateien" + +#: builtin/grep.c:649 +msgid "search also in ignored files" +msgstr "sucht auch in ignorierten Dateien" + +#: builtin/grep.c:652 +msgid "show non-matching lines" +msgstr "zeigt Zeilen ohne Übereinstimmungen" + +#: builtin/grep.c:654 +msgid "case insensitive matching" +msgstr "findet Übereinstimmungen unabhängig von Groß- und Kleinschreibung" + +#: builtin/grep.c:656 +msgid "match patterns only at word boundaries" +msgstr "sucht nur ganze Wörter" + +#: builtin/grep.c:658 +msgid "process binary files as text" +msgstr "verarbeitet binäre Dateien als Text" + +#: builtin/grep.c:660 +msgid "don't match patterns in binary files" +msgstr "findet keine Muster in Binärdateien" + +#: builtin/grep.c:663 +msgid "descend at most <depth> levels" +msgstr "durchläuft höchstens <Tiefe> Ebenen" + +#: builtin/grep.c:667 +msgid "use extended POSIX regular expressions" +msgstr "verwendet erweiterte reguläre Ausdrücke aus POSIX" + +#: builtin/grep.c:670 +msgid "use basic POSIX regular expressions (default)" +msgstr "verwendet grundlegende reguläre Ausdrücke aus POSIX (Standard)" + +#: builtin/grep.c:673 +msgid "interpret patterns as fixed strings" +msgstr "interpretiert Muster als feste Zeichenketten" + +#: builtin/grep.c:676 +msgid "use Perl-compatible regular expressions" +msgstr "verwendet Perl-kompatible reguläre Ausdrücke" + +#: builtin/grep.c:679 +msgid "show line numbers" +msgstr "zeigt Zeilennummern" + +#: builtin/grep.c:680 +msgid "don't show filenames" +msgstr "zeigt keine Dateinamen" + +#: builtin/grep.c:681 +msgid "show filenames" +msgstr "zeigt Dateinamen" + +#: builtin/grep.c:683 +msgid "show filenames relative to top directory" +msgstr "zeigt Dateinamen relativ zum Projektverzeichnis" + +#: builtin/grep.c:685 +msgid "show only filenames instead of matching lines" +msgstr "zeigt nur Dateinamen anstatt übereinstimmende Zeilen" + +#: builtin/grep.c:687 +msgid "synonym for --files-with-matches" +msgstr "Synonym für --files-with-matches" + +#: builtin/grep.c:690 +msgid "show only the names of files without match" +msgstr "zeigt nur die Dateinamen ohne Übereinstimmungen" + +#: builtin/grep.c:692 +msgid "print NUL after filenames" +msgstr "gibt NUL-Zeichen nach Dateinamen aus" + +#: builtin/grep.c:694 +msgid "show the number of matches instead of matching lines" +msgstr "zeigt, anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen" + +#: builtin/grep.c:695 +msgid "highlight matches" +msgstr "hebt Übereinstimmungen hervor" + +#: builtin/grep.c:697 +msgid "print empty line between matches from different files" +msgstr "" +"gibt eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien aus" + +#: builtin/grep.c:699 +msgid "show filename only once above matches from same file" +msgstr "" +"zeigt den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser " +"Datei an" + +#: builtin/grep.c:702 +msgid "show <n> context lines before and after matches" +msgstr "zeigt <n> Zeilen vor und nach den Übereinstimmungen an" + +#: builtin/grep.c:705 +msgid "show <n> context lines before matches" +msgstr "zeigt <n> Zeilen vor den Übereinstimmungen an" + +#: builtin/grep.c:707 +msgid "show <n> context lines after matches" +msgstr "zeigt <n> Zeilen nach den Übereinstimmungen an" + +#: builtin/grep.c:708 +msgid "shortcut for -C NUM" +msgstr "Kurzform für -C NUM" + +#: builtin/grep.c:711 +msgid "show a line with the function name before matches" +msgstr "zeigt eine Zeile mit dem Funktionsnamen vor Übereinstimmungen an" + +#: builtin/grep.c:713 +msgid "show the surrounding function" +msgstr "zeigt die umgebende Funktion an" + +#: builtin/grep.c:716 +msgid "read patterns from file" +msgstr "liest Muster von einer Datei" + +#: builtin/grep.c:718 +msgid "match <pattern>" +msgstr "findet <Muster>" + +#: builtin/grep.c:720 +msgid "combine patterns specified with -e" +msgstr "kombiniert Muster, die mit -e angegeben wurden" + +#: builtin/grep.c:732 +msgid "indicate hit with exit status without output" +msgstr "zeigt Übereinstimmungen nur durch Beendigungsstatus an" + +#: builtin/grep.c:734 +msgid "show only matches from files that match all patterns" +msgstr "zeigt nur Übereinstimmungen von Dateien, die allen Mustern entsprechen" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "zeigt geparsten Baum für \"grep\"-Ausdruck" + +#: builtin/grep.c:740 +msgid "pager" +msgstr "Anzeigeprogramm" + +#: builtin/grep.c:740 +msgid "show matching files in the pager" +msgstr "zeigt Dateien mit Übereinstimmungen im Anzeigeprogramm" + +#: builtin/grep.c:743 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "erlaubt den Aufruf von grep(1) (von dieser Programmversion ignoriert)" + +#: builtin/grep.c:744 builtin/show-ref.c:184 +msgid "show usage" +msgstr "zeigt Verwendung" + +#: builtin/grep.c:811 msgid "no pattern given." msgstr "keine Muster angegeben" -#: builtin/grep.c:931 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "ungültiges Objekt %s" -#: builtin/grep.c:972 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" -msgstr "--open-files-in-pager arbeitet nur innerhalb des Arbeitsbaums" +msgstr "" +"Die Option --open-files-in-pager kann nur innerhalb des Arbeitsbaums " +"verwendet werden." -#: builtin/grep.c:995 +#: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached oder --untracked kann nicht mit --no-index benutzt werden" +msgstr "" +"Die Optionen --cached und --untracked können nicht mit --no-index verwendet " +"werden." -#: builtin/grep.c:1000 +#: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index oder --untracked kann nicht mit Versionen benutzt werden" +msgstr "" +"Die Optionen --no-index und --untracked können nicht mit Versionen verwendet " +"werden." -#: builtin/grep.c:1003 +#: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -"--[no-]exlude-standard kann nicht mit beobachteten Inhalten benutzt werden" +"Die Option --[no-]exclude-standard kann nicht mit beobachteten Inhalten " +"verwendet werden." -#: builtin/grep.c:1011 +#: builtin/grep.c:905 msgid "both --cached and trees are given." -msgstr "sowohl --cached als auch Zweige gegeben" +msgstr "Die Option --cached kann nicht mit Zweigen verwendet werden." + +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" +"git hash-object [-t <Art>] [-w] [--path=<Datei>|--no-filters] [--stdin] [--] " +"<Datei>..." + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <Liste-von-Pfaden>" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "Art" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "Art des Objektes" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "schreibt das Objekt in die Objektdatenbank" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "liest das Objekt von der Standard-Eingabe" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "speichert Datei wie sie ist, ohne Filter" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "verarbeitet Datei, als ob sie von diesem Pfad wäre" + +#: builtin/help.c:43 +msgid "print all available commands" +msgstr "Anzeige aller vorhandenen Kommandos" + +#: builtin/help.c:44 +msgid "show man page" +msgstr "zeigt Handbuch" + +#: builtin/help.c:45 +msgid "show manual in web browser" +msgstr "zeigt Handbuch in einem Webbrowser" + +#: builtin/help.c:47 +msgid "show info page" +msgstr "zeigt Info-Seite" + +#: builtin/help.c:53 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "git help [--all] [--man|--web|--info] [Kommando]" #: builtin/help.c:65 #, c-format @@ -3285,7 +4949,7 @@ msgid "" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" -"Du könntest stattdessen 'man.<Werkzeug>.cmd' benutzen." +"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen." #: builtin/help.c:229 #, c-format @@ -3294,7 +4958,7 @@ msgid "" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': Kommando für unterstützten Handbuchbetrachter.\n" -"Du könntest stattdessen 'man.<Werkzeug>.path' benutzen." +"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen." #: builtin/help.c:299 msgid "The most commonly used git commands are:" @@ -3369,6 +5033,11 @@ msgstr "Kann Paketdatei '%s' nicht öffnen" msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht überein" +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "Paketversion %<PRIu32> nicht unterstützt" + #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" @@ -3476,95 +5145,125 @@ msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1105 +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "kann Thread nicht erzeugen: %s" + +#: builtin/index-pack.c:1106 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "vervollständigt mit %d lokalen Objekten" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" + +#: builtin/index-pack.c:1125 #, 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:1149 +#: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1228 +#: builtin/index-pack.c:1229 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1253 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1274 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1286 +#: builtin/index-pack.c:1287 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1297 +#: builtin/index-pack.c:1298 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "ungültige Anzahl von Threads angegeben (%d)" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" + +#: builtin/index-pack.c:1399 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1401 #, 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:1447 +#: builtin/index-pack.c:1448 #, 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:1454 +#: builtin/index-pack.c:1455 #, 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:1481 +#: builtin/index-pack.c:1482 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1558 +#: builtin/index-pack.c:1559 msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin kann nicht ohne --stdin benutzt werden" +msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" -msgstr "--verify ohne Name der Paketdatei angegeben" +msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." #: builtin/init-db.c:35 #, c-format @@ -3654,7 +5353,7 @@ msgstr "Konnte %s nicht nach %s verschieben" #: 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 @@ -3682,6 +5381,27 @@ msgstr " gemeinsames" msgid "cannot tell cwd" msgstr "kann aktuelles Arbeitsverzeichnis nicht ermitteln" +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--shared" +"[=<Berechtigungen>]] [Verzeichnis]" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "Berechtigungen" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "" +"gibt an, dass das Git-Projektarchiv mit mehreren Benutzern geteilt wird" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "weniger Ausgaben" + #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" @@ -3710,106 +5430,406 @@ msgstr "Kann nicht auf aktuelles Arbeitsverzeichnis zugreifen." msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsbaum '%s' zugreifen." -#: builtin/log.c:189 +#: builtin/log.c:39 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git log [<Optionen>] [<seit>..<bis>] [[--] <Pfad>...]\n" + +#: builtin/log.c:40 +msgid " or: git show [options] <object>..." +msgstr " oder: git show [Optionen] <Objekt>..." + +#: builtin/log.c:102 +msgid "suppress diff output" +msgstr "unterdrückt Ausgabe der Unterschiede" + +#: builtin/log.c:103 +msgid "show source" +msgstr "zeigt Quelle" + +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "verwendet \"mailmap\"-Datei" + +#: builtin/log.c:105 +msgid "decorate options" +msgstr "decorate-Optionen" + +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:518 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:608 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:682 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:693 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:707 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "Brauche genau einen Versionsbereich." -#: builtin/log.c:715 +#: builtin/log.c:739 msgid "Not a range." msgstr "Kein Versionsbereich." -#: builtin/log.c:789 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:862 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:935 +#: builtin/log.c:913 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [Optionen] [<seit> | <Revisionsbereich>]" + +#: builtin/log.c:958 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1157 +#: builtin/log.c:1097 +msgid "use [PATCH n/m] even with a single patch" +msgstr "verwendet [PATCH n/m] auch mit einzelnem Patch" + +#: builtin/log.c:1100 +msgid "use [PATCH] even with multiple patches" +msgstr "verwendet [PATCH] auch mit mehreren Patches" + +#: builtin/log.c:1104 +msgid "print patches to standard out" +msgstr "Ausgabe der Patches in Standard-Ausgabe" + +#: builtin/log.c:1106 +msgid "generate a cover letter" +msgstr "erzeugt ein Deckblatt" + +#: builtin/log.c:1108 +msgid "use simple number sequence for output file names" +msgstr "verwendet einfache Nummernfolge für die Namen der Ausgabedateien" + +#: builtin/log.c:1109 +msgid "sfx" +msgstr "Dateiendung" + +#: builtin/log.c:1110 +msgid "use <sfx> instead of '.patch'" +msgstr "verwendet <Dateiendung> anstatt '.patch'" + +#: builtin/log.c:1112 +msgid "start numbering patches at <n> instead of 1" +msgstr "beginnt die Nummerierung der Patches bei <n> anstatt bei 1" + +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "kennzeichnet die Serie als n-te Fassung" + +#: builtin/log.c:1116 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "verwendet [<Prefix>] anstatt [PATCH]" + +#: builtin/log.c:1119 +msgid "store resulting files in <dir>" +msgstr "speichert erzeugte Dateien in <Verzeichnis>" + +#: builtin/log.c:1122 +msgid "don't strip/add [PATCH]" +msgstr "[PATCH] wird nicht entfernt/hinzugefügt" + +#: builtin/log.c:1125 +msgid "don't output binary diffs" +msgstr "gibt keine binären Unterschiede aus" + +#: builtin/log.c:1127 +msgid "don't include a patch matching a commit upstream" +msgstr "" +"schließt keine Patches ein, die einer Version im Übernahmezweig entsprechen" + +#: builtin/log.c:1129 +msgid "show patch format instead of default (patch + stat)" +msgstr "zeigt Patchformat anstatt des Standards (Patch + Zusammenfassung)" + +#: builtin/log.c:1131 +msgid "Messaging" +msgstr "Email-Einstellungen" + +#: builtin/log.c:1132 +msgid "header" +msgstr "Header" + +#: builtin/log.c:1133 +msgid "add email header" +msgstr "fügt Email-Header hinzu" + +#: builtin/log.c:1134 builtin/log.c:1136 +msgid "email" +msgstr "Email" + +#: builtin/log.c:1134 +msgid "add To: header" +msgstr "fügt \"To:\"-Header hinzu" + +#: builtin/log.c:1136 +msgid "add Cc: header" +msgstr "fügt \"Cc:\"-Header hinzu" + +#: builtin/log.c:1138 +msgid "message-id" +msgstr "message-id" + +#: builtin/log.c:1139 +msgid "make first mail a reply to <message-id>" +msgstr "macht aus erster Email eine Antwort zu <message-id>" + +#: builtin/log.c:1140 builtin/log.c:1143 +msgid "boundary" +msgstr "Grenze" + +#: builtin/log.c:1141 +msgid "attach the patch" +msgstr "hängt einen Patch an" + +#: builtin/log.c:1144 +msgid "inline the patch" +msgstr "fügt den Patch direkt in die Nachricht ein" + +#: builtin/log.c:1148 +msgid "enable message threading, styles: shallow, deep" +msgstr "aktiviert Nachrichtenverkettung, Stile: shallow, deep" + +#: builtin/log.c:1150 +msgid "signature" +msgstr "Signatur" + +#: builtin/log.c:1151 +msgid "add a signature" +msgstr "fügt eine Signatur hinzu" + +#: builtin/log.c:1153 +msgid "don't print the patch filenames" +msgstr "zeigt keine Dateinamen der Patches" + +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "unechte Einreicher-Informationen %s" -#: builtin/log.c:1202 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." -msgstr "-n und -k schliessen sich gegenseitig aus" +msgstr "Die Optionen -n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1204 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix und -k schliessen sich gegenseitig aus" +msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus." -#: builtin/log.c:1212 +#: builtin/log.c:1257 msgid "--name-only does not make sense" -msgstr "--name-only macht keinen Sinn" +msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1214 +#: builtin/log.c:1259 msgid "--name-status does not make sense" -msgstr "--name-status macht keinen Sinn" +msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1216 +#: builtin/log.c:1261 msgid "--check does not make sense" -msgstr "--check macht keinen Sinn" +msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1239 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1241 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1394 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1498 +#: builtin/log.c:1488 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<Übernahmezweig> [<Arbeitszweig> [<Limit>]]]" + +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -"Konnte gefolgten, externen Zweig nicht finden, bitte gebe <upstream> manuell " -"an.\n" +"Konnte gefolgten, externen Zweig nicht finden, bitte geben Sie <upstream> " +"manuell an.\n" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "Unbekannte Version %s" +#: builtin/ls-files.c:408 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [Optionen] [<Datei>...]" + +#: builtin/ls-files.c:463 +msgid "identify the file status with tags" +msgstr "zeigt den Dateistatus mit Markierungen" + +#: builtin/ls-files.c:465 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" +"verwendet Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung" + +#: builtin/ls-files.c:467 +msgid "show cached files in the output (default)" +msgstr "zeigt zwischengespeicherten Dateien in der Ausgabe an (Standard)" + +#: builtin/ls-files.c:469 +msgid "show deleted files in the output" +msgstr "zeigt entfernte Dateien in der Ausgabe an" + +#: builtin/ls-files.c:471 +msgid "show modified files in the output" +msgstr "zeigt geänderte Dateien in der Ausgabe an" + +#: builtin/ls-files.c:473 +msgid "show other files in the output" +msgstr "zeigt sonstige Dateien in der Ausgabe an" + +#: builtin/ls-files.c:475 +msgid "show ignored files in the output" +msgstr "zeigt ignorierte Dateien in der Ausgabe an" + +#: builtin/ls-files.c:478 +msgid "show staged contents' object name in the output" +msgstr "zeigt Objektnamen von Inhalten in der Bereitstellung in der Ausgabe an" + +#: builtin/ls-files.c:480 +msgid "show files on the filesystem that need to be removed" +msgstr "zeigt Dateien im Dateisystem, die gelöscht werden müssen, an" + +#: builtin/ls-files.c:482 +msgid "show 'other' directories' name only" +msgstr "zeigt nur Namen von 'sonstigen' Verzeichnissen an" + +#: builtin/ls-files.c:485 +msgid "don't show empty directories" +msgstr "zeigt keine leeren Verzeichnisse an" + +#: builtin/ls-files.c:488 +msgid "show unmerged files in the output" +msgstr "zeigt nicht zusammengeführte Dateien in der Ausgabe an" + +#: builtin/ls-files.c:490 +msgid "show resolve-undo information" +msgstr "zeigt 'resolve-undo' Informationen an" + +#: builtin/ls-files.c:492 +msgid "skip files matching pattern" +msgstr "lässt Dateien aus, die einem Muster entsprechen" + +#: builtin/ls-files.c:495 +msgid "exclude patterns are read from <file>" +msgstr "schließt Muster, gelesen von <Datei>, aus" + +#: builtin/ls-files.c:498 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "liest zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei>" + +#: builtin/ls-files.c:500 +msgid "add the standard git exclusions" +msgstr "fügt die standardmäßigen Git-Ausschlüsse hinzu" + +#: builtin/ls-files.c:503 +msgid "make the output relative to the project top directory" +msgstr "Ausgabe relativ zum Projektverzeichnis" + +#: builtin/ls-files.c:506 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "" +"behandle es als Fehler, wenn sich eine <Datei> nicht in der Bereitstellung " +"befindet" + +#: builtin/ls-files.c:507 +msgid "tree-ish" +msgstr "Versionsreferenz" + +#: builtin/ls-files.c:508 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" +"gibt vor, dass Pfade, die seit <Versionsreferenz> gelöscht wurden, immer " +"noch vorhanden sind" + +#: builtin/ls-files.c:510 +msgid "show debugging data" +msgstr "zeigt Ausgaben zur Fehlersuche an" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<Optionen>] <Versionsreferenz> [<Pfad>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "zeigt nur Bäume an" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "führt Rekursion in Teilbäumen durch" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "zeigt Bäume bei Rekursion an" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "schließt Einträge mit NUL-Byte ab" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "schließt Objektgröße ein" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "listet nur Dateinamen auf" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "verwendet vollständige Pfadnamen" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "" +"listet den gesamten Baum auf; nicht nur das aktuelle Verzeichnis (impliziert " +"--full-name)" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "git merge [Optionen] [<Version>...]" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [Optionen] <Beschreibung> HEAD <Version>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." @@ -3829,6 +5849,75 @@ msgstr "Verfügbare Strategien sind:" msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "" +"zeigt keine Zusammenfassung der Unterschiede am Schluss der Zusammenführung " +"an" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "" +"zeigt eine Zusammenfassung der Unterschiede am Schluss der Zusammenführung an" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "(Synonym für --stat)" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "" +"fügt (höchstens <n>) Einträge von \"shortlog\" zur Beschreibung der " +"Zusammenführung hinzu" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "erzeugt eine einzelne Version anstatt einer Zusammenführung" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "" +"führt eine Eintragung durch, wenn die Zusammenführung erfolgreich war " +"(Standard)" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "Bearbeitung der Versionsbeschreibung vor der Eintragung" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "erlaubt Vorspulen (Standard)" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "bricht ab, wenn kein Vorspulen möglich ist" + +#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +msgid "strategy" +msgstr "Strategie" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "zu verwendende Zusammenführungsstrategie" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "Option=Wert" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "Option für ausgewählte Zusammenführungsstrategie" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" +"führt Versionsbeschreibung zusammen (für eine Zusammenführung, die kein " +"Vorspulen war)" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "bricht die sich im Gange befindliche Zusammenführung ab" + #: builtin/merge.c:240 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." @@ -3884,37 +5973,33 @@ msgstr "Ungültiger branch.%s.mergeoptions String: %s" msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines Baumes fehl" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "Lesen des Zwischenspeichers fehlgeschlagen" - -#: builtin/merge.c:709 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur die Zusammenführung von zwei Zweigen behandelt." -#: builtin/merge.c:723 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:876 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:885 +#: builtin/merge.c:782 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Zusammenführung wurde nicht eingetragen; benutze 'git commit' um die " +"Zusammenführung wurde nicht eingetragen; benutzen Sie 'git commit' um die " "Zusammenführung abzuschließen.\n" -#: builtin/merge.c:891 +#: builtin/merge.c:788 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -3922,7 +6007,7 @@ msgid "" "Lines starting with '#' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Bitte gebe eine Versionsbeschreibung ein um zu erklären, warum diese " +"Bitte geben Sie eine Versionsbeschreibung ein um zu erklären, warum diese " "Zusammenführung erforderlich ist,\n" "insbesondere wenn es einen aktualisierten, externen Zweig mit einem Thema-" "Zweig zusammenführt.\n" @@ -3930,156 +6015,258 @@ msgstr "" "Zeilen beginnend mit '#' werden ignoriert, und eine leere Beschreibung " "bricht die Eintragung ab.\n" -#: builtin/merge.c:915 +#: builtin/merge.c:813 msgid "Empty commit message." msgstr "Leere Versionsbeschreibung" -#: builtin/merge.c:927 +#: builtin/merge.c:825 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:992 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Automatische Zusammenführung fehlgeschlagen; behebe die Konflikte und trage " -"dann das Ergebnis ein.\n" +"Automatische Zusammenführung fehlgeschlagen; beheben Sie die Konflikte und " +"tragen Sie dann das Ergebnis ein.\n" -#: builtin/merge.c:1008 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ist keine Version" -#: builtin/merge.c:1049 +#: builtin/merge.c:947 msgid "No current branch." -msgstr "Du befindest dich auf keinem Zweig." +msgstr "Sie befinden sich auf keinem Zweig." -#: builtin/merge.c:1051 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Kein externes Archiv für den aktuellen Zweig." -#: builtin/merge.c:1053 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein externes Standard-Projektarchiv für den aktuellen Zweig " "definiert." -#: builtin/merge.c:1058 +#: builtin/merge.c:956 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "Kein externer Übernahmezweig für %s von %s" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1043 builtin/merge.c:1200 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1213 +#: builtin/merge.c:1111 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keine Zusammenführung zum Abbrechen (vermisse MERGE_HEAD)" -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1127 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -"Du hast deine Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert).\n" -"Bitte trage deine Änderungen ein, bevor du zusammenführen kannst." +"Sie haben Ihre Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert).\n" +"Bitte tragen Sie Ihre Änderungen ein, bevor Sie zusammenführen können." -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1130 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -"Du hast deine Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert)." +"Sie haben Ihre Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert)." -#: builtin/merge.c:1236 +#: builtin/merge.c:1134 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -"Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" -"Bitte trage deine Änderungen ein, bevor du zusammenführen kannst." +"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" +"Bitte tragen Sie Ihre Änderungen ein, bevor Sie zusammenführen können." -#: builtin/merge.c:1239 +#: builtin/merge.c:1137 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -"Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." +"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1248 +#: builtin/merge.c:1146 msgid "You cannot combine --squash with --no-ff." -msgstr "Du kannst --squash nicht mit --no-ff kombinieren." +msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1253 +#: builtin/merge.c:1151 msgid "You cannot combine --no-ff with --ff-only." -msgstr "Du kannst --no-ff nicht mit --ff--only kombinieren." +msgstr "Sie können --no-ff nicht mit --ff--only kombinieren." -#: builtin/merge.c:1260 +#: builtin/merge.c:1158 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Keine Version angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1292 +#: builtin/merge.c:1190 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt eine Version in einem leeren Zweig zusammenführen." -#: builtin/merge.c:1295 +#: builtin/merge.c:1193 msgid "Squash commit into empty head not supported yet" msgstr "Bin auf einem Zweig, der noch geboren wird; kann nicht quetschen." -#: builtin/merge.c:1297 +#: builtin/merge.c:1195 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "nicht vorzuspulende Version macht in einem leeren Zweig keinen Sinn" +msgstr "" +"Nicht vorzuspulende Version kann nicht in einem leeren Zweig verwendet " +"werden." -#: builtin/merge.c:1412 +#: builtin/merge.c:1311 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1350 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich triviale \"in-index\"-Zusammenführung...\n" -#: builtin/merge.c:1457 +#: builtin/merge.c:1357 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1389 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1412 builtin/merge.c:1491 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Zweiges bis zum Ursprung...\n" -#: builtin/merge.c:1516 +#: builtin/merge.c:1416 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Zusammenführungsstrategie %s...\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1482 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Zusammenführungsstrategie behandelt diese Zusammenführung.\n" -#: builtin/merge.c:1584 +#: builtin/merge.c:1484 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Zusammenführung mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1493 #, c-format msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Benutze \"%s\" um die Auflösung per Hand vorzubereiten.\n" +msgstr "Benutzen Sie \"%s\" um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1505 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatische Zusammenführung abgeschlossen; halte, wie gewünscht, vor der " "Eintragung an\n" +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <Version> <Version>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <Version>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <Version>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <Version> <Version>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "Ausgabe aller gemeinsamen Vorfahren" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "findet Vorfahren für eine einzelne n-Wege-Zusammenführung" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "listet Versionen auf, die nicht durch Andere erreichbar sind" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "ist der Erste ein Vorfahre von dem Anderen?" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" +"git merge-file [Optionen] [-L Name1 [-L orig [-L Name2]]] Datei1 orig_Datei " +"Datei2" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "sendet Ergebnisse zur Standard-Ausgabe" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "verwendet eine diff3 basierte Zusammenführung" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "verwendet bei Konflikten unsere Variante" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "verwendet bei Konflikten ihre Variante" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "verwendet bei Konflikten eine gemeinsame Variante" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "verwendet bei Konflikten diese Kennzeichnungslänge" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "keine Warnung bei Konflikten" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "setzt Beschriftung für Datei1/orig_Datei/Datei2" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "erlaubt fehlende Objekte" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "erlaubt die Erstellung von mehr als einem Baum" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [Optionen] <Quelle>... <Ziel>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "erzwingt Verschieben/Umbenennen, auch wenn das Ziel existiert" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "überspringt Fehler beim Verschieben oder Umbenennen" + #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" @@ -4142,197 +6329,604 @@ msgstr "Benenne %s nach %s um\n" msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/notes.c:139 +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [Optionen] <Version>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [Optionen] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [Optionen] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "zeigt nur Namen an (keine SHA-1)" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "verwendet nur Markierungen um die Versionen zu benennen" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "verwendet nur Referenzen die <Muster> entsprechen" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "listet alle Versionen auf, die von allen Referenzen erreichbar sind" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "liest von der Standard-Eingabe" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "erlaubt Ausgabe von `undefinierten` Namen" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <Notiz-Referenz>] add [-f] [-m <Nachricht> | -F <Datei> | (-" +"c | -C) <Objekt>] [<Objekt>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "" +"git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <Notiz-Referenz>] append [-m <Nachricht> | -F <Datei> | (-c " +"| -C) <Objekt>] [<Objekt>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <Notiz-Referenz>] edit [<Objekt>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" +"git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie> ] <Notiz-" +"Referenz>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <Notiz-Referenz>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <Notiz-Referenz>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<Objekt>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<Optionen>] [<Objekt>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<Optionen>] <von-Objekt> <nach-Objekt>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<von-Objekt> <nach-Objekt>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<Optionen>] [<Objekt>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<Objekt>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<Objekt>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<Optionen>] <Notiz-Referenz>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<Optionen>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<Optionen>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<Objekt>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<Optionen>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + +#: builtin/notes.c:142 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht starten" -#: builtin/notes.c:145 +#: builtin/notes.c:148 msgid "can't fdopen 'show' output fd" msgstr "konnte Datei-Deskriptor für Ausgabe von 'show' nicht öffnen" -#: builtin/notes.c:155 +#: builtin/notes.c:158 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "Schließen der Verbindung zu 'show' ist für Objekt '%s' fehlgeschlagen." -#: builtin/notes.c:158 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht abschließen" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:178 builtin/tag.c:347 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: builtin/notes.c:189 +#: builtin/notes.c:192 msgid "Please supply the note contents using either -m or -F option" -msgstr "Bitte liefere den Notiz-Inhalt unter Verwendung der Option -m oder -F." +msgstr "" +"Bitte liefern Sie den Notiz-Inhalt unter Verwendung der Option -m oder -F." -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:213 builtin/notes.c:976 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" -#: builtin/notes.c:215 +#: builtin/notes.c:218 msgid "unable to write note object" msgstr "Konnte Notiz-Objekt nicht schreiben" -#: builtin/notes.c:217 +#: builtin/notes.c:220 #, c-format msgid "The note contents has been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:254 builtin/tag.c:542 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:256 builtin/tag.c:545 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 +#: builtin/notes.c:971 builtin/tag.c:558 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/notes.c:275 +#: builtin/notes.c:278 #, c-format msgid "Failed to read object '%s'." msgstr "Fehler beim Lesen des Objektes '%s'." -#: builtin/notes.c:299 +#: builtin/notes.c:302 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kann uninitialisierten/unreferenzierten Notiz-Baum nicht eintragen." -#: builtin/notes.c:340 +#: builtin/notes.c:343 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Ungültiger notes.rewriteMode Wert: '%s'" -#: builtin/notes.c:350 +#: builtin/notes.c:353 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" -"Neuschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)" +"Umschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:380 #, c-format msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" -#: builtin/notes.c:441 +#: builtin/notes.c:444 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/notes.c:456 +#: builtin/notes.c:459 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 +#: builtin/notes.c:1036 msgid "too many parameters" msgstr "zu viele Parameter" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:516 builtin/notes.c:775 #, c-format msgid "No note found for object %s." msgstr "Kein Notiz für Objekt %s gefunden." -#: builtin/notes.c:580 +#: builtin/notes.c:538 builtin/notes.c:695 +msgid "note contents as a string" +msgstr "Notizinhalte als Zeichenkette" + +#: builtin/notes.c:541 builtin/notes.c:698 +msgid "note contents in a file" +msgstr "Notizinhalte in einer Datei" + +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 +#: builtin/notes.c:703 builtin/tag.c:476 +msgid "object" +msgstr "Objekt" + +#: builtin/notes.c:544 builtin/notes.c:701 +msgid "reuse and edit specified note object" +msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes" + +#: builtin/notes.c:547 builtin/notes.c:704 +msgid "reuse specified note object" +msgstr "Wiederverwendung des angegebenen Notiz-Objektes" + +#: builtin/notes.c:549 builtin/notes.c:617 +msgid "replace existing notes" +msgstr "ersetzt existierende Notizen" + +#: builtin/notes.c:583 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s " -"gefunden. Verwende '-f' um die existierenden Notizen zu überschreiben." +"gefunden. Verwenden Sie '-f' um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:588 builtin/notes.c:665 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:635 +#: builtin/notes.c:618 +msgid "read objects from stdin" +msgstr "liest Objekte von der Standard-Eingabe" + +#: builtin/notes.c:620 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "" +"lädt Konfiguration für <Kommando> beim Umschreiben von Versionen (impliziert " +"--stdin)" + +#: builtin/notes.c:638 msgid "too few parameters" msgstr "zu wenig Parameter" -#: builtin/notes.c:656 +#: builtin/notes.c:659 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. " -"Verwende '-f' um die existierenden Notizen zu überschreiben." +"Verwenden Sie '-f' um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:668 +#: builtin/notes.c:671 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich." -#: builtin/notes.c:717 +#: builtin/notes.c:720 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "Die Optionen -m/-F/-c/-C sind für das Unterkommando 'edit' veraltet.\n" -"Bitte benutze stattdessen 'git notes add -f -m/-F/-c/-C'.\n" +"Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" + +#: builtin/notes.c:867 +msgid "General options" +msgstr "Allgemeine Optionen" + +#: builtin/notes.c:869 +msgid "Merge options" +msgstr "Optionen für Zusammenführung" + +#: builtin/notes.c:871 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" +"theirs/union/cat_sort_uniq)" + +#: builtin/notes.c:873 +msgid "Committing unmerged notes" +msgstr "trägt nicht zusammengeführte Notizen ein" -#: builtin/notes.c:971 +#: builtin/notes.c:875 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" +"schließt Zusammenführung von Notizen ab, in dem nicht zusammengeführte " +"Notizen eingetragen werden" + +#: builtin/notes.c:877 +msgid "Aborting notes merge resolution" +msgstr "bricht Konfliktauflösung bei Zusammenführung von Notizen ab" + +#: builtin/notes.c:879 +msgid "abort notes merge" +msgstr "bricht Zusammenführung von Notizen ab" + +#: builtin/notes.c:974 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:986 +msgid "attempt to remove non-existent note is not an error" +msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" + +#: builtin/notes.c:989 +msgid "read object names from the standard input" +msgstr "liest Objektnamen von der Standard-Eingabe" + +#: builtin/notes.c:1070 +msgid "notes_ref" +msgstr "Notiz-Referenz" + +#: builtin/notes.c:1071 +msgid "use notes from <notes_ref>" +msgstr "verwendet Notizen von <Notiz-Referenz>" + +#: builtin/notes.c:1106 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekanntes Unterkommando: %s" +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "" +"git pack-objects --stdout [Optionen...] [< Referenzliste | < Objektliste]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "" +"git pack-objects [Optionen...] Basis-Name [< Referenzliste | < Objektliste]" + #: 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 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Bereitstellungsversion %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Bereitstellungsversion '%s'" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "Option %s akzeptiert keine negative Form" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "konnte Wert '%s' für Option %s nicht parsen" +#: builtin/pack-objects.c:2447 +msgid "do not show progress meter" +msgstr "zeigt keine Fortschrittsanzeige" + +#: builtin/pack-objects.c:2449 +msgid "show progress meter" +msgstr "zeigt Fortschrittsanzeige" + +#: builtin/pack-objects.c:2451 +msgid "show progress meter during object writing phase" +msgstr "zeigt Forschrittsanzeige während der Phase des Schreibens der Objekte" + +#: builtin/pack-objects.c:2454 +msgid "similar to --all-progress when progress meter is shown" +msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" + +#: builtin/pack-objects.c:2455 +msgid "version[,offset]" +msgstr "version[,offset]" + +#: builtin/pack-objects.c:2456 +msgid "write the pack index file in the specified idx format version" +msgstr "" +"schreibt die Index-Datei des Paketes in der angegebenen Indexformat-Version" + +#: builtin/pack-objects.c:2459 +msgid "maximum size of each output pack file" +msgstr "maximale Größe für jede ausgegebene Paketdatei" + +#: builtin/pack-objects.c:2461 +msgid "ignore borrowed objects from alternate object store" +msgstr "ignoriert geliehene Objekte von alternativem Objektspeicher" + +#: builtin/pack-objects.c:2463 +msgid "ignore packed objects" +msgstr "ignoriert gepackte Objekte" + +#: builtin/pack-objects.c:2465 +msgid "limit pack window by objects" +msgstr "begrenzt Paketfenster durch Objekte" + +#: builtin/pack-objects.c:2467 +msgid "limit pack window by memory in addition to object limit" +msgstr "begrenzt Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher" + +#: builtin/pack-objects.c:2469 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "" +"maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" + +#: builtin/pack-objects.c:2471 +msgid "reuse existing deltas" +msgstr "verwendet existierende Unterschiede wieder" + +#: builtin/pack-objects.c:2473 +msgid "reuse existing objects" +msgstr "verwendet existierende Objekte wieder" + +#: builtin/pack-objects.c:2475 +msgid "use OFS_DELTA objects" +msgstr "verwendet OFS_DELTA Objekte" + +#: builtin/pack-objects.c:2477 +msgid "use threads when searching for best delta matches" +msgstr "" +"verwendet Threads bei der Suche nach den besten Übereinstimmungen bei " +"Unterschieden" + +#: builtin/pack-objects.c:2479 +msgid "do not create an empty pack output" +msgstr "erzeugt keine leeren Pakete" + +#: builtin/pack-objects.c:2481 +msgid "read revision arguments from standard input" +msgstr "liest Argumente bezüglich Revisionen von der Standard-Eingabe" + +#: builtin/pack-objects.c:2483 +msgid "limit the objects to those that are not yet packed" +msgstr "begrenzt die Objekte zu solchen, die noch nicht gepackt wurden" + +#: builtin/pack-objects.c:2486 +msgid "include objects reachable from any reference" +msgstr "schließt Objekte ein, die von jeder Referenz erreichbar sind" + +#: builtin/pack-objects.c:2489 +msgid "include objects referred by reflog entries" +msgstr "" +"schließt Objekte ein, die von Einträgen des Referenzprotokolls referenziert " +"werden" + +#: builtin/pack-objects.c:2492 +msgid "output pack to stdout" +msgstr "schreibt Paket in die Standard-Ausgabe" + +#: builtin/pack-objects.c:2494 +msgid "include tag objects that refer to objects to be packed" +msgstr "" +"schließt Markierungsobjekte ein, die auf gepackte Objekte referenzieren" + +#: builtin/pack-objects.c:2496 +msgid "keep unreachable objects" +msgstr "behält nicht erreichbare Objekte" + +#: builtin/pack-objects.c:2497 parse-options.h:141 +msgid "time" +msgstr "Zeit" + +#: builtin/pack-objects.c:2498 +msgid "unpack unreachable objects newer than <time>" +msgstr "entpackt nicht erreichbare Objekte, die neuer als <Zeit> sind" + +#: builtin/pack-objects.c:2501 +msgid "create thin packs" +msgstr "erzeugt dünnere Pakete" + +#: builtin/pack-objects.c:2503 +msgid "ignore packs that have companion .keep file" +msgstr "ignoriert Pakete die .keep Dateien haben" + +#: builtin/pack-objects.c:2505 +msgid "pack compression level" +msgstr "Komprimierungsgrad für Paketierung" + +#: builtin/pack-objects.c:2507 +msgid "do not hide commits by grafts" +msgstr "verbirgt keine Versionen mit künstlichen Vorgängern (\"grafts\")" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [Optionen]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "packt alles" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "entfernt lose Referenzen (Standard)" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<Zweigspitze>...]" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "nicht löschen, nur anzeigen" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "meldet gelöschte Objekte" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "lässt Objekte älter als <Zeit> verfallen" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<Optionen>] [<Projektarchiv> [<Referenzspezifikation>...]]" + #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "Kurzschrift für Markierung ohne <Markierung>" #: builtin/push.c:64 msgid "--delete only accepts plain target ref names" -msgstr "--delete akzeptiert nur reine Referenz-Namen als Ziel" +msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." #: builtin/push.c:99 msgid "" @@ -4357,14 +6951,14 @@ msgid "" " git push %s %s\n" "%s" msgstr "" -"Der Name des externen Übernahmezweiges stimmt nicht mit dem Namen deines\n" +"Der Name des externen Übernahmezweiges stimmt nicht mit dem Namen Ihres\n" "aktuellen Zweiges überein. Um auf den Übernahmezweig in dem externen\n" -"Projektarchiv zu versenden, benutze:\n" +"Projektarchiv zu versenden, benutzen Sie:\n" "\n" " git push %s HEAD:%s\n" "\n" "Um auf den Zweig mit dem selben Namen in dem externen Projekarchiv\n" -"zu versenden, benutze:\n" +"zu versenden, benutzen Sie:\n" "\n" " git push %s %s\n" "%s" @@ -4378,9 +6972,9 @@ msgid "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -"Du befindest dich sich im Moment auf keinem Zweig.\n" +"Sie befinden sich im Moment auf keinem Zweig.\n" "Um die Historie, führend zum aktuellen (freistehende Zweigspitze (HEAD))\n" -"Status zu versenden, benutze\n" +"Status zu versenden, benutzen Sie\n" "\n" " git push %s HEAD:<Name-des-externen-Zweiges>\n" @@ -4394,7 +6988,7 @@ msgid "" msgstr "" "Der aktuelle Zweig %s hat keinen Zweig im externen Projektarchiv.\n" "Um den aktuellen Zweig zu versenden und das Fernarchiv als externes\n" -"Projektarchiv zu verwenden, benutze\n" +"Projektarchiv zu verwenden, benutzen Sie\n" "\n" " git push --set-upstream %s %s\n" @@ -4410,7 +7004,7 @@ msgid "" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"Du versendest nach '%s', welches kein externes Projektarchiv deines\n" +"Sie versenden nach '%s', welches kein externes Projektarchiv Ihres\n" "aktuellen Zweiges '%s' ist, ohne mir mitzuteilen, was ich versenden\n" "soll, um welchen externen Zweig zu aktualisieren." @@ -4434,26 +7028,25 @@ msgstr "" "'push.default' ist nicht gesetzt; der implizit gesetzte Wert\n" "wird in Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu\n" "unterdrücken und das aktuelle Verhalten nach Änderung des Standardwertes\n" -"beizubehalten, benutze:" -"\n" +"beizubehalten, benutzen Sie:\n" " git config --global push.default matching\n" "\n" -"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen,\n" -"benutze:\n" +"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen, " +"benutzen Sie:\n" "\n" " git config --global push.default simple\n" "\n" -"Führe 'git help config' aus und suche nach 'push.default' für weitere " -"Informationen.\n" -"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den ähnlichen" -" Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von" -" Git benutzt.)" +"Führen Sie 'git help config' aus und suchen Sie nach 'push.default' für " +"weitere Informationen.\n" +"(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den ähnlichen " +"Modus 'current' anstatt 'simple', falls Sie gelegentlich ältere Versionen " +"von Git benutzen.)" #: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -"Du hast keine Referenzspezifikationen zum Versenden angegeben, und push." +"Sie haben keine Referenzspezifikationen zum Versenden angegeben, und push." "default ist \"nothing\"." #: builtin/push.c:206 @@ -4463,9 +7056,10 @@ msgid "" "before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Aktualisierungen wurden zurückgewiesen, weil die Spitze deines aktuellen\n" -"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Führe die\n" -"externen Änderungen zusammen (z.B. 'git pull') bevor du erneut versendest.\n" +"Aktualisierungen wurden zurückgewiesen, weil die Spitze Ihres aktuellen\n" +"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Führen Sie\n" +"die externen Änderungen zusammen (z.B. 'git pull') bevor Sie erneut\n" +"versenden.\n" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." @@ -4477,8 +7071,9 @@ msgid "" "to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n" -"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Wenn du nicht\n" -"beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu " +"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie " +"nicht\n" +"beabsichtigt haben, diesen Zweig zu versenden, können Sie auch den zu " "versendenden\n" "Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu " "'simple', 'current'\n" @@ -4492,28 +7087,36 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n" -"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Checke diesen\n" -"Zweig aus und führe die externen Änderungen zusammen (z.B. 'git pull')\n" -"bevor du erneut versendest.\n" +"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Checken Sie\n" +"diesen Zweig aus und führen Sie die externen Änderungen zusammen\n" +"(z.B. 'git pull') bevor Sie erneut versenden.\n" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the destination reference already exists\n" +"in the remote." +msgstr "" +"Aktualisierungen wurden zurückgewiesen, weil die Zielreferenz bereits\n" +"im Fernarchiv existiert." + +#: builtin/push.c:269 #, c-format msgid "Pushing to %s\n" msgstr "Versende nach %s\n" -#: builtin/push.c:262 +#: builtin/push.c:273 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:294 +#: builtin/push.c:302 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Projektarchiv '%s'" -#: builtin/push.c:295 +#: builtin/push.c:303 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4526,42 +7129,250 @@ msgid "" " git push <name>\n" msgstr "" "Kein Ziel zum Versenden konfiguriert.\n" -"Entweder spezifizierst du die URL von der Kommandozeile oder konfigurierst " +"Entweder spezifizieren Sie die URL von der Kommandozeile oder konfigurieren " "ein externes Projektarchiv unter Benutzung von\n" "\n" " git remote add <Name> <URL>\n" "\n" -"und versendest dann unter Benutzung dieses Namens\n" +"und versenden dann unter Benutzung dieses Namens\n" "\n" " git push <Name>\n" -#: builtin/push.c:310 +#: builtin/push.c:318 msgid "--all and --tags are incompatible" -msgstr "--all und --tags sind inkompatibel" +msgstr "Die Optionen --all und --tags sind inkompatibel." -#: builtin/push.c:311 +#: builtin/push.c:319 msgid "--all can't be combined with refspecs" -msgstr "--all kann nicht mit Referenzspezifikationen kombiniert werden" +msgstr "" +"Die Option --all kann nicht mit Referenzspezifikationen kombiniert werden." -#: builtin/push.c:316 +#: builtin/push.c:324 msgid "--mirror and --tags are incompatible" -msgstr "--mirror und --tags sind inkompatibel" +msgstr "Die Optionen --mirror und --tags sind inkompatibel." -#: builtin/push.c:317 +#: builtin/push.c:325 msgid "--mirror can't be combined with refspecs" -msgstr "--mirror kann nicht mit Referenzspezifikationen kombiniert werden" +msgstr "" +"Die Option --mirror kann nicht mit Referenzspezifikationen kombiniert werden." -#: builtin/push.c:322 +#: builtin/push.c:330 msgid "--all and --mirror are incompatible" -msgstr "--all und --mirror sind inkompatibel" +msgstr "Die Optionen --all und --mirror sind inkompatibel." + +#: builtin/push.c:390 +msgid "repository" +msgstr "Projektarchiv" + +#: builtin/push.c:391 +msgid "push all refs" +msgstr "versendet alle Referenzen" + +#: builtin/push.c:392 +msgid "mirror all refs" +msgstr "spiegelt alle Referenzen" + +#: builtin/push.c:394 +msgid "delete refs" +msgstr "löscht Referenzen" + +#: builtin/push.c:395 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "" +"versendet Markierungen (kann nicht mit --all oder --mirror verwendet werden)" + +#: builtin/push.c:398 +msgid "force updates" +msgstr "erzwingt Aktualisierung" + +#: builtin/push.c:399 +msgid "check" +msgstr "" + +#: builtin/push.c:400 +msgid "control recursive pushing of submodules" +msgstr "steuert rekursives Versenden von Unterprojekten" + +#: builtin/push.c:402 +msgid "use thin pack" +msgstr "verwendet kleinere Pakete" + +#: builtin/push.c:403 builtin/push.c:404 +msgid "receive pack program" +msgstr "'receive pack' Programm" + +#: builtin/push.c:405 +msgid "set upstream for git pull/status" +msgstr "setzt externes Projektarchiv für \"git pull/status\"" + +#: builtin/push.c:408 +msgid "prune locally removed refs" +msgstr "entfernt lokal gelöschte Referenzen" -#: builtin/push.c:410 +#: builtin/push.c:418 msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete ist inkompatibel mit --all, --mirror und --tags" +msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:412 +#: builtin/push.c:420 msgid "--delete doesn't make sense without any refs" -msgstr "--delete macht ohne irgendeine Referenz keinen Sinn" +msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." + +#: builtin/read-tree.c:36 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<Prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<Datei>] (--empty | <Versionsreferenz1> [<Versionsreferenz2> " +"[<Versionsreferenz3>]])" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "schreibt resultierende Bereitstellung nach <Datei>" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "leert die Bereitstellung" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "Zusammenführung" + +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "führt eine Zusammenführung zusätzlich zum Lesen aus" + +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "" +"3-Wege-Zusammenführung, wenn keine Zusammenführung auf Dateiebene " +"erforderlich ist" + +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "" +"3-Wege-Zusammenführung bei Vorhandensein von hinzugefügten/entfernten Zeilen" + +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "genau wie -m, verwirft aber nicht zusammengeführte Einträge" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<Unterverzeichnis>/" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "liest den Baum in die Bereitstellung unter <Unterverzeichnis>/" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "aktualisiert Arbeitsbaum mit Ergebnis der Zusammenführung" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "erlaubt explizit ignorierte Dateien zu überschreiben" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "prüft nicht den Arbeitsbaum nach der Zusammenführung" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "aktualisiert weder die Bereitstellung, noch den Arbeitsbaum" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "überspringt Anwendung des Filters für spärliches Auschecken" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "protokolliert Entpacken der Bäume" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:12 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <Zweig>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <Name> <URL>" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <alt> <neu>" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <Name>" + +#: builtin/remote.c:15 builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <Name> (-a | -d | <Zweig>)" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <Name>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <Name>" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | " +"<externesProjektarchiv>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <Name> <Zweig>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <Name> <neueURL>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <Name> <URL>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<Optionen>] <Name> <URL>" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <Name> <Zweig>..." + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <Name> <Zweig>..." + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<Optionen>] <Name>" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<Optionen>] <Name>" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<Optionen>] [<Gruppe> | <externesProjektarchiv>]..." #: builtin/remote.c:98 #, c-format @@ -4574,22 +7385,53 @@ msgid "" "\t use --mirror=fetch or --mirror=push instead" msgstr "" "--mirror ist gefährlich und veraltet; bitte\n" -"\t benutze stattdessen --mirror=fetch oder --mirror=push" +"\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push" #: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "unbekanntes Argument für Option --mirror: %s" +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "fordert die externen Zweige an" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "importiert alle Markierungen und verbundene Objekte beim Anfordern" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "oder fordere gar keine Zweige an (--no-tags)" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "Zweige zur Übernahme" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "Hauptzweig" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "" +"Aufsetzen des Fernarchivs als Spiegelarchiv zum Versenden und Anfordern" + #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" -msgstr "Angabe eines Hauptzweiges macht mit --mirror keinen Sinn" +msgstr "" +"Die Option --mirror kann nicht mit der Angabe eines Hauptzweiges verwendet " +"werden." #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -"die Angabe von zu folgenden Zweigen macht nur mit dem Abholen von " -"Spiegelarchiven Sinn" +"Die Angabe von zu folgenden Zweigen kann nur mit dem Anfordern von " +"Spiegelarchiven verwendet werden." #: builtin/remote.c:195 builtin/remote.c:646 #, c-format @@ -4654,7 +7496,7 @@ msgstr "" "Keine Aktualisierung der nicht standardmäßigen Referenzspezifikation zum " "Abholen\n" "\t%s\n" -"\tBitte aktualisiere, falls notwendig, die Konfiguration manuell." +"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." #: builtin/remote.c:683 #, c-format @@ -4679,7 +7521,7 @@ msgstr "Konnte '%s' nicht erstellen" #: builtin/remote.c:764 #, c-format msgid "Could not remove branch %s" -msgstr "Konnte Zweig %s nicht entfernen" +msgstr "Konnte Zweig %s nicht löschen" #: builtin/remote.c:834 msgid "" @@ -4690,12 +7532,12 @@ msgid_plural "" "to delete them, use:" msgstr[0] "" "Hinweis: Ein Zweig außerhalb der /refs/remotes/ Hierachie wurde nicht " -"entfernt;\n" -"um diesen zu entfernen, benutze:" +"gelöscht;\n" +"um diesen zu löschen, benutzen Sie:" msgstr[1] "" "Hinweis: Einige Zweige außer der /refs/remotes/ Hierarchie wurden nicht " "entfernt;\n" -"um diese zu entfernen, benutze:" +"um diese zu entfernen, benutzen Sie:" #: builtin/remote.c:943 #, c-format @@ -4708,7 +7550,7 @@ msgstr " gefolgt" #: builtin/remote.c:948 msgid " stale (use 'git remote prune' to remove)" -msgstr " veraltet (benutze 'git remote prune' zum Entfernen)" +msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" #: builtin/remote.c:950 msgid " ???" @@ -4782,6 +7624,10 @@ msgstr " %-*s erzwingt Versand nach %s" msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "keine Abfrage von Fernarchiven" + #: builtin/remote.c:1118 #, c-format msgid "* remote %s" @@ -4842,6 +7688,14 @@ msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Fernarchiv" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "entfernt refs/remotes/<Name>/HEAD" + #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "Kann Hauptzweig des externen Projektarchivs nicht bestimmen" @@ -4849,8 +7703,8 @@ msgstr "Kann Hauptzweig des externen Projektarchivs nicht bestimmen" #: builtin/remote.c:1218 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -"Mehrere Hauptzweige im externen Projektarchiv. Bitte wähle explizit einen " -"aus mit:" +"Mehrere Hauptzweige im externen Projektarchiv. Bitte wählen Sie explizit " +"einen aus mit:" #: builtin/remote.c:1228 #, c-format @@ -4897,18 +7751,39 @@ msgstr " * [würde veralteten Zweig entfernen] %s" msgid " * [pruned] %s" msgstr "* [veralteten Zweig entfernt] %s" +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "entfernt veraltete Zweige im Fernarchiv nach dem Abholen" + #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "Kein solches externes Projektarchiv '%s'" +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "fügt Zweig hinzu" + #: builtin/remote.c:1414 msgid "no remote specified" msgstr "kein externes Projektarchiv angegeben" +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "manipuliert URLs zum Versenden" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "fügt URL hinzu" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "löscht URLs" + #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" -msgstr "--add --delete macht keinen Sinn" +msgstr "" +"Die Optionen --add und --delete können nicht gemeinsam verwendet werden." #: builtin/remote.c:1487 #, c-format @@ -4924,6 +7799,56 @@ msgstr "Keine solche URL gefunden: %s" msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für den Versand bestimmt sind" +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "erweiterte Ausgaben; muss vor einem Unterkommando angegeben werden" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <Objekt> <Ersetzung>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <Objekt>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<Muster>]" + +#: builtin/replace.c:121 +msgid "list replace refs" +msgstr "listet ersetzende Referenzen auf" + +#: builtin/replace.c:122 +msgid "delete replace refs" +msgstr "löscht ersetzende Referenzen" + +#: builtin/replace.c:123 +msgid "replace the ref if it exists" +msgstr "ersetzt die Referenz, wenn sie existiert" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clean | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "registriert saubere Auflösungen in der Bereitstellung" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Version>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <Versionsreferenz> [--] <Pfade>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<Versionsreferenz>] [--] [<Pfade>...]" + #: builtin/reset.c:33 msgid "mixed" msgstr "mixed" @@ -4944,133 +7869,501 @@ msgstr "zusammenführen" msgid "keep" msgstr "keep" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." -msgstr "Du hast keine gültige Zweigspitze (HEAD)." +msgstr "Sie haben keine gültige Zweigspitze (HEAD)." -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "Fehler beim Finden des Baumes der Zweigspitze (HEAD)." -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "Fehler beim Finden des Baumes von %s." -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "Zweigspitze (HEAD) ist jetzt bei %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "Konnte Bereitstellung nicht lesen" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "Nicht bereitgestellte Änderungen nach Zurücksetzung:" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" "Kann keine '%s' Zurücksetzung durchführen, während eine Zusammenführung im " "Gange ist." -#: builtin/reset.c:303 +#: builtin/reset.c:248 +msgid "be quiet, only report errors" +msgstr "weniger Ausgaben, meldet nur Fehler" + +#: builtin/reset.c:250 +msgid "reset HEAD and index" +msgstr "setzt Zweigspitze (HEAD) und Bereitstellung neu" + +#: builtin/reset.c:251 +msgid "reset only HEAD" +msgstr "setzt nur Zweigspitze (HEAD) neu" + +#: builtin/reset.c:253 builtin/reset.c:255 +msgid "reset HEAD, index and working tree" +msgstr "setzt Zweigspitze (HEAD), Bereitstellung und Arbeitsbaum neu" + +#: builtin/reset.c:257 +msgid "reset HEAD but keep local changes" +msgstr "setzt Zweigspitze (HEAD) neu, behält aber lokale Änderungen" + +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Konnte '%s' nicht als gültige Revision auflösen." + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Konnte '%s' nicht als gültigen Baum auflösen." + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -"--mixed mit Pfaden ist veraltet; benutze stattdessen 'git reset -- <Pfade>'." +"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- " +"<Pfade>'." -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "Eine '%s' Zurücksetzung mit Pfaden ist nicht möglich." -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, 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:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen." +msgstr "Konnte Bereitstellungsdatei nicht zu Revision '%s' setzen." + +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "Nicht bereitgestellte Änderungen nach Zurücksetzung:" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [Optionen] -- [<Argumente>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "lässt `--` als Argument" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "stoppt das Parsen nach dem ersten Argument was keine Option ist" + +#: builtin/rev-parse.c:464 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [options] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" +"git rev-parse --parseopt [Optionen] -- [<Argumente>...]\n" +" oder: git rev-parse --sq-quote [<Argumente>...]\n" +" oder: git rev-parse [Optionen] [<Argumente>...]\n" +"\n" +"Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei " +"erster Verwendung aus." + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "git revert [options] <Versionsangabe>" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <Unterkommando>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "git cherry-pick [Optionen] <Versionsangabe>" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <Unterkommando>" #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" -msgstr "%s: %s kann nicht mit %s benutzt werden" +msgstr "%s: %s kann nicht mit %s verwendet werden" + +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "beendet \"revert\" oder \"cherry-pick\" Ablauf" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "setzt \"revert\" oder \"cherry-pick\" Ablauf fort" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "bricht \"revert\" oder \"cherry-pick\" Ablauf ab" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "trägt nicht automatisch ein" + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "Bearbeitung der Versionsbeschreibung" -#: builtin/revert.c:131 +#: builtin/revert.c:110 +msgid "parent number" +msgstr "Nummer des Elternteils" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "Zusammenführungsstrategie" + +#: builtin/revert.c:113 +msgid "option" +msgstr "Option" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "Option für Zusammenführungsstrategie" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "hängt Versionsnamen an" + +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "erlaubt Vorspulen" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "erhält ursprüngliche, leere Versionen" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "erlaubt Version mit leerer Beschreibung" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "behält redundante, leere Versionen" + +#: builtin/revert.c:133 msgid "program error" msgstr "Programmfehler" -#: builtin/revert.c:221 +#: builtin/revert.c:223 msgid "revert failed" msgstr "\"revert\" fehlgeschlagen" -#: builtin/revert.c:236 +#: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" -#: builtin/rm.c:109 +#: builtin/rm.c:15 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [Optionen] [--] [<Datei>...]" + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"Unterprojekt '%s' (oder ein geschachteltes Unterprojekt hiervon) verwendet\n" +"ein .git-Verzeichnis (benutzen Sie 'rm -rf' wenn Sie dieses wirklich " +"mitsamt\n" +"seiner Historie löschen möchten)" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" "'%s' hat bereitgestellten Inhalt unterschiedlich zu der Datei und der\n" -"Zweigspitze (HEAD) (benutze -f um die Entfernung zu erzwingen)" +"Zweigspitze (HEAD) (benutzen Sie -f um die Entfernung zu erzwingen)" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' hat Änderungen in der Bereitstellung\n" -"(benutze --cached um die Datei zu behalten, oder -f um die Entfernung zu " -"erzwingen)" +"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung " +"zu erzwingen)" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' hat lokale Modifikationen\n" -"(benutze --cached um die Datei zu behalten, oder -f um die Entfernung zu " -"erzwingen)" +"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung " +"zu erzwingen)" + +#: builtin/rm.c:207 +msgid "do not list removed files" +msgstr "listet keine gelöschten Dateien auf" + +#: builtin/rm.c:208 +msgid "only remove from the index" +msgstr "entfernt nur aus der Bereitstellung" + +#: builtin/rm.c:209 +msgid "override the up-to-date check" +msgstr "überschreibt die \"up-to-date\" Prüfung" + +#: builtin/rm.c:210 +msgid "allow recursive removal" +msgstr "erlaubt rekursive Entfernung" + +#: builtin/rm.c:212 +msgid "exit with a zero status even if nothing matched" +msgstr "beendet mit Rückgabewert 0, wenn keine Übereinstimmung gefunden wurde" -#: builtin/rm.c:194 +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "'%s' wird nicht ohne -r rekursiv entfernt" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" -msgstr "git rm: konnte %s nicht entfernen" +msgstr "git rm: konnte %s nicht löschen" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "" +"git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] " +"[<Versionsidentifikation>... ]" + +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "fehlender Autor: %s" +#: builtin/shortlog.c:229 +msgid "sort output according to the number of commits per author" +msgstr "sortiert die Ausgabe entsprechend der Anzahl von Versionen pro Autor" + +#: builtin/shortlog.c:231 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Unterdrückt Versionsbeschreibungen, liefert nur Anzahl der Versionen" + +#: builtin/shortlog.c:233 +msgid "Show the email address of each author" +msgstr "Zeigt die Email-Adresse von jedem Autor" + +#: builtin/shortlog.c:234 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:235 +msgid "Linewrap output" +msgstr "Ausgabe mit Zeilenumbrüchen" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" +msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<Wann>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] " +"[(<Revision> | <glob>)...]" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g|--reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "zeigt externe Übernahmezweige und lokale Zweige an" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "zeigt externe Übernahmezweige an" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "färbt '*!+-' entsprechend des Zweiges ein" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "zeigt <n> weitere Versionen nach dem gemeinsamen Vorfahren" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "Synonym für more=-1" + +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "unterdrückt Namen" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "bezieht den aktuellen Zweig ein" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "benennt Versionen nach ihren Objektnamen" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "zeigt mögliche Basen für Zusammenführung" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "zeigt Referenzen die unerreichbar von allen anderen Referenzen sind" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "zeigt Versionen in topologischer Ordnung" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "zeigt nur Versionen, die sich nicht im ersten Zweig befinden" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "" +"zeigt Zusammenführungen, die nur von einer Zweigspitze aus erreichbar sind" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "zeigt Versionen, wo kein Elternteil vor seinem Kind kommt" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "<n>[,<Basis>]" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "" +"zeigt die <n> jüngsten Einträge im Referenzprotokoll beginnend an der Basis" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=Muster] < ref-list" + +#: builtin/show-ref.c:165 +msgid "only show tags (can be combined with heads)" +msgstr "zeigt nur Markierungen (kann mit \"heads\" kombiniert werden)" + +#: builtin/show-ref.c:166 +msgid "only show heads (can be combined with tags)" +msgstr "zeigt nur Zweigspitzen (kann mit \"tags\" kombiniert werden)" + +#: builtin/show-ref.c:167 +msgid "stricter reference checking, requires exact ref path" +msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad" + +#: builtin/show-ref.c:170 builtin/show-ref.c:172 +msgid "show the HEAD reference" +msgstr "zeigt Referenz der Zweigspitze (HEAD)" + +#: builtin/show-ref.c:174 +msgid "dereference tags into object IDs" +msgstr "dereferenziert Markierungen in Objekt-Identifikationen" + +#: builtin/show-ref.c:176 +msgid "only show SHA1 hash using <n> digits" +msgstr "zeigt nur SHA1 Hash mit <n> Ziffern" + +#: builtin/show-ref.c:180 +msgid "do not print results to stdout (useful with --verify)" +msgstr "" +"keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)" + +#: builtin/show-ref.c:182 +msgid "show refs from stdin that aren't in local repository" +msgstr "" +"zeigt Referenzen von der Standard-Eingabe, die sich nicht im lokalen " +"Projektarchiv befinden, an" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "git symbolic-ref [Optionen] name [ref]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "git symbolic-ref -d [-q] name" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" +"unterdrückt Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "löscht symbolische Referenzen" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "verkürzte Ausgabe der Referenzen" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason" +msgstr "Grund" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "Grund für die Aktualisierung" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "" +"git tag [-a|-s|-u <Schlüssel-id>] [-f] [-m <Nachricht>|-F <Datei>] " +"<Markierungsname> [<Zweig>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <Markierungsname>..." + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" +"git tag -l [-n[<Nummer>]] [--contains <Version>] [--points-at <Objekt>] \n" +"\t\t[<Muster>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <Markierungsname>..." + #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" @@ -5106,7 +8399,7 @@ msgid "" msgstr "" "\n" "#\n" -"# Gebe eine Markierungsbeschreibung ein\n" +"# Geben Sie eine Markierungsbeschreibung ein.\n" "# Zeilen, die mit '#' beginnen, werden ignoriert.\n" "#\n" @@ -5121,9 +8414,9 @@ msgid "" msgstr "" "\n" "#\n" -"# Gebe eine Markierungsbeschreibung ein\n" -"# Zeilen, die mit '#' beginnen, werden behalten; du darfst diese\n" -"# selbst entfernen wenn du möchtest.\n" +"# Geben Sie eine Markierungsbeschreibung ein.\n" +"# Zeilen, die mit '#' beginnen, werden behalten; Sie dürfen diese\n" +"# selbst entfernen wenn Sie möchten.\n" "#\n" #: builtin/tag.c:298 @@ -5160,6 +8453,62 @@ msgstr "Option 'points-at' erfordert ein Objekt" msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" +#: builtin/tag.c:447 +msgid "list tag names" +msgstr "listet Markierungsnamen auf" + +#: builtin/tag.c:449 +msgid "print <n> lines of each tag message" +msgstr "zeigt <n> Zeilen jeder Markierungsbeschreibung" + +#: builtin/tag.c:451 +msgid "delete tags" +msgstr "löscht Markierungen" + +#: builtin/tag.c:452 +msgid "verify tags" +msgstr "überprüft Markierungen" + +#: builtin/tag.c:454 +msgid "Tag creation options" +msgstr "Optionen für Erstellung von Markierungen" + +#: builtin/tag.c:456 +msgid "annotated tag, needs a message" +msgstr "annotierte Markierung, benötigt eine Beschreibung" + +#: builtin/tag.c:458 +msgid "tag message" +msgstr "Markierungsbeschreibung" + +#: builtin/tag.c:460 +msgid "annotated and GPG-signed tag" +msgstr "annotierte und GPG-signierte Markierung" + +#: builtin/tag.c:464 +msgid "use another key to sign the tag" +msgstr "verwendet einen anderen Schlüssel um die Markierung zu signieren" + +#: builtin/tag.c:465 +msgid "replace the tag if exists" +msgstr "ersetzt die Markierung, wenn sie existiert" + +#: builtin/tag.c:466 +msgid "show tag list in columns" +msgstr "zeigt Liste der Markierungen in Spalten" + +#: builtin/tag.c:468 +msgid "Tag listing options" +msgstr "Optionen für Auflistung der Markierungen" + +#: builtin/tag.c:471 +msgid "print only tags that contain the commit" +msgstr "gibt nur Markierungen aus, die diese Version beinhalten" + +#: builtin/tag.c:477 +msgid "print only tags of the object" +msgstr "gibt nur Markierungen von dem Objekt aus" + #: builtin/tag.c:506 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" @@ -5209,41 +8558,205 @@ msgstr "%s: kann Referenz nicht aktualisieren" msgid "Updated tag '%s' (was %s)\n" msgstr "Aktualisierte Markierung '%s' (war %s)\n" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [Optionen] [--] [<Datei>...]" + +#: builtin/update-index.c:718 +msgid "continue refresh even when index needs update" msgstr "" -"Siehe 'git help <Kommando>' für weitere Informationen zu einem spezifischen " -"Kommando" +"Aktualisierung fortsetzen, auch wenn die Bereitstellung aktualisiert werden " +"muss" -#: parse-options.h:133 parse-options.h:235 -msgid "n" -msgstr "Anzahl" +#: builtin/update-index.c:721 +msgid "refresh: ignore submodules" +msgstr "Aktualisierung: ignoriert Unterprojekte" -#: parse-options.h:141 -msgid "time" -msgstr "Zeit" +#: builtin/update-index.c:724 +msgid "do not ignore new files" +msgstr "ignoriert keine neuen Dateien" -#: parse-options.h:149 -msgid "file" -msgstr "Datei" +#: builtin/update-index.c:726 +msgid "let files replace directories and vice-versa" +msgstr "lässt Dateien Verzeichnisse ersetzen, und umgedreht" -#: parse-options.h:151 -msgid "when" -msgstr "wann" +#: builtin/update-index.c:728 +msgid "notice files missing from worktree" +msgstr "beachtet fehlende Dateien im Arbeitsbaum" + +#: builtin/update-index.c:730 +msgid "refresh even if index contains unmerged entries" +msgstr "" +"aktualisiert, auch wenn die Bereitstellung nicht zusammengeführte Einträge " +"beinhaltet" + +#: builtin/update-index.c:733 +msgid "refresh stat information" +msgstr "aktualisiert Dateiinformationen" + +#: builtin/update-index.c:737 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" + +#: builtin/update-index.c:741 +msgid "<mode> <object> <path>" +msgstr "<Modus> <Objekt> <Pfad>" + +#: builtin/update-index.c:742 +msgid "add the specified entry to the index" +msgstr "stellt den angegebenen Eintrag zur Eintragung bereit" + +#: builtin/update-index.c:746 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:747 +msgid "override the executable bit of the listed files" +msgstr "überschreibt das \"ausführbar\"-Bit der aufgelisteten Dateien" + +#: builtin/update-index.c:751 +msgid "mark files as \"not changing\"" +msgstr "betrachte diese Datei immer als unverändert" + +#: builtin/update-index.c:754 +msgid "clear assumed-unchanged bit" +msgstr "löscht \"assumed-unchanged\"-Bit" + +#: builtin/update-index.c:757 +msgid "mark files as \"index-only\"" +msgstr "markiert Dateien als \"index-only\"" + +#: builtin/update-index.c:760 +msgid "clear skip-worktree bit" +msgstr "löscht \"skip-worktree\"-Bit" + +#: builtin/update-index.c:763 +msgid "add to index only; do not add content to object database" +msgstr "" +"fügt nur der Bereitstellung hinzu; Inhalt wird nicht der Objekt-Datenbank " +"hinzugefügt" + +#: builtin/update-index.c:765 +msgid "remove named paths even if present in worktree" +msgstr "löscht benannte Pfade, auch wenn sie sich im Arbeitsbaum befinden" + +#: builtin/update-index.c:767 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" + +#: builtin/update-index.c:769 +msgid "read list of paths to be updated from standard input" +msgstr "liest Liste der zu aktualisierenden Pfade von der Standard-Eingabe" + +#: builtin/update-index.c:773 +msgid "add entries from standard input to the index" +msgstr "fügt Einträge von der Standard-Eingabe der Bereitstellung hinzu" + +#: builtin/update-index.c:777 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "" +"wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" + +#: builtin/update-index.c:781 +msgid "only update entries that differ from HEAD" +msgstr "" +"aktualisiert nur Einträge, die unterschiedlich zur Zweigspitze (HEAD) sind" + +#: builtin/update-index.c:785 +msgid "ignore files missing from worktree" +msgstr "ignoriert fehlende Dateien im Arbeitsbaum" + +#: builtin/update-index.c:788 +msgid "report actions to standard output" +msgstr "gibt die Aktionen in der Standard-Ausgabe aus" + +#: builtin/update-index.c:790 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" + +#: builtin/update-index.c:794 +msgid "write index in this format" +msgstr "schreibt Bereitstellungsdatei in diesem Format" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [Optionen] -d <Referenzname> [<alterWert>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [Optionen] <Referenzname> <neuerWert> [<alterWert>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "löscht diese Referenz" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "aktualisiert <Referenzname>, nicht den Verweis" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "aktualisiert die Informationsdateien von Grund auf" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <Paket>..." + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "erweiterte Ausgaben" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "zeigt nur Statistiken" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <Markierung>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "gibt Markierungsinhalte aus" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<Prefix>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<Prefix>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "schreibt das Baumobjekt für ein Unterverzeichnis <Prefix>" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "nur nützlich für Fehlersuche" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Siehe 'git help <Kommando>' für weitere Informationen zu einem spezifischen " +"Kommando" #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" @@ -5320,7 +8833,7 @@ msgstr "Baut lokale Versionen auf einem aktuellerem externen Zweig neu auf" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" msgstr "" -"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand zurück" +"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand" #: common-cmds.h:25 msgid "Remove files from the working tree and from the index" @@ -5342,14 +8855,14 @@ msgstr "" #: git-am.sh:50 msgid "You need to set your committer info first" -msgstr "Du musst zuerst die Informationen des Eintragenden setzen." +msgstr "Sie müssen zuerst die Informationen des Eintragenden setzen." #: git-am.sh:95 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -"Du scheinst seit dem letzten gescheiterten 'am' die Zweigspitze (HEAD)\n" +"Sie scheinen seit dem letzten gescheiterten 'am' die Zweigspitze (HEAD)\n" "geändert zu haben.\n" "Keine Zurücksetzung zu ORIG_HEAD." @@ -5360,12 +8873,11 @@ msgid "" "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." +"Wenn Sie das Problem gelöst haben, führen Sie \"$cmdline --resolved\" aus.\n" +"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen\n" +"\"$cmdline --skip\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der\n" +"Patches abzubrechen, führen Sie \"$cmdline --abort\" aus." #: git-am.sh:121 msgid "Cannot fall back to three-way merge." @@ -5388,7 +8900,7 @@ msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -"Hast du den Patch per Hand editiert?\n" +"Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." #: git-am.sh:163 @@ -5429,7 +8941,7 @@ msgstr "" #: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" -msgstr "Bitte werde dir klar. --skip oder --abort?" +msgstr "Bitte werden Sie sich klar. --skip oder --abort?" #: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." @@ -5449,15 +8961,15 @@ 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" +"Wenn Sie diesen Patch auslassen möchten, führen Sie stattdessen\n" +"\"$cmdline --skip\" aus.\n" "Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der " "Patches\n" -"abzubrechen, führe \"$cmdline --abort\" aus." +"abzubrechen, führen Sie \"$cmdline --abort\" aus." #: git-am.sh:706 msgid "Patch does not have a valid e-mail address." -msgstr "Patch enthält keine gültige eMail-Adresse." +msgstr "Patch enthält keine gültige Email-Adresse." #: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." @@ -5487,9 +8999,9 @@ msgid "" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -"Keine Änderungen - hast du vergessen 'git add' zu benutzen?\n" +"Keine Änderungen - haben Sie vergessen 'git add' zu benutzen?\n" "Wenn keine Änderungen mehr zum Bereitstellen vorhanden sind, könnten\n" -"diese bereits anderweitig eingefügt worden sein; du könntest diesen Patch\n" +"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n" "auslassen." #: git-am.sh:829 @@ -5497,8 +9009,8 @@ msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -"Du hast immer noch nicht zusammengeführte Pfade in der Bereitstellung.\n" -"Hast du vergessen 'git add' zu benutzen?" +"Sie haben immer noch nicht zusammengeführte Pfade in der Bereitstellung.\n" +"Haben Sie vergessen 'git add' zu benutzen?" #: git-am.sh:845 msgid "No changes -- Patch already applied." @@ -5509,20 +9021,29 @@ msgstr "Keine Änderungen -- Patches bereits angewendet." msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Anwendung des Patches fehlgeschlagen bei $msgnum $FIRSTLINE" +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"Die Kopie des fehlgeschlagenen Patches befindet sich in:\n" +" $dotest/patch" + #: git-am.sh:876 msgid "applying to an empty history" msgstr "wende zu leerer Historie an" #: git-bisect.sh:48 msgid "You need to start by \"git bisect start\"" -msgstr "Du musst mit \"git bisect start\" beginnen." +msgstr "Sie müssen mit \"git bisect start\" beginnen." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:54 msgid "Do you want me to do it for you [Y/n]? " -msgstr "Willst du, dass ich es für dich mache [Y/n]? " +msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? " #: git-bisect.sh:95 #, sh-format @@ -5532,7 +9053,7 @@ msgstr "nicht erkannte Option: '$arg'" #: git-bisect.sh:99 #, sh-format msgid "'$arg' does not appear to be a valid revision" -msgstr "'$arg' scheint keine gültige Version zu sein" +msgstr "'$arg' scheint keine gültige Revision zu sein" #: git-bisect.sh:117 msgid "Bad HEAD - I need a HEAD" @@ -5543,7 +9064,7 @@ msgstr "Ungültige Zweigspitze (HEAD) - Zweigspitze (HEAD) wird benötigt" msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." msgstr "" -"Auschecken von '$start_head' fehlgeschlagen. Versuche 'git bisect reset " +"Auschecken von '$start_head' fehlgeschlagen. Versuchen Sie 'git bisect reset " "<gueltigerzweig>'." #: git-bisect.sh:140 @@ -5566,7 +9087,7 @@ msgstr "Ungültige Referenz-Eingabe: $arg" #: git-bisect.sh:232 msgid "Please call 'bisect_state' with at least one argument." -msgstr "Bitte rufe 'bisect_state' mit mindestens einem Argument auf." +msgstr "Bitte rufen Sie 'bisect_state' mit mindestens einem Argument auf." #: git-bisect.sh:244 #, sh-format @@ -5588,15 +9109,15 @@ msgstr "Warnung: halbiere nur mit einer fehlerhaften Version" #. at this point. #: git-bisect.sh:279 msgid "Are you sure [Y/n]? " -msgstr "Bist du sicher [Y/n]? " +msgstr "Sind Sie sicher [Y/n]? " #: git-bisect.sh:289 msgid "" "You need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" -"Du musst mindestens eine korrekte und eine fehlerhafte Version angeben.\n" -"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" +"Sie müssen mindestens eine korrekte und eine fehlerhafte Revision angeben.\n" +"(Sie können dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" #: git-bisect.sh:292 msgid "" @@ -5604,10 +9125,10 @@ msgid "" "You then need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" -"Du musst mit \"git bisect start\" beginnen.\n" -"Danach musst du mindestens eine korrekte und eine fehlerhafte Version " +"Sie müssen mit \"git bisect start\" beginnen.\n" +"Danach müssen Sie mindestens eine korrekte und eine fehlerhafte Revision " "angeben.\n" -"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" +"(Sie können dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" #: git-bisect.sh:347 git-bisect.sh:474 msgid "We are not bisecting." @@ -5625,7 +9146,7 @@ msgid "" "Try 'git bisect reset <commit>'." msgstr "" "Konnte die ursprüngliche Zweigspitze (HEAD) '$branch' nicht auschecken.\n" -"Versuche 'git bisect reset <Version>'." +"Versuchen Sie 'git bisect reset <Version>'." #: git-bisect.sh:390 msgid "No logfile given" @@ -5638,7 +9159,7 @@ msgstr "kann $file nicht für das Abspielen lesen" #: git-bisect.sh:408 msgid "?? what are you talking about?" -msgstr "?? Was redest du da?" +msgstr "?? Was reden Sie da?" #: git-bisect.sh:420 #, sh-format @@ -5677,14 +9198,16 @@ msgid "" "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution, or use 'git commit -a'." msgstr "" -"\"pull\" ist nicht möglich, weil du nicht zusammengeführte Dateien hast.\n" -"Bitte korrigiere dies im Arbeitsbaum und benutze dann 'git add/rm <Datei>'\n" -"um die Auflösung entsprechend zu markieren, oder benutze 'git commit -a'." +"\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben.\n" +"Bitte korrigieren Sie dies im Arbeitsbaum und benutzen Sie dann 'git add/rm " +"<Datei>'\n" +"um die Auflösung entsprechend zu markieren, oder benutzen Sie 'git commit -" +"a'." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "" -"\"pull\" ist nicht möglich, weil du nicht zusammengeführte Dateien hast." +"\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." #: git-pull.sh:197 msgid "updating an unborn branch with changes added to the index" @@ -5696,7 +9219,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -5704,64 +9227,71 @@ msgid "" "Warning: commit $orig_head." msgstr "" "Warnung: Die Anforderung aktualisierte die Spitze des aktuellen Zweiges.\n" -"Warnung: Spule deinen Arbeitszweig von Version $orig_head vor." +"Warnung: Spule Ihren Arbeitszweig von Version $orig_head vor." -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "Kann nicht mehrere Zweige in einen ungeborenen Zweig zusammenführen" -#: git-pull.sh:257 +#: git-pull.sh:258 msgid "Cannot rebase onto multiple branches" msgstr "kann nicht auf mehrere Zweige neu aufbauen" -#: git-rebase.sh:52 +#: git-rebase.sh:53 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" +"Wenn Sie das Problem aufgelöst haben, führen Sie \"git rebase --continue\" " +"aus.\n" +"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"git " +"rebase --skip\" aus.\n" "Um den ursprünglichen Zweig wiederherzustellen und den Neuaufbau " "abzubrechen,\n" -"führe \"git rebase --abort\" aus." +"führen Sie \"git rebase --abort\" aus." -#: git-rebase.sh:159 +#: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Neuaufbau zurückgewiesen." -#: git-rebase.sh:164 +#: git-rebase.sh:165 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 +#: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" -msgstr "Die --exec Option muss mit der --interactive Option benutzt werden" +msgstr "Die Option --exec muss mit --interactive verwendet werden." -#: git-rebase.sh:300 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "Kein Neuaufbau im Gange?" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "" +"Die --edit-todo Aktion kann nur während eines interaktiven Neuaufbaus " +"verwendet werden." + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "Kann Zweigspitze (HEAD) nicht lesen" -#: git-rebase.sh:316 +#: git-rebase.sh:322 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" +"Sie müssen alle Zusammenführungskonflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: git-rebase.sh:334 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurückgehen" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -5773,68 +9303,68 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there." msgstr "" -"Es scheint so, als gäbe es das Verzeichnis $state_dir_base bereits, und\n" -"es wäre verwunderlich, wenn ein Neuaufbau bereits im Gange ist. Wenn das\n" -"der Fall ist, probiere bitte\n" +"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" +"probieren Sie bitte\n" "\t$cmd_live_rebase\n" -"Wenn das nicht der Fall ist, probiere bitte\n" +"Wenn das nicht der Fall ist, probieren Sie bitte\n" "\t$cmd_clear_stale_rebase\n" -"und führe dieses Kommando nochmal aus. Es wird angehalten, falls bereits\n" -"etwas Nützliches vorhanden ist." +"und führen Sie dieses Kommando nochmal aus. Es wird angehalten, falls noch\n" +"etwas Schützenswertes vorhanden ist." -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ungültiger Übernahmezweig $upstream_name" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, 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 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: es gibt keine Zusammenführungsbasis" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, 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 +#: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: Zweig $branch_name nicht gefunden" -#: git-rebase.sh:474 +#: git-rebase.sh:483 msgid "Please commit or stash them." -msgstr "Bitte trage die Änderungen ein oder benutze \"stash\"." +msgstr "Bitte tragen Sie die Änderungen ein oder benutzen Sie \"stash\"." -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, 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 +#: git-rebase.sh:504 #, 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 +#: git-rebase.sh:515 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Änderungen von $mb zu $onto:" #. Detach HEAD and reset the tree -#: git-rebase.sh:515 +#: git-rebase.sh:524 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -"Zunächst wird die Zweigspitze zurückgespult, um deine Änderungen\n" +"Zunächst wird die Zweigspitze zurückgespult, um Ihre Änderungen\n" "darauf neu anzuwenden..." -#: git-rebase.sh:523 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." @@ -5845,7 +9375,7 @@ msgstr "git stash clear mit Parametern ist nicht implementiert" #: git-stash.sh:74 msgid "You do not have the initial commit yet" -msgstr "Du hast bisher noch keine initiale Version" +msgstr "Sie haben bisher noch keine initiale Version" #: git-stash.sh:89 msgid "Cannot save the current index state" @@ -5861,7 +9391,7 @@ msgstr "Keine Änderungen ausgewählt" #: git-stash.sh:143 msgid "Cannot remove temporary index (can't happen)" -msgstr "Kann temporäre Bereitstellung nicht entfernen (kann nicht passieren)" +msgstr "Kann temporäre Bereitstellung nicht löschen (kann nicht passieren)" #: git-stash.sh:156 msgid "Cannot record working tree state" @@ -5884,7 +9414,7 @@ msgid "" " To provide a message, use git stash save -- '$option'" msgstr "" "Fehler: unbekannte Option für 'stash save': $option\n" -" Um eine Beschreibung anzugeben, benutze \"git stash save -- " +" Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- " "'$option'\"" #: git-stash.sh:223 @@ -5901,7 +9431,7 @@ msgstr "Kann den aktuellen Status nicht speichern" #: git-stash.sh:253 msgid "Cannot remove worktree changes" -msgstr "Kann Änderungen am Arbeitsbaum nicht entfernen" +msgstr "Kann Änderungen am Arbeitsbaum nicht löschen" #: git-stash.sh:352 msgid "No stash found." @@ -5938,7 +9468,7 @@ msgstr "" #: git-stash.sh:424 msgid "Conflicts in index. Try without --index." -msgstr "Konflikte in der Bereitstellung. Versuche es ohne --index." +msgstr "Konflikte in der Bereitstellung. Versuchen Sie es ohne --index." #: git-stash.sh:426 msgid "Could not save index tree" @@ -5948,226 +9478,335 @@ msgstr "Konnte Bereitstellungsbaum nicht speichern" msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht aus der Bereitstellung herausnehmen" -#: git-stash.sh:474 +#: git-stash.sh:475 msgid "Index was not unstashed." msgstr "Bereitstellung wurde nicht ausgelagert." -#: git-stash.sh:491 +#: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Gelöscht ${REV} ($s)" -#: git-stash.sh:492 +#: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-stash.sh:499 +#: git-stash.sh:500 msgid "No branch name specified" msgstr "Kein Zweigname spezifiziert" -#: git-stash.sh:570 +#: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" -msgstr "(Zur Wiederherstellung gebe \"git stash apply\" ein)" +msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" -#: git-submodule.sh:88 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" -#: git-submodule.sh:167 +#: git-submodule.sh:195 #, 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:211 +#: git-submodule.sh:238 #, 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:223 +#: git-submodule.sh:250 #, 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:312 +#: git-submodule.sh:343 #, 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:329 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existiert bereits in der Bereitstellung" -#: git-submodule.sh:333 +#: git-submodule.sh:364 #, 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 Ihrer \".gitignore\" Dateien ignoriert:\n" "$sm_path\n" -"Benutze -f wenn du diesen wirklich hinzufügen möchtest." +"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten." -#: git-submodule.sh:344 +#: git-submodule.sh:382 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" "Füge existierendes Projektarchiv in '$sm_path' der Bereitstellung hinzu." -#: git-submodule.sh:346 +#: git-submodule.sh:384 #, 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:360 +#: git-submodule.sh:392 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "" +"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Fernarchiv" +"(en):" + +#: git-submodule.sh:394 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "" +"Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt " +"erneut zu klonen" + +#: git-submodule.sh:396 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" +"benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das " +"korrekte Projektarchiv ist" + +#: git-submodule.sh:397 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" +"oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen " +"Namenmit der Option '--name'." + +#: git-submodule.sh:399 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "Reaktiviere lokales Git-Verzeichnis für Unterprojekt '$sm_name'." + +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken" -#: git-submodule.sh:365 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:370 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:413 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Betrete '$prefix$sm_path'" -#: git-submodule.sh:427 +#: git-submodule.sh:482 #, 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:471 +#: git-submodule.sh:526 #, 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:480 +#: git-submodule.sh:535 #, 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:482 +#: git-submodule.sh:537 #, 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:490 +#: git-submodule.sh:545 #, 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:590 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" "Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n" -"Vielleicht möchtest du 'update --init' benutzen?" +"Vielleicht möchten Sie 'update --init' benutzen?" -#: git-submodule.sh:603 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" -msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden" +msgstr "Konnte aktuelle Revision in Unterprojekt-Pfad '$sm_path' nicht finden" -#: git-submodule.sh:622 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern" -#: git-submodule.sh:636 +#: git-submodule.sh:709 #, 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:637 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'" -#: git-submodule.sh:642 +#: git-submodule.sh:715 #, 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:643 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'" -#: git-submodule.sh:648 +#: git-submodule.sh:721 #, 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:649 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'" -#: git-submodule.sh:779 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" -msgstr "Die --cached Option kann nicht mit der --files Option benutzt werden" +msgstr "" +"Die Optionen --cached und --files können nicht gemeinsam verwendet werden." #. unexpected type -#: git-submodule.sh:819 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:837 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Warnung: $name beinhaltet nicht Version $sha1_src" -#: git-submodule.sh:840 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst" -#: git-submodule.sh:843 +#: git-submodule.sh:916 #, 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:868 +#: git-submodule.sh:941 msgid "blob" msgstr "Blob" -#: git-submodule.sh:906 +#: git-submodule.sh:979 msgid "# Submodules changed but not updated:" msgstr "# Unterprojekte geändert, aber nicht aktualisiert:" -#: git-submodule.sh:908 +#: git-submodule.sh:981 msgid "# Submodule changes to be committed:" msgstr "# Änderungen in Unterprojekt zum Eintragen:" -#: git-submodule.sh:1054 +#: git-submodule.sh:1129 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "Synchronisiere Unterprojekt-URL für '$name'" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "Synchronisiere Unterprojekt-URL für '$prefix$sm_path'" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "Sie haben keine gültige Zweigspitze (HEAD)" + +#~ msgid "oops" +#~ msgstr "Ups" + +#~ msgid "Would not remove %s\n" +#~ msgstr "Würde '%s' nicht löschen\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "Entferne nicht %s\n" + +#~ msgid "Could not read index" +#~ msgstr "Konnte Bereitstellung nicht lesen" + +#~ msgid " 0 files changed" +#~ msgstr " 0 Dateien geändert" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d Datei geändert" +#~ msgstr[1] " %d Dateien geändert" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] ", %d Zeile hinzugefügt(+)" +#~ msgstr[1] ", %d Zeilen hinzugefügt(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] ", %d Zeile entfernt(-)" +#~ msgstr[1] ", %d Zeilen entfernt(-)" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "" +#~ "Die Datenbank des Projektarchivs wird für eine optimale Performance " +#~ "komprimiert.\n" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <Name> (-a | -d | <Zweig>])" + +#~ msgid " (use \"git add\" to track)" +#~ msgstr " (benutze \"git add\" zum Beobachten)" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "-B kann nicht mit -b benutzt werden" + +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch ist inkompatibel mit allen anderen Optionen" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach kann nicht mit -t benutzt werden" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "--orphan und -b|-B sind gegenseitig exklusiv" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan kann nicht mit -t benutzt werden" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout: -f und -m sind inkompatibel" + +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "" +#~ "git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem " +#~ "Wechsel von Zweigen." #~ msgid "diff setup failed" #~ msgstr "diff_setup_done fehlgeschlagen" @@ -6199,9 +9838,6 @@ msgstr "Synchronisiere Unterprojekt-URL für '$name'" #~ msgid "Please enter the commit message for your changes." #~ msgstr "Bitte gebe die Versionsbeschreibung für deine Änderungen ein." -#~ msgid "Too many options specified" -#~ msgstr "Zu viele Optionen angegeben" - #~ msgid "" #~ "To prevent you from losing history, non-fast-forward updates were " #~ "rejected\n" diff --git a/po/git.pot b/po/git.pot index 6915b02153..a2ab9e8263 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-09-05 06:20+0800\n" +"POT-Creation-Date: 2013-02-19 13:32+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" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "" @@ -27,7 +27,7 @@ msgstr "" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -35,6 +35,97 @@ msgid "" "or use 'git commit -a'." msgstr "" +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "" + +#: archive.c:11 +msgid "git archive --list" +msgstr "" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "" + +#: archive.c:323 +msgid "fmt" +msgstr "" + +#: archive.c:323 +msgid "archive format" +msgstr "" + +#: archive.c:324 builtin/log.c:1115 +msgid "prefix" +msgstr "" + +#: archive.c:325 +msgid "prepend prefix to each pathname in the archive" +msgstr "" + +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "" + +#: archive.c:327 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "" + +#: archive.c:329 +msgid "read .gitattributes in working directory" +msgstr "" + +#: archive.c:330 +msgid "report archived files on stderr" +msgstr "" + +#: archive.c:331 +msgid "store only" +msgstr "" + +#: archive.c:332 +msgid "compress faster" +msgstr "" + +#: archive.c:340 +msgid "compress better" +msgstr "" + +#: archive.c:343 +msgid "list supported archive formats" +msgstr "" + +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "" + +#: archive.c:346 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "" + +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 +msgid "command" +msgstr "" + +#: archive.c:348 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "" + +#: attr.c:259 +msgid "" +"Negative patterns are forbidden in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -45,7 +136,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:699 +#: bundle.c:89 builtin/commit.c:674 #, c-format msgid "could not open '%s'" msgstr "" @@ -54,9 +145,9 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "" @@ -82,7 +173,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -113,12 +204,12 @@ msgstr "" msgid "index-pack died" msgstr "" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "" @@ -208,56 +299,41 @@ msgid_plural "%lu years ago" msgstr[0] "" msgstr[1] "" -#: diff.c:105 +#: diff.c:112 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:110 +#: diff.c:117 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" msgstr "" #: diff.c:210 #, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "" + +#: diff.c:260 +#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:1401 -msgid " 0 files changed" -msgstr "" - -#: diff.c:1405 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:1422 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:1433 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] "" -msgstr[1] "" - -#: diff.c:3460 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: gpg-interface.c:59 +#: diff.c:3482 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "" + +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "" @@ -269,17 +345,27 @@ msgstr "" msgid "gpg failed to sign the data" msgstr "" -#: grep.c:1320 +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "" + +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" msgstr "" @@ -293,35 +379,39 @@ msgstr "" msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "" + +#: help.c:292 #, 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:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:354 +#: help.c:371 #, 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:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -331,6 +421,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#: merge.c:56 +msgid "failed to read the cache" +msgstr "" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +msgid "unable to write new index file" +msgstr "" + #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" @@ -391,221 +490,239 @@ msgstr "" msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:921 +#: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:925 +#: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:941 +#: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1020 merge-recursive.c:1034 +#: merge-recursive.c:1021 merge-recursive.c:1035 #, 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:1026 merge-recursive.c:1039 +#: merge-recursive.c:1027 merge-recursive.c:1040 #, 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:1080 +#: merge-recursive.c:1081 msgid "rename" msgstr "" -#: merge-recursive.c:1080 +#: merge-recursive.c:1081 msgid "renamed" msgstr "" -#: merge-recursive.c:1136 +#: merge-recursive.c:1137 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1158 +#: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1163 +#: merge-recursive.c:1164 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1217 +#: merge-recursive.c:1218 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1247 +#: merge-recursive.c:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1446 +#: merge-recursive.c:1447 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1456 +#: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1461 merge-recursive.c:1659 +#: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1512 +#: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1515 +#: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modify" msgstr "" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modified" msgstr "" -#: merge-recursive.c:1573 +#: merge-recursive.c:1574 msgid "content" msgstr "" -#: merge-recursive.c:1580 +#: merge-recursive.c:1581 msgid "add/add" msgstr "" -#: merge-recursive.c:1614 +#: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1628 +#: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1632 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "" -#: merge-recursive.c:1633 +#: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1723 +#: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1748 +#: merge-recursive.c:1749 msgid "file/directory" msgstr "" -#: merge-recursive.c:1754 +#: merge-recursive.c:1755 msgid "directory/file" msgstr "" -#: merge-recursive.c:1759 +#: merge-recursive.c:1760 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1769 +#: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1786 +#: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1805 +#: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1814 +#: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1844 +#: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1889 +#: merge-recursive.c:1890 msgid "Merging:" msgstr "" -#: merge-recursive.c:1902 +#: merge-recursive.c:1903 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1939 +#: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:1996 +#: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2008 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "" -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "" -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr "" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: remote.c:1653 #, 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:1638 +#: remote.c:1659 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr "" + +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -613,7 +730,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1646 +#: remote.c:1670 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr "" + +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -624,239 +745,239 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +#: remote.c:1683 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr "" + +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 +#: builtin/merge.c:994 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 +#: builtin/merge.c:999 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:261 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:282 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:324 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:329 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:395 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:398 -msgid "You do not have a valid HEAD" -msgstr "" - -#: sequencer.c:413 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:421 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:425 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:436 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:440 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:524 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:525 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:553 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "" -#: sequencer.c:561 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:566 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:624 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:646 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:651 +#: sequencer.c:667 msgid "No commits parsed." msgstr "" -#: sequencer.c:664 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:668 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:675 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:703 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:706 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:718 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:739 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:740 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:744 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:781 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:783 +#: sequencer.c:799 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:805 builtin/apply.c:3987 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:808 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:809 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "" -#: sequencer.c:815 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:838 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1000 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1001 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "" @@ -879,12 +1000,22 @@ msgstr "" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: wrapper.c:413 +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:414 +#: wrapper.c:435 msgid "no such user" msgstr "" @@ -938,11 +1069,6 @@ msgstr "" msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:224 -#, c-format -msgid "%s files:" -msgstr "" - #: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" @@ -1037,184 +1163,212 @@ msgstr "" msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:785 +#: wt-status.c:789 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:791 +#: wt-status.c:795 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:794 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "" -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr "" -#: wt-status.c:813 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:878 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:886 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:891 +#: wt-status.c:916 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:893 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:925 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:896 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:908 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "" -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr "" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "" + +#: wt-status.c:962 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "" -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "" -#: wt-status.c:1011 -msgid "Untracked" +#: wt-status.c:1097 +msgid "Untracked files" msgstr "" -#: wt-status.c:1013 -msgid "Ignored" +#: wt-status.c:1099 +msgid "Ignored files" msgstr "" -#: wt-status.c:1015 +#: wt-status.c:1101 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "" -#: wt-status.c:1027 +#: wt-status.c:1114 #, c-format -msgid "no changes added to commit%s\n" +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1029 -msgid " (use \"git add\" and/or \"git commit -a\")" +#: wt-status.c:1117 +#, c-format +msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1031 +#: wt-status.c:1120 #, c-format -msgid "nothing added to commit but untracked files present%s\n" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" msgstr "" -#: wt-status.c:1033 -msgid " (use \"git add\" to track)" +#: wt-status.c:1123 +#, c-format +msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 +#: wt-status.c:1126 #, c-format -msgid "nothing to commit%s\n" +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1036 -msgid " (create/copy files and use \"git add\" to track)" +#: wt-status.c:1129 wt-status.c:1134 +#, c-format +msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1039 -msgid " (use -u to show untracked files)" +#: wt-status.c:1132 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1042 -msgid " (working directory clean)" +#: wt-status.c:1136 +#, c-format +msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1150 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1156 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "" -#: wt-status.c:1171 +#: wt-status.c:1265 msgid "behind " msgstr "" -#: wt-status.c:1174 wt-status.c:1177 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "" -#: wt-status.c:1179 +#: wt-status.c:1273 msgid ", behind " msgstr "" @@ -1223,107 +1377,183 @@ msgstr "" msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:62 +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "" + +#: builtin/add.c:63 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:229 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "" - -#: builtin/add.c:192 +#: builtin/add.c:148 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:312 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:352 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 +#: builtin/rm.c:206 +msgid "dry run" +msgstr "" + +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "" + +#: builtin/add.c:280 +msgid "interactive picking" +msgstr "" + +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 +msgid "select hunks interactively" +msgstr "" + +#: builtin/add.c:282 +msgid "edit current diff and apply" +msgstr "" + +#: builtin/add.c:283 +msgid "allow adding otherwise ignored files" +msgstr "" + +#: builtin/add.c:284 +msgid "update tracked files" +msgstr "" + +#: builtin/add.c:285 +msgid "record only the fact that the path will be added later" +msgstr "" + +#: builtin/add.c:286 +msgid "add changes from all tracked and untracked files" +msgstr "" + +#: builtin/add.c:287 +msgid "don't add, only refresh the index" +msgstr "" + +#: builtin/add.c:288 +msgid "just skip files which cannot be added because of errors" +msgstr "" + +#: builtin/add.c:289 +msgid "check if - even missing - files are ignored in dry run" +msgstr "" + +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:312 msgid "no files added" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:318 msgid "adding files failed" msgstr "" -#: builtin/add.c:391 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:393 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:413 +#: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:414 +#: builtin/add.c:415 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "" -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "" @@ -1376,17 +1606,17 @@ msgstr "" msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1402 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1459 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1476 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1397,403 +1627,396 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1636 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1638 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1664 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1700 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1702 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1705 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1851 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1880 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1966 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2056 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2060 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2131 -msgid "oops" -msgstr "" - -#: builtin/apply.c:2653 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2771 +#: builtin/apply.c:2802 #, 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:2783 +#: builtin/apply.c:2814 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2789 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2808 +#: builtin/apply.c:2839 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2911 +#: builtin/apply.c:2942 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2917 +#: builtin/apply.c:2948 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2938 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3060 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3138 builtin/apply.c:3360 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3219 builtin/apply.c:3374 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3228 builtin/apply.c:3382 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3330 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3399 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3401 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3502 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3505 +#: builtin/apply.c:3536 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3525 +#: builtin/apply.c:3556 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3530 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3538 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3551 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3749 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3777 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3781 +#: builtin/apply.c:3850 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3786 +#: builtin/apply.c:3855 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3789 builtin/apply.c:3897 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3822 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3871 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3958 +#: builtin/apply.c:4027 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3966 +#: builtin/apply.c:4035 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3969 +#: builtin/apply.c:4038 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3979 +#: builtin/apply.c:4048 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4000 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4003 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4153 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4164 +#: builtin/apply.c:4233 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4283 builtin/apply.c:4286 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 +#: builtin/fetch.c:63 msgid "path" msgstr "" -#: builtin/apply.c:4284 +#: builtin/apply.c:4353 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4287 +#: builtin/apply.c:4356 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4289 +#: builtin/apply.c:4358 msgid "num" msgstr "" -#: builtin/apply.c:4290 +#: builtin/apply.c:4359 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4293 +#: builtin/apply.c:4362 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4295 +#: builtin/apply.c:4364 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4299 -msgid "shows number of added and deleted lines in decimal notation" +#: builtin/apply.c:4368 +msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4301 +#: builtin/apply.c:4370 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4303 +#: builtin/apply.c:4372 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4305 +#: builtin/apply.c:4374 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4307 +#: builtin/apply.c:4376 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4309 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4311 +#: builtin/apply.c:4380 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4313 +#: builtin/apply.c:4382 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4315 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4318 +#: builtin/apply.c:4387 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4319 +#: builtin/apply.c:4388 msgid "action" msgstr "" -#: builtin/apply.c:4320 +#: builtin/apply.c:4389 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4323 builtin/apply.c:4326 +#: builtin/apply.c:4392 builtin/apply.c:4395 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4329 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4331 +#: builtin/apply.c:4400 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4333 +#: builtin/apply.c:4402 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4335 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4336 -msgid "be verbose" -msgstr "" - -#: builtin/apply.c:4338 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4341 +#: builtin/apply.c:4410 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4343 +#: builtin/apply.c:4412 msgid "root" msgstr "" -#: builtin/apply.c:4344 +#: builtin/apply.c:4413 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4366 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4377 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4407 +#: builtin/apply.c:4476 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4413 builtin/apply.c:4423 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1835,175 +2058,463 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/branch.c:144 +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "" + +#: builtin/blame.c:2350 +msgid "Show blame entries as we find them, incrementally" +msgstr "" + +#: builtin/blame.c:2351 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "" + +#: builtin/blame.c:2352 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "" + +#: builtin/blame.c:2353 +msgid "Show work cost statistics" +msgstr "" + +#: builtin/blame.c:2354 +msgid "Show output score for blame entries" +msgstr "" + +#: builtin/blame.c:2355 +msgid "Show original filename (Default: auto)" +msgstr "" + +#: builtin/blame.c:2356 +msgid "Show original linenumber (Default: off)" +msgstr "" + +#: builtin/blame.c:2357 +msgid "Show in a format designed for machine consumption" +msgstr "" + +#: builtin/blame.c:2358 +msgid "Show porcelain format with per-line commit information" +msgstr "" + +#: builtin/blame.c:2359 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "" + +#: builtin/blame.c:2360 +msgid "Show raw timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2361 +msgid "Show long commit SHA1 (Default: off)" +msgstr "" + +#: builtin/blame.c:2362 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "" + +#: builtin/blame.c:2363 +msgid "Show author email instead of name (Default: off)" +msgstr "" + +#: builtin/blame.c:2364 +msgid "Ignore whitespace differences" +msgstr "" + +#: builtin/blame.c:2365 +msgid "Spend extra cycles to find better match" +msgstr "" + +#: builtin/blame.c:2366 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "" + +#: builtin/blame.c:2367 +msgid "Use <file>'s contents as the final image" +msgstr "" + +#: builtin/blame.c:2368 builtin/blame.c:2369 +msgid "score" +msgstr "" + +#: builtin/blame.c:2368 +msgid "Find line copies within and across files" +msgstr "" + +#: builtin/blame.c:2369 +msgid "Find line movements within and across files" +msgstr "" + +#: builtin/blame.c:2370 +msgid "n,m" +msgstr "" + +#: builtin/blame.c:2370 +msgid "Process only line range n,m, counting from 1" +msgstr "" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "" + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "" + +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" +#: builtin/branch.c:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" + #: builtin/branch.c:180 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:186 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:191 +#: builtin/branch.c:222 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:202 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:203 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:210 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "" - -#: builtin/branch.c:216 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" - -#: builtin/branch.c:225 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:226 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:233 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:234 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:239 -msgid "Update of config-file failed" -msgstr "" - -#: builtin/branch.c:337 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:409 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:411 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:415 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:417 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:420 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:423 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:535 +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr "" + +#: builtin/branch.c:560 msgid "(no branch)" msgstr "" -#: builtin/branch.c:600 +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "" + +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:613 +#: builtin/branch.c:638 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:623 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:671 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:692 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:747 +msgid "Generic options" +msgstr "" + +#: builtin/branch.c:749 +msgid "show hash and subject, give twice for upstream branch" +msgstr "" + +#: builtin/branch.c:750 +msgid "suppress informational messages" +msgstr "" + +#: builtin/branch.c:751 +msgid "set up tracking mode (see git-pull(1))" +msgstr "" + +#: builtin/branch.c:753 +msgid "change upstream info" +msgstr "" + +#: builtin/branch.c:757 +msgid "use colored output" +msgstr "" + +#: builtin/branch.c:758 +msgid "act on remote-tracking branches" +msgstr "" + +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 +msgid "commit" +msgstr "" + +#: builtin/branch.c:762 builtin/branch.c:768 +msgid "print only branches that contain the commit" +msgstr "" + +#: builtin/branch.c:774 +msgid "Specific git-branch actions:" +msgstr "" + +#: builtin/branch.c:775 +msgid "list both remote-tracking and local branches" +msgstr "" + +#: builtin/branch.c:777 +msgid "delete fully merged branch" +msgstr "" + +#: builtin/branch.c:778 +msgid "delete branch (even if not merged)" +msgstr "" + +#: builtin/branch.c:779 +msgid "move/rename a branch and its reflog" +msgstr "" + +#: builtin/branch.c:780 +msgid "move/rename a branch, even if target exists" +msgstr "" + +#: builtin/branch.c:781 +msgid "list branch names" +msgstr "" + +#: builtin/branch.c:782 +msgid "create the branch's reflog" +msgstr "" + +#: builtin/branch.c:784 +msgid "edit the description for the branch" +msgstr "" + +#: builtin/branch.c:785 +msgid "force creation (when already exists)" +msgstr "" + +#: builtin/branch.c:788 +msgid "print only not merged branches" +msgstr "" + +#: builtin/branch.c:794 +msgid "print only merged branches" +msgstr "" + +#: builtin/branch.c:798 +msgid "list branches in columns" +msgstr "" + +#: builtin/branch.c:811 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:788 builtin/clone.c:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:857 +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "" + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "" + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "" + +#: builtin/branch.c:893 +#, c-format +msgid "branch '%s' does not exist" +msgstr "" + +#: builtin/branch.c:905 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "" + +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" +#: builtin/branch.c:923 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" + +#: builtin/branch.c:940 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" + +#: builtin/branch.c:941 +#, c-format +msgid " git branch -d %s\n" +msgstr "" + +#: builtin/branch.c:942 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr "" + #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" @@ -2017,95 +2528,246 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/checkout.c:114 builtin/checkout.c:147 +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "" + +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "" + +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "" + +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "" + +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "" + +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" +msgstr "" + +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" +msgstr "" + +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" +msgstr "" + +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" +msgstr "" + +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" +msgstr "" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "" + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "" + +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "input paths are terminated by a null character" +msgstr "" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "" + +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:118 builtin/checkout.c:151 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:132 +#: builtin/checkout.c:134 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:176 +#: builtin/checkout.c:178 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:193 +#: builtin/checkout.c:195 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:210 +#: builtin/checkout.c:212 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:235 builtin/checkout.c:392 -msgid "corrupt index file" +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, c-format +msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:272 +#: builtin/checkout.c:248 builtin/checkout.c:251 #, c-format -msgid "path '%s' is unmerged" +msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:414 +#: builtin/checkout.c:265 builtin/checkout.c:426 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:295 builtin/checkout.c:302 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:448 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:533 +#: builtin/checkout.c:569 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:566 +#: builtin/checkout.c:602 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:573 +#: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:576 +#: builtin/checkout.c:612 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:580 +#: builtin/checkout.c:616 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:582 +#: builtin/checkout.c:618 builtin/checkout.c:955 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:584 +#: builtin/checkout.c:620 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:640 +#: builtin/checkout.c:676 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:682 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2120,7 +2782,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:664 +#: builtin/checkout.c:700 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2130,137 +2792,313 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:694 +#: builtin/checkout.c:730 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:698 +#: builtin/checkout.c:734 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:724 builtin/checkout.c:919 +#: builtin/checkout.c:761 builtin/checkout.c:950 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:886 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:925 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:976 -msgid "-B cannot be used with -b" +#: builtin/checkout.c:964 +msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:985 -msgid "--patch is incompatible with all other options" +#: builtin/checkout.c:967 builtin/checkout.c:971 +#, c-format +msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:988 -msgid "--detach cannot be used with -b/-B/--orphan" +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format +msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:990 -msgid "--detach cannot be used with -t" +#: builtin/checkout.c:991 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:996 -msgid "--track needs a branch name" +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" msgstr "" -#: builtin/checkout.c:1003 -msgid "Missing branch name; try -b" +#: builtin/checkout.c:1014 +msgid "create and checkout a new branch" +msgstr "" + +#: builtin/checkout.c:1016 +msgid "create/reset and checkout a branch" +msgstr "" + +#: builtin/checkout.c:1017 +msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1009 -msgid "--orphan and -b|-B are mutually exclusive" +#: builtin/checkout.c:1018 +msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1011 -msgid "--orphan cannot be used with -t" +#: builtin/checkout.c:1019 +msgid "set upstream info for new branch" msgstr "" #: builtin/checkout.c:1021 -msgid "git checkout: -f and -m are incompatible" +msgid "new branch" msgstr "" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1021 +msgid "new unparented branch" +msgstr "" + +#: builtin/checkout.c:1022 +msgid "checkout our version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1024 +msgid "checkout their version for unmerged files" +msgstr "" + +#: builtin/checkout.c:1026 +msgid "force checkout (throw away local modifications)" +msgstr "" + +#: builtin/checkout.c:1027 +msgid "perform a 3-way merge with the new branch" +msgstr "" + +#: builtin/checkout.c:1028 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "" + +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 +msgid "style" +msgstr "" + +#: builtin/checkout.c:1030 +msgid "conflict style (merge or diff3)" +msgstr "" + +#: builtin/checkout.c:1033 +msgid "second guess 'git checkout no-such-branch'" +msgstr "" + +#: builtin/checkout.c:1057 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1074 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:1081 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1123 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" +"Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1065 -msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "" - -#: builtin/checkout.c:1070 -msgid "git checkout: --detach does not take a path argument" +#: builtin/checkout.c:1128 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1073 +#: builtin/checkout.c:1132 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1092 -msgid "Cannot switch branch to a non-commit." +#: builtin/clean.c:20 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" + +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:160 +msgid "do not print names of files removed" +msgstr "" + +#: builtin/clean.c:162 +msgid "force" +msgstr "" + +#: builtin/clean.c:164 +msgid "remove whole directories" +msgstr "" + +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 +msgid "pattern" +msgstr "" + +#: builtin/clean.c:166 +msgid "add <pattern> to ignore rules" +msgstr "" + +#: builtin/clean.c:167 +msgid "remove ignored files, too" msgstr "" -#: builtin/checkout.c:1095 -msgid "--ours/--theirs is incompatible with switching branches." +#: builtin/clean.c:169 +msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:436 +msgid "force progress reporting" msgstr "" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" +#: builtin/clone.c:66 +msgid "don't create a checkout" msgstr "" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" msgstr "" -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "" + +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" +msgstr "" + +#: builtin/clone.c:78 +msgid "setup as shared repository" +msgstr "" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "" + +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "" + +#: builtin/clone.c:86 +msgid "reference repository" +msgstr "" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "" + +#: builtin/clone.c:88 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "" + +#: builtin/clone.c:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "" + +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" +msgstr "" + +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 +msgid "depth" +msgstr "" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr "" + +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "" + +#: builtin/clone.c:99 +msgid "key=value" +msgstr "" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" msgstr "" #: builtin/clone.c:243 @@ -2312,77 +3150,117 @@ msgstr "" msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:646 +#: builtin/clone.c:694 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:657 +#: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:671 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "" + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:676 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:686 +#: builtin/clone.c:736 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:696 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:759 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:712 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:731 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:733 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:789 +#: builtin/clone.c:818 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:838 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:845 +#: builtin/clone.c:874 msgid "You appear to have cloned an empty repository." msgstr "" +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "" + #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:43 +#: builtin/commit.c:34 +msgid "git commit [options] [--] <pathspec>..." +msgstr "" + +#: builtin/commit.c:39 +msgid "git status [options] [--] <pathspec>..." +msgstr "" + +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2396,14 +3274,14 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -2413,93 +3291,93 @@ msgid "" "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:256 +#: builtin/commit.c:258 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:298 +#: builtin/commit.c:300 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:389 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:391 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:421 +#: builtin/commit.c:423 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:496 builtin/commit.c:502 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:525 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:585 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:635 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:637 +#: builtin/commit.c:612 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:641 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:647 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:663 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:667 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:671 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:723 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:734 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -2509,7 +3387,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:739 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -2519,177 +3397,500 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:751 +#: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:756 +#: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:769 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:776 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:796 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:833 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "" -#: builtin/commit.c:848 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:945 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:960 builtin/commit.c:1160 +#: builtin/commit.c:944 builtin/commit.c:1138 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1000 +#: builtin/commit.c:974 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1011 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1014 +#: builtin/commit.c:988 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1016 +#: builtin/commit.c:990 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1019 +#: builtin/commit.c:993 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1029 +#: builtin/commit.c:1003 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1031 +#: builtin/commit.c:1005 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1039 +#: builtin/commit.c:1013 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1056 +#: builtin/commit.c:1030 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1058 +#: builtin/commit.c:1032 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1060 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1062 +#: builtin/commit.c:1036 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1072 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1077 +#: builtin/commit.c:1051 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1260 +#: builtin/commit.c:1057 builtin/commit.c:1192 +msgid "--long and -z are incompatible" +msgstr "" + +#: builtin/commit.c:1152 builtin/commit.c:1388 +msgid "show status concisely" +msgstr "" + +#: builtin/commit.c:1154 builtin/commit.c:1390 +msgid "show branch information" +msgstr "" + +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 +msgid "machine-readable output" +msgstr "" + +#: builtin/commit.c:1159 builtin/commit.c:1394 +msgid "show status in long format (default)" +msgstr "" + +#: builtin/commit.c:1162 builtin/commit.c:1397 +msgid "terminate entries with NUL" +msgstr "" + +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 +msgid "mode" +msgstr "" + +#: builtin/commit.c:1165 builtin/commit.c:1400 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" + +#: builtin/commit.c:1168 +msgid "show ignored files" +msgstr "" + +#: builtin/commit.c:1169 parse-options.h:151 +msgid "when" +msgstr "" + +#: builtin/commit.c:1170 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" + +#: builtin/commit.c:1172 +msgid "list untracked files in columns" +msgstr "" + +#: builtin/commit.c:1246 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1262 +#: builtin/commit.c:1248 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1303 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1305 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1449 +#: builtin/commit.c:1358 +msgid "suppress summary after successful commit" +msgstr "" + +#: builtin/commit.c:1359 +msgid "show diff in commit message template" +msgstr "" + +#: builtin/commit.c:1361 +msgid "Commit message options" +msgstr "" + +#: builtin/commit.c:1362 builtin/tag.c:457 +msgid "read message from file" +msgstr "" + +#: builtin/commit.c:1363 +msgid "author" +msgstr "" + +#: builtin/commit.c:1363 +msgid "override author for commit" +msgstr "" + +#: builtin/commit.c:1364 builtin/gc.c:178 +msgid "date" +msgstr "" + +#: builtin/commit.c:1364 +msgid "override date for commit" +msgstr "" + +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 +msgid "message" +msgstr "" + +#: builtin/commit.c:1365 +msgid "commit message" +msgstr "" + +#: builtin/commit.c:1366 +msgid "reuse and edit message from specified commit" +msgstr "" + +#: builtin/commit.c:1367 +msgid "reuse message from specified commit" +msgstr "" + +#: builtin/commit.c:1368 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" + +#: builtin/commit.c:1369 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" + +#: builtin/commit.c:1370 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" + +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "" + +#: builtin/commit.c:1372 +msgid "use specified template file" +msgstr "" + +#: builtin/commit.c:1373 +msgid "force edit of commit" +msgstr "" + +#: builtin/commit.c:1374 +msgid "default" +msgstr "" + +#: builtin/commit.c:1374 builtin/tag.c:460 +msgid "how to strip spaces and #comments from message" +msgstr "" + +#: builtin/commit.c:1375 +msgid "include status in commit message template" +msgstr "" + +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 +msgid "key id" +msgstr "" + +#: builtin/commit.c:1377 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "" + +#. end commit message options +#: builtin/commit.c:1380 +msgid "Commit contents options" +msgstr "" + +#: builtin/commit.c:1381 +msgid "commit all changed files" +msgstr "" + +#: builtin/commit.c:1382 +msgid "add specified files to index for commit" +msgstr "" + +#: builtin/commit.c:1383 +msgid "interactively add files" +msgstr "" + +#: builtin/commit.c:1384 +msgid "interactively add changes" +msgstr "" + +#: builtin/commit.c:1385 +msgid "commit only specified files" +msgstr "" + +#: builtin/commit.c:1386 +msgid "bypass pre-commit hook" +msgstr "" + +#: builtin/commit.c:1387 +msgid "show what would be committed" +msgstr "" + +#: builtin/commit.c:1398 +msgid "amend previous commit" +msgstr "" + +#: builtin/commit.c:1399 +msgid "bypass post-rewrite hook" +msgstr "" + +#: builtin/commit.c:1404 +msgid "ok to record an empty change" +msgstr "" + +#: builtin/commit.c:1407 +msgid "ok to record a change with an empty message" +msgstr "" + +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1534 +#: builtin/commit.c:1524 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1539 +#: builtin/commit.c:1529 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 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 "" +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "" + +#: builtin/config.c:51 +msgid "Config file location" +msgstr "" + +#: builtin/config.c:52 +msgid "use global config file" +msgstr "" + +#: builtin/config.c:53 +msgid "use system config file" +msgstr "" + +#: builtin/config.c:54 +msgid "use repository config file" +msgstr "" + +#: builtin/config.c:55 +msgid "use given config file" +msgstr "" + +#: builtin/config.c:56 +msgid "Action" +msgstr "" + +#: builtin/config.c:57 +msgid "get value: name [value-regex]" +msgstr "" + +#: builtin/config.c:58 +msgid "get all values: key [value-regex]" +msgstr "" + +#: builtin/config.c:59 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "" + +#: builtin/config.c:60 +msgid "replace all matching variables: name value [value_regex]" +msgstr "" + +#: builtin/config.c:61 +msgid "add a new variable: name value" +msgstr "" + +#: builtin/config.c:62 +msgid "remove a variable: name [value-regex]" +msgstr "" + +#: builtin/config.c:63 +msgid "remove all matches: name [value-regex]" +msgstr "" + +#: builtin/config.c:64 +msgid "rename section: old-name new-name" +msgstr "" + +#: builtin/config.c:65 +msgid "remove a section: name" +msgstr "" + +#: builtin/config.c:66 +msgid "list all" +msgstr "" + +#: builtin/config.c:67 +msgid "open an editor" +msgstr "" + +#: builtin/config.c:68 builtin/config.c:69 +msgid "slot" +msgstr "" + +#: builtin/config.c:68 +msgid "find the color configured: [default]" +msgstr "" + +#: builtin/config.c:69 +msgid "find the color setting: [stdout-is-tty]" +msgstr "" + +#: builtin/config.c:70 +msgid "Type" +msgstr "" + +#: builtin/config.c:71 +msgid "value is \"true\" or \"false\"" +msgstr "" + +#: builtin/config.c:72 +msgid "value is decimal number" +msgstr "" + +#: builtin/config.c:73 +msgid "value is --bool or --int" +msgstr "" + +#: builtin/config.c:74 +msgid "value is a path (file or directory name)" +msgstr "" + +#: builtin/config.c:75 +msgid "Other" +msgstr "" + +#: builtin/config.c:76 +msgid "terminate values with NUL byte" +msgstr "" + +#: builtin/config.c:77 +msgid "respect include directives on lookup" +msgstr "" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "" + #: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" @@ -2756,6 +3957,50 @@ msgid "" "gave up search at %s\n" msgstr "" +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "" + #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "" @@ -2773,186 +4018,436 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/fetch.c:200 +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "" + +#: builtin/fast-export.c:646 +msgid "show progress after <n> objects" +msgstr "" + +#: builtin/fast-export.c:648 +msgid "select handling of signed tags" +msgstr "" + +#: builtin/fast-export.c:651 +msgid "select handling of tags that tag filtered objects" +msgstr "" + +#: builtin/fast-export.c:654 +msgid "Dump marks to this file" +msgstr "" + +#: builtin/fast-export.c:656 +msgid "Import marks from this file" +msgstr "" + +#: builtin/fast-export.c:658 +msgid "Fake a tagger when tags lack one" +msgstr "" + +#: builtin/fast-export.c:660 +msgid "Output full tree for each commit" +msgstr "" + +#: builtin/fast-export.c:662 +msgid "Use the done feature to terminate the stream" +msgstr "" + +#: builtin/fast-export.c:663 +msgid "Skip output of blob data" +msgstr "" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "" + +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "" + +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "" + +#: builtin/fetch.c:88 builtin/log.c:1119 +msgid "dir" +msgstr "" + +#: builtin/fetch.c:89 +msgid "prepend this to submodule path output" +msgstr "" + +#: builtin/fetch.c:92 +msgid "default mode for recursion" +msgstr "" + +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:253 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:888 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:890 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:907 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:927 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:979 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:992 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" + +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +msgid "n" +msgstr "" + +#: builtin/fmt-merge-msg.c:660 +msgid "populate log with at most <n> entries from shortlog" +msgstr "" + +#: builtin/fmt-merge-msg.c:663 +msgid "alias for --log (deprecated)" +msgstr "" + +#: builtin/fmt-merge-msg.c:666 +msgid "text" +msgstr "" + +#: builtin/fmt-merge-msg.c:667 +msgid "use <text> as start of message" +msgstr "" + +#: builtin/fmt-merge-msg.c:668 +msgid "file to read from" +msgstr "" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "" + #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" @@ -2963,142 +4458,371 @@ msgstr "" msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:224 +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "" + +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:216 +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "" + +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:454 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:530 builtin/grep.c:564 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:578 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:636 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:917 +#: builtin/grep.c:643 +msgid "search in index instead of in the work tree" +msgstr "" + +#: builtin/grep.c:645 +msgid "find in contents not managed by git" +msgstr "" + +#: builtin/grep.c:647 +msgid "search in both tracked and untracked files" +msgstr "" + +#: builtin/grep.c:649 +msgid "search also in ignored files" +msgstr "" + +#: builtin/grep.c:652 +msgid "show non-matching lines" +msgstr "" + +#: builtin/grep.c:654 +msgid "case insensitive matching" +msgstr "" + +#: builtin/grep.c:656 +msgid "match patterns only at word boundaries" +msgstr "" + +#: builtin/grep.c:658 +msgid "process binary files as text" +msgstr "" + +#: builtin/grep.c:660 +msgid "don't match patterns in binary files" +msgstr "" + +#: builtin/grep.c:663 +msgid "descend at most <depth> levels" +msgstr "" + +#: builtin/grep.c:667 +msgid "use extended POSIX regular expressions" +msgstr "" + +#: builtin/grep.c:670 +msgid "use basic POSIX regular expressions (default)" +msgstr "" + +#: builtin/grep.c:673 +msgid "interpret patterns as fixed strings" +msgstr "" + +#: builtin/grep.c:676 +msgid "use Perl-compatible regular expressions" +msgstr "" + +#: builtin/grep.c:679 +msgid "show line numbers" +msgstr "" + +#: builtin/grep.c:680 +msgid "don't show filenames" +msgstr "" + +#: builtin/grep.c:681 +msgid "show filenames" +msgstr "" + +#: builtin/grep.c:683 +msgid "show filenames relative to top directory" +msgstr "" + +#: builtin/grep.c:685 +msgid "show only filenames instead of matching lines" +msgstr "" + +#: builtin/grep.c:687 +msgid "synonym for --files-with-matches" +msgstr "" + +#: builtin/grep.c:690 +msgid "show only the names of files without match" +msgstr "" + +#: builtin/grep.c:692 +msgid "print NUL after filenames" +msgstr "" + +#: builtin/grep.c:694 +msgid "show the number of matches instead of matching lines" +msgstr "" + +#: builtin/grep.c:695 +msgid "highlight matches" +msgstr "" + +#: builtin/grep.c:697 +msgid "print empty line between matches from different files" +msgstr "" + +#: builtin/grep.c:699 +msgid "show filename only once above matches from same file" +msgstr "" + +#: builtin/grep.c:702 +msgid "show <n> context lines before and after matches" +msgstr "" + +#: builtin/grep.c:705 +msgid "show <n> context lines before matches" +msgstr "" + +#: builtin/grep.c:707 +msgid "show <n> context lines after matches" +msgstr "" + +#: builtin/grep.c:708 +msgid "shortcut for -C NUM" +msgstr "" + +#: builtin/grep.c:711 +msgid "show a line with the function name before matches" +msgstr "" + +#: builtin/grep.c:713 +msgid "show the surrounding function" +msgstr "" + +#: builtin/grep.c:716 +msgid "read patterns from file" +msgstr "" + +#: builtin/grep.c:718 +msgid "match <pattern>" +msgstr "" + +#: builtin/grep.c:720 +msgid "combine patterns specified with -e" +msgstr "" + +#: builtin/grep.c:732 +msgid "indicate hit with exit status without output" +msgstr "" + +#: builtin/grep.c:734 +msgid "show only matches from files that match all patterns" +msgstr "" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "" + +#: builtin/grep.c:740 +msgid "pager" +msgstr "" + +#: builtin/grep.c:740 +msgid "show matching files in the pager" +msgstr "" + +#: builtin/grep.c:743 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "" + +#: builtin/grep.c:744 builtin/show-ref.c:184 +msgid "show usage" +msgstr "" + +#: builtin/grep.c:811 msgid "no pattern given." msgstr "" -#: builtin/grep.c:931 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:972 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:995 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1000 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:1003 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1011 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "" -#: builtin/help.c:65 +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "" + +#: builtin/help.c:42 +msgid "print all available commands" +msgstr "" + +#: builtin/help.c:43 +msgid "show man page" +msgstr "" + +#: builtin/help.c:44 +msgid "show manual in web browser" +msgstr "" + +#: builtin/help.c:46 +msgid "show info page" +msgstr "" + +#: builtin/help.c:52 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "" + +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "" - -#: builtin/help.c:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:384 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:392 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" @@ -3149,6 +4873,11 @@ msgstr "" msgid "pack signature mismatch" msgstr "" +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "" + #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" @@ -3255,93 +4984,123 @@ msgstr "" msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1105 +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "" + +#: builtin/index-pack.c:1106 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "" + +#: builtin/index-pack.c:1125 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1149 +#: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1228 +#: builtin/index-pack.c:1229 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1253 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1274 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1286 +#: builtin/index-pack.c:1287 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1297 +#: builtin/index-pack.c:1298 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "" + +#: builtin/index-pack.c:1399 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1401 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1448 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1454 +#: builtin/index-pack.c:1455 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1482 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1558 +#: builtin/index-pack.c:1559 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" msgstr "" @@ -3461,6 +5220,24 @@ msgstr "" msgid "cannot tell cwd" msgstr "" +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" +msgstr "" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "" + #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" @@ -3487,104 +5264,396 @@ msgstr "" msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:189 +#: builtin/log.c:39 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "" + +#: builtin/log.c:40 +msgid " or: git show [options] <object>..." +msgstr "" + +#: builtin/log.c:102 +msgid "suppress diff output" +msgstr "" + +#: builtin/log.c:103 +msgid "show source" +msgstr "" + +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "" + +#: builtin/log.c:105 +msgid "decorate options" +msgstr "" + +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:518 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:608 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "" -#: builtin/log.c:682 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:693 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:707 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:715 +#: builtin/log.c:739 msgid "Not a range." msgstr "" -#: builtin/log.c:789 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:862 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:935 +#: builtin/log.c:913 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "" + +#: builtin/log.c:958 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1157 +#: builtin/log.c:1097 +msgid "use [PATCH n/m] even with a single patch" +msgstr "" + +#: builtin/log.c:1100 +msgid "use [PATCH] even with multiple patches" +msgstr "" + +#: builtin/log.c:1104 +msgid "print patches to standard out" +msgstr "" + +#: builtin/log.c:1106 +msgid "generate a cover letter" +msgstr "" + +#: builtin/log.c:1108 +msgid "use simple number sequence for output file names" +msgstr "" + +#: builtin/log.c:1109 +msgid "sfx" +msgstr "" + +#: builtin/log.c:1110 +msgid "use <sfx> instead of '.patch'" +msgstr "" + +#: builtin/log.c:1112 +msgid "start numbering patches at <n> instead of 1" +msgstr "" + +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "" + +#: builtin/log.c:1116 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "" + +#: builtin/log.c:1119 +msgid "store resulting files in <dir>" +msgstr "" + +#: builtin/log.c:1122 +msgid "don't strip/add [PATCH]" +msgstr "" + +#: builtin/log.c:1125 +msgid "don't output binary diffs" +msgstr "" + +#: builtin/log.c:1127 +msgid "don't include a patch matching a commit upstream" +msgstr "" + +#: builtin/log.c:1129 +msgid "show patch format instead of default (patch + stat)" +msgstr "" + +#: builtin/log.c:1131 +msgid "Messaging" +msgstr "" + +#: builtin/log.c:1132 +msgid "header" +msgstr "" + +#: builtin/log.c:1133 +msgid "add email header" +msgstr "" + +#: builtin/log.c:1134 builtin/log.c:1136 +msgid "email" +msgstr "" + +#: builtin/log.c:1134 +msgid "add To: header" +msgstr "" + +#: builtin/log.c:1136 +msgid "add Cc: header" +msgstr "" + +#: builtin/log.c:1138 +msgid "message-id" +msgstr "" + +#: builtin/log.c:1139 +msgid "make first mail a reply to <message-id>" +msgstr "" + +#: builtin/log.c:1140 builtin/log.c:1143 +msgid "boundary" +msgstr "" + +#: builtin/log.c:1141 +msgid "attach the patch" +msgstr "" + +#: builtin/log.c:1144 +msgid "inline the patch" +msgstr "" + +#: builtin/log.c:1148 +msgid "enable message threading, styles: shallow, deep" +msgstr "" + +#: builtin/log.c:1150 +msgid "signature" +msgstr "" + +#: builtin/log.c:1151 +msgid "add a signature" +msgstr "" + +#: builtin/log.c:1153 +msgid "don't print the patch filenames" +msgstr "" + +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1202 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1204 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1212 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1216 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1241 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1394 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1498 +#: builtin/log.c:1488 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "" + +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "" +#: builtin/ls-files.c:409 +msgid "git ls-files [options] [<file>...]" +msgstr "" + +#: builtin/ls-files.c:466 +msgid "identify the file status with tags" +msgstr "" + +#: builtin/ls-files.c:468 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" + +#: builtin/ls-files.c:470 +msgid "show cached files in the output (default)" +msgstr "" + +#: builtin/ls-files.c:472 +msgid "show deleted files in the output" +msgstr "" + +#: builtin/ls-files.c:474 +msgid "show modified files in the output" +msgstr "" + +#: builtin/ls-files.c:476 +msgid "show other files in the output" +msgstr "" + +#: builtin/ls-files.c:478 +msgid "show ignored files in the output" +msgstr "" + +#: builtin/ls-files.c:481 +msgid "show staged contents' object name in the output" +msgstr "" + +#: builtin/ls-files.c:483 +msgid "show files on the filesystem that need to be removed" +msgstr "" + +#: builtin/ls-files.c:485 +msgid "show 'other' directories' name only" +msgstr "" + +#: builtin/ls-files.c:488 +msgid "don't show empty directories" +msgstr "" + +#: builtin/ls-files.c:491 +msgid "show unmerged files in the output" +msgstr "" + +#: builtin/ls-files.c:493 +msgid "show resolve-undo information" +msgstr "" + +#: builtin/ls-files.c:495 +msgid "skip files matching pattern" +msgstr "" + +#: builtin/ls-files.c:498 +msgid "exclude patterns are read from <file>" +msgstr "" + +#: builtin/ls-files.c:501 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "" + +#: builtin/ls-files.c:503 +msgid "add the standard git exclusions" +msgstr "" + +#: builtin/ls-files.c:506 +msgid "make the output relative to the project top directory" +msgstr "" + +#: builtin/ls-files.c:509 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "" + +#: builtin/ls-files.c:510 +msgid "tree-ish" +msgstr "" + +#: builtin/ls-files.c:511 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" + +#: builtin/ls-files.c:513 +msgid "show debugging data" +msgstr "" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "" + #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "" @@ -3604,6 +5673,66 @@ msgstr "" msgid "Available custom strategies are:" msgstr "" +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "" + +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 +msgid "strategy" +msgstr "" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "" + #: builtin/merge.c:240 msgid "could not run stash." msgstr "" @@ -3657,181 +5786,276 @@ msgstr "" msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "" - -#: builtin/merge.c:709 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:723 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:876 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:885 +#: builtin/merge.c:782 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:891 +#: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:915 +#: builtin/merge.c:812 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:927 +#: builtin/merge.c:824 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:992 +#: builtin/merge.c:889 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:1008 +#: builtin/merge.c:905 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:1049 +#: builtin/merge.c:946 msgid "No current branch." msgstr "" -#: builtin/merge.c:1051 +#: builtin/merge.c:948 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1053 +#: builtin/merge.c:950 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1058 +#: builtin/merge.c:955 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1042 builtin/merge.c:1199 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1213 +#: builtin/merge.c:1110 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1126 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1129 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1236 +#: builtin/merge.c:1133 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1239 +#: builtin/merge.c:1136 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1248 +#: builtin/merge.c:1145 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1253 +#: builtin/merge.c:1150 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:1260 +#: builtin/merge.c:1157 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1292 +#: builtin/merge.c:1189 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1192 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1297 +#: builtin/merge.c:1194 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1412 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1450 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1457 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1489 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1516 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1582 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1584 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1593 +#: builtin/merge.c:1492 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "" + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "" + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "" + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "" + #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" @@ -3894,183 +6118,562 @@ msgstr "" msgid "renaming '%s' failed" msgstr "" -#: builtin/notes.c:139 -#, c-format -msgid "unable to start 'show' for object '%s'" +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "" + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" msgstr "" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" +#: builtin/name-rev.c:235 +msgid "read from stdin" msgstr "" -#: builtin/notes.c:155 +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "" + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "" + +#: builtin/notes.c:139 #, c-format -msgid "failed to close pipe to 'show' for object '%s'" +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:143 +msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:158 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:189 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:215 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:217 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:275 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:299 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: builtin/notes.c:340 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: builtin/notes.c:350 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: builtin/notes.c:441 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:456 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:580 +#: builtin/notes.c:534 builtin/notes.c:691 +msgid "note contents as a string" +msgstr "" + +#: builtin/notes.c:537 builtin/notes.c:694 +msgid "note contents in a file" +msgstr "" + +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 +msgid "object" +msgstr "" + +#: builtin/notes.c:540 builtin/notes.c:697 +msgid "reuse and edit specified note object" +msgstr "" + +#: builtin/notes.c:543 builtin/notes.c:700 +msgid "reuse specified note object" +msgstr "" + +#: builtin/notes.c:545 builtin/notes.c:613 +msgid "replace existing notes" +msgstr "" + +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:635 +#: builtin/notes.c:614 +msgid "read objects from stdin" +msgstr "" + +#: builtin/notes.c:616 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "" + +#: builtin/notes.c:634 msgid "too few parameters" msgstr "" -#: builtin/notes.c:656 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:668 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:717 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:971 +#: builtin/notes.c:863 +msgid "General options" +msgstr "" + +#: builtin/notes.c:865 +msgid "Merge options" +msgstr "" + +#: builtin/notes.c:867 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" + +#: builtin/notes.c:869 +msgid "Committing unmerged notes" +msgstr "" + +#: builtin/notes.c:871 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" + +#: builtin/notes.c:873 +msgid "Aborting notes merge resolution" +msgstr "" + +#: builtin/notes.c:875 +msgid "abort notes merge" +msgstr "" + +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:982 +msgid "attempt to remove non-existent note is not an error" +msgstr "" + +#: builtin/notes.c:985 +msgid "read object names from the standard input" +msgstr "" + +#: builtin/notes.c:1066 +msgid "notes_ref" +msgstr "" + +#: builtin/notes.c:1067 +msgid "use notes from <notes_ref>" +msgstr "" + +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "" +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "" + #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" +#: builtin/pack-objects.c:2447 +msgid "do not show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2449 +msgid "show progress meter" +msgstr "" + +#: builtin/pack-objects.c:2451 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/pack-objects.c:2454 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/pack-objects.c:2455 +msgid "version[,offset]" +msgstr "" + +#: builtin/pack-objects.c:2456 +msgid "write the pack index file in the specified idx format version" +msgstr "" + +#: builtin/pack-objects.c:2459 +msgid "maximum size of each output pack file" +msgstr "" + +#: builtin/pack-objects.c:2461 +msgid "ignore borrowed objects from alternate object store" +msgstr "" + +#: builtin/pack-objects.c:2463 +msgid "ignore packed objects" +msgstr "" + +#: builtin/pack-objects.c:2465 +msgid "limit pack window by objects" +msgstr "" + +#: builtin/pack-objects.c:2467 +msgid "limit pack window by memory in addition to object limit" +msgstr "" + +#: builtin/pack-objects.c:2469 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "" + +#: builtin/pack-objects.c:2471 +msgid "reuse existing deltas" +msgstr "" + +#: builtin/pack-objects.c:2473 +msgid "reuse existing objects" +msgstr "" + +#: builtin/pack-objects.c:2475 +msgid "use OFS_DELTA objects" +msgstr "" + +#: builtin/pack-objects.c:2477 +msgid "use threads when searching for best delta matches" +msgstr "" + +#: builtin/pack-objects.c:2479 +msgid "do not create an empty pack output" +msgstr "" + +#: builtin/pack-objects.c:2481 +msgid "read revision arguments from standard input" +msgstr "" + +#: builtin/pack-objects.c:2483 +msgid "limit the objects to those that are not yet packed" +msgstr "" + +#: builtin/pack-objects.c:2486 +msgid "include objects reachable from any reference" +msgstr "" + +#: builtin/pack-objects.c:2489 +msgid "include objects referred by reflog entries" +msgstr "" + +#: builtin/pack-objects.c:2492 +msgid "output pack to stdout" +msgstr "" + +#: builtin/pack-objects.c:2494 +msgid "include tag objects that refer to objects to be packed" +msgstr "" + +#: builtin/pack-objects.c:2496 +msgid "keep unreachable objects" +msgstr "" + +#: builtin/pack-objects.c:2497 parse-options.h:141 +msgid "time" +msgstr "" + +#: builtin/pack-objects.c:2498 +msgid "unpack unreachable objects newer than <time>" +msgstr "" + +#: builtin/pack-objects.c:2501 +msgid "create thin packs" +msgstr "" + +#: builtin/pack-objects.c:2503 +msgid "ignore packs that have companion .keep file" +msgstr "" + +#: builtin/pack-objects.c:2505 +msgid "pack compression level" +msgstr "" + +#: builtin/pack-objects.c:2507 +msgid "do not hide commits by grafts" +msgstr "" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "" + #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "" @@ -4179,22 +6782,42 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4207,34 +6830,232 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:410 +#: builtin/push.c:419 +msgid "repository" +msgstr "" + +#: builtin/push.c:420 +msgid "push all refs" +msgstr "" + +#: builtin/push.c:421 +msgid "mirror all refs" +msgstr "" + +#: builtin/push.c:423 +msgid "delete refs" +msgstr "" + +#: builtin/push.c:424 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "" + +#: builtin/push.c:427 +msgid "force updates" +msgstr "" + +#: builtin/push.c:428 +msgid "check" +msgstr "" + +#: builtin/push.c:429 +msgid "control recursive pushing of submodules" +msgstr "" + +#: builtin/push.c:431 +msgid "use thin pack" +msgstr "" + +#: builtin/push.c:432 builtin/push.c:433 +msgid "receive pack program" +msgstr "" + +#: builtin/push.c:434 +msgid "set upstream for git pull/status" +msgstr "" + +#: builtin/push.c:437 +msgid "prune locally removed refs" +msgstr "" + +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "" + +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" msgstr "" +#: builtin/read-tree.c:36 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "" + +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "" + +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "" + +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "" + +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "" + +#: builtin/remote.c:12 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "" + +#: builtin/remote.c:15 builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "" + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "" + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "" + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "" + #: builtin/remote.c:98 #, c-format msgid "Updating %s" @@ -4251,6 +7072,34 @@ msgstr "" msgid "unknown mirror argument: %s" msgstr "" +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "" + #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "" @@ -4440,6 +7289,10 @@ msgstr "" msgid " %-*s pushes to %s" msgstr "" +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "" + #: builtin/remote.c:1118 #, c-format msgid "* remote %s" @@ -4498,6 +7351,14 @@ msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "" + #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "" @@ -4551,15 +7412,35 @@ msgstr "" msgid " * [pruned] %s" msgstr "" +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "" + #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "" +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "" + #: builtin/remote.c:1414 msgid "no remote specified" msgstr "" +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "" + #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "" @@ -4578,6 +7459,55 @@ msgstr "" msgid "Will not delete all non-push URLs" msgstr "" +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "" + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "" + +#: builtin/replace.c:121 +msgid "list replace refs" +msgstr "" + +#: builtin/replace.c:122 +msgid "delete replace refs" +msgstr "" + +#: builtin/replace.c:123 +msgid "replace the ref if it exists" +msgstr "" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" + +#: builtin/reset.c:26 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "" + +#: builtin/reset.c:27 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "" + #: builtin/reset.c:33 msgid "mixed" msgstr "" @@ -4598,122 +7528,461 @@ msgstr "" msgid "keep" msgstr "" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:96 -msgid "Could not write new index file." +#: builtin/reset.c:98 +#, c-format +msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:106 +#: builtin/reset.c:169 #, c-format -msgid "HEAD is now at %s" +msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:130 -msgid "Could not read index" +#: builtin/reset.c:248 +msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" +#: builtin/reset.c:250 +msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:223 +#: builtin/reset.c:251 +msgid "reset only HEAD" +msgstr "" + +#: builtin/reset.c:253 builtin/reset.c:255 +msgid "reset HEAD, index and working tree" +msgstr "" + +#: builtin/reset.c:257 +msgid "reset HEAD but keep local changes" +msgstr "" + +#: builtin/reset.c:275 #, c-format -msgid "Cannot do a %s reset in the middle of a merge." +msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "" + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "" + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "" + +#: builtin/rev-parse.c:464 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [options] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "" + #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:131 +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "" + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "" + +#: builtin/revert.c:113 +msgid "option" +msgstr "" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "" + +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "" + +#: builtin/revert.c:133 msgid "program error" msgstr "" -#: builtin/revert.c:221 +#: builtin/revert.c:223 msgid "revert failed" msgstr "" -#: builtin/revert.c:236 +#: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "" -#: builtin/rm.c:109 +#: builtin/rm.c:15 +msgid "git rm [options] [--] <file>..." +msgstr "" + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:194 +#: builtin/rm.c:207 +msgid "do not list removed files" +msgstr "" + +#: builtin/rm.c:208 +msgid "only remove from the index" +msgstr "" + +#: builtin/rm.c:209 +msgid "override the up-to-date check" +msgstr "" + +#: builtin/rm.c:210 +msgid "allow recursive removal" +msgstr "" + +#: builtin/rm.c:212 +msgid "exit with a zero status even if nothing matched" +msgstr "" + +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "" + +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "" +#: builtin/shortlog.c:229 +msgid "sort output according to the number of commits per author" +msgstr "" + +#: builtin/shortlog.c:231 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "" + +#: builtin/shortlog.c:233 +msgid "Show the email address of each author" +msgstr "" + +#: builtin/shortlog.c:234 +msgid "w[,i1[,i2]]" +msgstr "" + +#: builtin/shortlog.c:235 +msgid "Linewrap output" +msgstr "" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" +msgstr "" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "" + +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +msgstr "" + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "" + +#: builtin/show-ref.c:165 +msgid "only show tags (can be combined with heads)" +msgstr "" + +#: builtin/show-ref.c:166 +msgid "only show heads (can be combined with tags)" +msgstr "" + +#: builtin/show-ref.c:167 +msgid "stricter reference checking, requires exact ref path" +msgstr "" + +#: builtin/show-ref.c:170 builtin/show-ref.c:172 +msgid "show the HEAD reference" +msgstr "" + +#: builtin/show-ref.c:174 +msgid "dereference tags into object IDs" +msgstr "" + +#: builtin/show-ref.c:176 +msgid "only show SHA1 hash using <n> digits" +msgstr "" + +#: builtin/show-ref.c:180 +msgid "do not print results to stdout (useful with --verify)" +msgstr "" + +#: builtin/show-ref.c:182 +msgid "show refs from stdin that aren't in local repository" +msgstr "" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason" +msgstr "" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "" + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "" + #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" @@ -4740,140 +8009,350 @@ msgid "could not verify the tag '%s'" msgstr "" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "" -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:445 +msgid "list tag names" +msgstr "" + +#: builtin/tag.c:447 +msgid "print <n> lines of each tag message" +msgstr "" + +#: builtin/tag.c:449 +msgid "delete tags" +msgstr "" + +#: builtin/tag.c:450 +msgid "verify tags" +msgstr "" + +#: builtin/tag.c:452 +msgid "Tag creation options" +msgstr "" + +#: builtin/tag.c:454 +msgid "annotated tag, needs a message" +msgstr "" + +#: builtin/tag.c:456 +msgid "tag message" +msgstr "" + +#: builtin/tag.c:458 +msgid "annotated and GPG-signed tag" +msgstr "" + +#: builtin/tag.c:462 +msgid "use another key to sign the tag" +msgstr "" + +#: builtin/tag.c:463 +msgid "replace the tag if exists" +msgstr "" + +#: builtin/tag.c:464 +msgid "show tag list in columns" +msgstr "" + +#: builtin/tag.c:466 +msgid "Tag listing options" +msgstr "" + +#: builtin/tag.c:469 +msgid "print only tags that contain the commit" +msgstr "" + +#: builtin/tag.c:475 +msgid "print only tags of the object" +msgstr "" + +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" msgstr "" -#: parse-options.h:133 parse-options.h:235 -msgid "n" +#: builtin/update-index.c:718 +msgid "continue refresh even when index needs update" msgstr "" -#: parse-options.h:141 -msgid "time" +#: builtin/update-index.c:721 +msgid "refresh: ignore submodules" msgstr "" -#: parse-options.h:149 -msgid "file" +#: builtin/update-index.c:724 +msgid "do not ignore new files" msgstr "" -#: parse-options.h:151 -msgid "when" +#: builtin/update-index.c:726 +msgid "let files replace directories and vice-versa" +msgstr "" + +#: builtin/update-index.c:728 +msgid "notice files missing from worktree" +msgstr "" + +#: builtin/update-index.c:730 +msgid "refresh even if index contains unmerged entries" +msgstr "" + +#: builtin/update-index.c:733 +msgid "refresh stat information" +msgstr "" + +#: builtin/update-index.c:737 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "" + +#: builtin/update-index.c:741 +msgid "<mode> <object> <path>" +msgstr "" + +#: builtin/update-index.c:742 +msgid "add the specified entry to the index" +msgstr "" + +#: builtin/update-index.c:746 +msgid "(+/-)x" +msgstr "" + +#: builtin/update-index.c:747 +msgid "override the executable bit of the listed files" +msgstr "" + +#: builtin/update-index.c:751 +msgid "mark files as \"not changing\"" +msgstr "" + +#: builtin/update-index.c:754 +msgid "clear assumed-unchanged bit" +msgstr "" + +#: builtin/update-index.c:757 +msgid "mark files as \"index-only\"" +msgstr "" + +#: builtin/update-index.c:760 +msgid "clear skip-worktree bit" +msgstr "" + +#: builtin/update-index.c:763 +msgid "add to index only; do not add content to object database" +msgstr "" + +#: builtin/update-index.c:765 +msgid "remove named paths even if present in worktree" +msgstr "" + +#: builtin/update-index.c:767 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "" + +#: builtin/update-index.c:769 +msgid "read list of paths to be updated from standard input" +msgstr "" + +#: builtin/update-index.c:773 +msgid "add entries from standard input to the index" +msgstr "" + +#: builtin/update-index.c:777 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "" + +#: builtin/update-index.c:781 +msgid "only update entries that differ from HEAD" +msgstr "" + +#: builtin/update-index.c:785 +msgid "ignore files missing from worktree" +msgstr "" + +#: builtin/update-index.c:788 +msgid "report actions to standard output" +msgstr "" + +#: builtin/update-index.c:790 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "" + +#: builtin/update-index.c:794 +msgid "write index in this format" +msgstr "" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "" + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "" + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." msgstr "" #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -4914,7 +8393,7 @@ msgid "Print lines matching a pattern" msgstr "" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: common-cmds.h:18 @@ -5096,6 +8575,13 @@ msgstr "" msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" + #: git-am.sh:876 msgid "applying to an empty history" msgstr "" @@ -5263,7 +8749,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -5271,15 +8757,15 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:257 +#: git-pull.sh:258 msgid "Cannot rebase onto multiple branches" msgstr "" -#: git-rebase.sh:52 +#: git-rebase.sh:53 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" @@ -5287,38 +8773,42 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:159 +#: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:164 +#: git-rebase.sh:165 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:295 +#: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" msgstr "" -#: git-rebase.sh:300 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "" + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:316 +#: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:334 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -5331,56 +8821,56 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:422 git-rebase.sh:426 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:454 +#: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:474 +#: git-rebase.sh:483 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:495 +#: git-rebase.sh:504 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:506 +#: git-rebase.sh:515 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" #. Detach HEAD and reset the tree -#: git-rebase.sh:515 +#: git-rebase.sh:524 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:523 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -5490,59 +8980,59 @@ msgstr "" msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:474 +#: git-stash.sh:475 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:491 +#: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:492 +#: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:499 +#: git-stash.sh:500 msgid "No branch name specified" msgstr "" -#: git-stash.sh:570 +#: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:88 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:167 +#: git-submodule.sh:195 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:343 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:329 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:333 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5550,151 +9040,180 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:344 +#: git-submodule.sh:382 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:346 +#: git-submodule.sh:384 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:360 +#: git-submodule.sh:392 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "" + +#: git-submodule.sh:394 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "" + +#: git-submodule.sh:396 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" + +#: git-submodule.sh:397 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" + +#: git-submodule.sh:399 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "" + +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:365 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:370 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:413 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:427 +#: git-submodule.sh:482 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:471 +#: git-submodule.sh:526 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:480 +#: git-submodule.sh:535 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:482 +#: git-submodule.sh:537 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:490 +#: git-submodule.sh:545 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:590 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:603 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:622 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:709 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:637 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:642 +#: git-submodule.sh:715 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:643 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:648 +#: git-submodule.sh:721 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:649 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:779 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:819 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:837 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:840 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:843 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:868 +#: git-submodule.sh:941 msgid "blob" msgstr "" -#: git-submodule.sh:906 -msgid "# Submodules changed but not updated:" +#: git-submodule.sh:979 +msgid "Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:908 -msgid "# Submodule changes to be committed:" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:1054 +#: git-submodule.sh:1129 #, sh-format -msgid "Synchronizing submodule url for '$name'" +msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "" @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2012 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2013 Peter krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013. # msgid "" msgstr "" -"Project-Id-Version: git 1.7.12\n" +"Project-Id-Version: git 1.8.2\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-09-05 06:20+0800\n" -"PO-Revision-Date: 2012-09-07 10:09+0100\n" +"POT-Creation-Date: 2013-02-19 13:32+0800\n" +"PO-Revision-Date: 2013-02-19 10:25+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "tips: %.*s\n" @@ -26,7 +26,7 @@ msgstr "tips: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -38,6 +38,101 @@ msgstr "" "lämpligt för att ange lösning och checka in,\n" "eller använd \"git commit -a\"." +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> " +"[<sökväg>...]" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" + +#: archive.c:323 +msgid "fmt" +msgstr "fmt" + +#: archive.c:323 +msgid "archive format" +msgstr "arkivformat" + +#: archive.c:324 builtin/log.c:1115 +msgid "prefix" +msgstr "prefix" + +#: archive.c:325 +msgid "prepend prefix to each pathname in the archive" +msgstr "lägg till prefix till varje sökväg i arkivet" + +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "fil" + +#: archive.c:327 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "skriv arkivet till filen" + +#: archive.c:329 +msgid "read .gitattributes in working directory" +msgstr "läs .gitattributes i arbetskatalogen" + +#: archive.c:330 +msgid "report archived files on stderr" +msgstr "rapportera arkiverade filer på standard fel" + +#: archive.c:331 +msgid "store only" +msgstr "endast spara" + +#: archive.c:332 +msgid "compress faster" +msgstr "komprimera snabbare" + +#: archive.c:340 +msgid "compress better" +msgstr "komprimera bättre" + +#: archive.c:343 +msgid "list supported archive formats" +msgstr "visa understödda arkivformat" + +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "arkiv" + +#: archive.c:346 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "hämta arkivet från fjärrarkivet <arkiv>" + +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 +msgid "command" +msgstr "kommando" + +#: archive.c:348 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "sökväg till kommandot git-upload-archive på fjärren" + +#: attr.c:259 +msgid "" +"Negative patterns are forbidden in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"Negativa mönster är förbjudna i git-attribut\n" +"Använd '\\!' för att inleda med ett utropstecken." + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -48,7 +143,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:699 +#: bundle.c:89 builtin/commit.c:674 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -57,9 +152,9 @@ 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:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -85,7 +180,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser" msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -116,12 +211,12 @@ msgstr "kan inte skapa \"%s\"" msgid "index-pack died" msgstr "index-pack dog" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" @@ -211,18 +306,23 @@ msgid_plural "%lu years ago" msgstr[0] "%lu år sedan" msgstr[1] "%lu år sedan" -#: diff.c:105 +#: diff.c:112 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%.*s\"\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:110 +#: diff.c:117 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " Okänd dirstat-parameter \"%.*s\"\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " Okänd dirstat-parameter \"%s\"\n" #: diff.c:210 #, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" + +#: diff.c:260 +#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -230,32 +330,7 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:1401 -msgid " 0 files changed" -msgstr " 0 filer ändrade" - -#: diff.c:1405 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d fil ändrad" -msgstr[1] " %d filer ändrade" - -#: diff.c:1422 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] ", %d tillägg(+)" -msgstr[1] ", %d tillägg(+)" - -#: diff.c:1433 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] ", %d borttagning(-)" -msgstr[1] ", %d borttagningar(-)" - -#: diff.c:3460 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -264,7 +339,12 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: gpg-interface.c:59 +#: diff.c:3482 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" + +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "kunde inte köra gpg." @@ -276,17 +356,27 @@ msgstr "gpg godtog inte data" msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: grep.c:1320 +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "kunde inte skapa temporära filen \"%s\": %s" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "misslyckades skriva fristående signatur till \"%s\": %s" + +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" msgstr "\"%s\": %s" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" msgstr "\"%s\": kort läsning %s" @@ -300,7 +390,11 @@ msgstr "git-kommandon tillgängliga i \"%s\"" msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "De mest använda git-kommandona är:" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -309,11 +403,11 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -322,17 +416,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:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:366 +#: help.c:383 #, 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:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -346,6 +440,15 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" +#: merge.c:56 +msgid "failed to read the cache" +msgstr "misslyckads läsa cachen" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +msgid "unable to write new index file" +msgstr "kunde inte skriva ny indexfil" + #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" @@ -406,20 +509,20 @@ msgstr "misslyckades ta skapa symboliska länken \"%s\"" msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:921 +#: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:925 +#: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:941 +#: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "objekttyp som ej stöds upptäcktes i trädet" -#: merge-recursive.c:1020 merge-recursive.c:1034 +#: merge-recursive.c:1021 merge-recursive.c:1035 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -428,7 +531,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1026 merge-recursive.c:1039 +#: merge-recursive.c:1027 merge-recursive.c:1040 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -437,20 +540,20 @@ 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:1080 +#: merge-recursive.c:1081 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1080 +#: merge-recursive.c:1081 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1136 +#: merge-recursive.c:1137 #, 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:1158 +#: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -459,176 +562,194 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1163 +#: merge-recursive.c:1164 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1217 +#: merge-recursive.c:1218 #, 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:1247 +#: merge-recursive.c:1248 #, 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:1446 +#: merge-recursive.c:1447 #, 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:1456 +#: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1461 merge-recursive.c:1659 +#: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s iställer" -#: merge-recursive.c:1512 +#: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1515 +#: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1573 +#: merge-recursive.c:1574 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1580 +#: merge-recursive.c:1581 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1614 +#: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1628 +#: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1632 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1633 +#: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1723 +#: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1748 +#: merge-recursive.c:1749 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1754 +#: merge-recursive.c:1755 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1759 +#: merge-recursive.c:1760 #, 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:1769 +#: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1786 +#: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1805 +#: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1814 +#: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1844 +#: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1889 +#: merge-recursive.c:1890 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1902 +#: merge-recursive.c:1903 #, 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:1939 +#: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:1996 +#: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2008 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, 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:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-TAL" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "\"%s\" är på andra sidan av en symbolisk länk" + +#: remote.c:1653 #, 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:1638 +#: remote.c:1659 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" + +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -638,7 +759,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1646 +#: remote.c:1670 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" + +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -653,19 +778,23 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +#: remote.c:1683 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" + +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 +#: builtin/merge.c:994 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 +#: builtin/merge.c:999 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -673,7 +802,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -683,214 +812,210 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "Fel vid ombrytning av %s" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:261 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:282 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:324 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:329 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:395 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:398 -msgid "You do not have a valid HEAD" -msgstr "Du har ingen giltig HEAD" - -#: sequencer.c:413 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:421 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:425 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:436 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:440 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:524 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:525 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:553 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:561 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:566 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:624 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:646 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:651 +#: sequencer.c:667 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:664 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:668 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:675 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:703 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:706 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:718 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:739 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:740 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:744 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:781 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:783 +#: sequencer.c:799 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:3987 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:808 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:809 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:815 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:838 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1000 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1001 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" @@ -913,12 +1038,22 @@ msgstr "Ingen standarduppström angiven för grenen \"%s\"" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: wrapper.c:413 +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "kan inte komma åt \"%s\": %s" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "kan inte komma åt \"%s\"" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" -#: wrapper.c:414 +#: wrapper.c:435 msgid "no such user" msgstr "okänd användare" @@ -977,12 +1112,6 @@ 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:224 -#, c-format -msgid "%s files:" -msgstr "%se filer:" - #: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" @@ -1078,187 +1207,223 @@ msgstr "osammansl.: %s" msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:785 +#: wt-status.c:789 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:791 +#: wt-status.c:795 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 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:804 +#: wt-status.c:808 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 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (rätta konflikter och kör sedan \"git am --resolved\")" -#: wt-status.c:813 +#: wt-status.c:817 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 +#: wt-status.c:819 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 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." + +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:878 +#: wt-status.c:889 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 +#: wt-status.c:891 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 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " +"ovanpå \"%s\"." + +#: wt-status.c:913 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 +#: wt-status.c:916 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 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " +"ovanpå \"%s\"." + +#: wt-status.c:925 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 +#: wt-status.c:928 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 +#: wt-status.c:930 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 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "Du håller på med en \"cherry-pick\"." -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (alla konflikter har rättats: kör \"git commit\")" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "Du håller på med en \"bisect\" på grenen \"%s\"." + +#: wt-status.c:962 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:927 +#: wt-status.c:965 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 +#: wt-status.c:1064 msgid "On branch " msgstr "På grenen " -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1011 -msgid "Untracked" -msgstr "Ospårad" +#: wt-status.c:1097 +msgid "Untracked files" +msgstr "Ospårade filer" -#: wt-status.c:1013 -msgid "Ignored" -msgstr "Ignorerad" +#: wt-status.c:1099 +msgid "Ignored files" +msgstr "Ignorerade filer" # %s är nästa sträng eller tom. -#: wt-status.c:1015 +#: wt-status.c:1101 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1027 +#: wt-status.c:1114 #, c-format -msgid "no changes added to commit%s\n" -msgstr "inga ändringar att checka in%s\n" +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" +"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" +"\")\n" -#: 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:1117 +#, c-format +msgid "no changes added to commit\n" +msgstr "inga ändringar att checka in\n" -#: wt-status.c:1031 +#: wt-status.c:1120 #, 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" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"inget köat för incheckning, men ospårade filer finns (spåra med \"git add" +"\")\n" -#: wt-status.c:1033 -msgid " (use \"git add\" to track)" -msgstr " (spåra med \"git add\")" +#: wt-status.c:1123 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 +#: wt-status.c:1126 #, c-format -msgid "nothing to commit%s\n" -msgstr "inget att checka in%s\n" +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1036 -msgid " (create/copy files and use \"git add\" to track)" -msgstr " (skapa/kopiera filer och spåra med \"git add\")" +#: wt-status.c:1129 wt-status.c:1134 +#, c-format +msgid "nothing to commit\n" +msgstr "inget att checka in\n" -#: 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:1132 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1042 -msgid " (working directory clean)" -msgstr " (arbetskatalogen ren)" +#: wt-status.c:1136 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1150 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1156 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1171 +#: wt-status.c:1265 msgid "behind " msgstr "efter " -#: wt-status.c:1174 wt-status.c:1177 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "före " -#: wt-status.c:1179 +#: wt-status.c:1273 msgid ", behind " msgstr ", efter " @@ -1267,107 +1432,197 @@ msgstr ", efter " msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/add.c:62 +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [flaggor] [--] <sökväg>..." + +#: builtin/add.c:63 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:67 builtin/commit.c:229 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" - -#: builtin/add.c:192 +#: builtin/add.c:148 msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "\"%s\" är på andra sidan av en symbolisk länk" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:312 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:352 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 +#: builtin/rm.c:206 +msgid "dry run" +msgstr "testkörning" + +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "var pratsam" + +#: builtin/add.c:280 +msgid "interactive picking" +msgstr "plocka interaktivt" + +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 +msgid "select hunks interactively" +msgstr "välj stycken interaktivt" + +#: builtin/add.c:282 +msgid "edit current diff and apply" +msgstr "redigera aktuell diff och applicera" + +#: builtin/add.c:283 +msgid "allow adding otherwise ignored files" +msgstr "tillåt lägga till annars ignorerade filer" + +#: builtin/add.c:284 +msgid "update tracked files" +msgstr "uppdatera spårade filer" + +#: builtin/add.c:285 +msgid "record only the fact that the path will be added later" +msgstr "registrera endast att sökvägen kommer läggas till senare" + +#: builtin/add.c:286 +msgid "add changes from all tracked and untracked files" +msgstr "lägg till ändringar från alla spårade och ospårade filer" + +#: builtin/add.c:287 +msgid "don't add, only refresh the index" +msgstr "lägg inte till, uppdatera endast indexet" + +#: builtin/add.c:288 +msgid "just skip files which cannot be added because of errors" +msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" + +#: builtin/add.c:289 +msgid "check if - even missing - files are ignored in dry run" +msgstr "se om - även saknade - filer ignoreras i testkörning" + +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:353 +#: builtin/add.c:312 msgid "no files added" msgstr "inga filer har lagts till" -#: builtin/add.c:359 +#: builtin/add.c:318 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:391 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" +"Beteendet för \"git add %s (eller %s)\" utan sökvägsargument från en\n" +"underkatalog i ett träd kommer ändras i Git 2.0 och bör inte längre " +"användas.\n" +"För att lägga till innehållet för hela trädet, använd:\n" +"\n" +" git add %s :/\n" +" (eller git add %s :/)\n" +"\n" +"För att begränsa kommandot till aktuell katalog, använd:\n" +"\n" +" git add %s .\n" +" (eller git add %s .)\n" +"\n" +"I nuvarande version av Git begränsas kommandot till aktuell katalog." + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:393 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:413 +#: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:414 +#: builtin/add.c:415 #, c-format 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:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -1420,17 +1675,17 @@ msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" 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:1402 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1459 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1476 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1446,82 +1701,78 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1636 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1638 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1664 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1700 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1702 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1705 +#: builtin/apply.c:1725 #, 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:1851 +#: builtin/apply.c:1871 #, 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:1880 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:1966 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2056 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2060 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2131 -msgid "oops" -msgstr "hoppsan" - -#: builtin/apply.c:2653 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2771 +#: builtin/apply.c:2802 #, 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:2783 +#: builtin/apply.c:2814 #, 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:2789 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" @@ -1530,321 +1781,318 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2808 +#: builtin/apply.c:2839 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2911 +#: builtin/apply.c:2942 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:2917 +#: builtin/apply.c:2948 #, 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:2938 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3060 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3138 builtin/apply.c:3360 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3219 builtin/apply.c:3374 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3228 builtin/apply.c:3382 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3330 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3399 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3401 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3502 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3505 +#: builtin/apply.c:3536 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3525 +#: builtin/apply.c:3556 #, 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:3530 +#: builtin/apply.c:3561 #, 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:3538 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3551 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3749 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3777 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "trasig patch för underprojektet %s" -#: builtin/apply.c:3781 +#: builtin/apply.c:3850 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3786 +#: builtin/apply.c:3855 #, 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:3789 builtin/apply.c:3897 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3822 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3871 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:3958 +#: builtin/apply.c:4027 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:3966 +#: builtin/apply.c:4035 msgid "internal error" msgstr "internt fel" #. Say this even without --verbose -#: builtin/apply.c:3969 +#: builtin/apply.c:4038 #, 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:3979 +#: builtin/apply.c:4048 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4000 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4003 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4153 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4164 +#: builtin/apply.c:4233 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4283 builtin/apply.c:4286 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 +#: builtin/fetch.c:63 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4284 +#: builtin/apply.c:4353 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4287 +#: builtin/apply.c:4356 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4289 +#: builtin/apply.c:4358 msgid "num" msgstr "antal" -#: builtin/apply.c:4290 +#: builtin/apply.c:4359 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:4293 +#: builtin/apply.c:4362 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4295 +#: builtin/apply.c:4364 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:4299 -msgid "shows number of added and deleted lines in decimal notation" -msgstr "visar antal tillagda och borttagna rader decimalt" +#: builtin/apply.c:4368 +msgid "show number of added and deleted lines in decimal notation" +msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4301 +#: builtin/apply.c:4370 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:4303 +#: builtin/apply.c:4372 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:4305 +#: builtin/apply.c:4374 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:4307 +#: builtin/apply.c:4376 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4309 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4311 +#: builtin/apply.c:4380 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:4313 +#: builtin/apply.c:4382 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4315 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4318 +#: builtin/apply.c:4387 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4319 +#: builtin/apply.c:4388 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4320 +#: builtin/apply.c:4389 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4323 builtin/apply.c:4326 +#: builtin/apply.c:4392 builtin/apply.c:4395 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4329 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4331 +#: builtin/apply.c:4400 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4333 +#: builtin/apply.c:4402 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4335 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4336 -msgid "be verbose" -msgstr "var pratsam" - -#: builtin/apply.c:4338 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4341 +#: builtin/apply.c:4410 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4343 +#: builtin/apply.c:4412 msgid "root" msgstr "rot" -#: builtin/apply.c:4344 +#: builtin/apply.c:4413 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4366 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4374 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4377 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4393 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4407 +#: builtin/apply.c:4476 #, 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:4413 builtin/apply.c:4423 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1886,7 +2134,135 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/branch.c:144 +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "utför 'git bisect next'" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" + +#: builtin/blame.c:2350 +msgid "Show blame entries as we find them, incrementally" +msgstr "Visa klandringsposter när vi hittar dem, interaktivt" + +#: builtin/blame.c:2351 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" + +#: builtin/blame.c:2352 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" + +#: builtin/blame.c:2353 +msgid "Show work cost statistics" +msgstr "Visa statistik över arbetskostnad" + +#: builtin/blame.c:2354 +msgid "Show output score for blame entries" +msgstr "Visa utdatapoäng för klandringsposter" + +#: builtin/blame.c:2355 +msgid "Show original filename (Default: auto)" +msgstr "Visa originalfilnamn (Standard: auto)" + +#: builtin/blame.c:2356 +msgid "Show original linenumber (Default: off)" +msgstr "Visa ursprungligt radnummer (Standard: av)" + +#: builtin/blame.c:2357 +msgid "Show in a format designed for machine consumption" +msgstr "Visa i ett format avsett för maskinkonsumtion" + +#: builtin/blame.c:2358 +msgid "Show porcelain format with per-line commit information" +msgstr "Visa porslinsformat med per-rad-incheckningsinformation" + +#: builtin/blame.c:2359 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "Använd samma utdataläge som git-annotate (Standard: av)" + +#: builtin/blame.c:2360 +msgid "Show raw timestamp (Default: off)" +msgstr "Visa rå tidsstämpel (Standard: av)" + +#: builtin/blame.c:2361 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Visa lång inchecknings-SHA1 (Standard: av)" + +#: builtin/blame.c:2362 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" + +#: builtin/blame.c:2363 +msgid "Show author email instead of name (Default: off)" +msgstr "Visa författarens e-post istället för namn (Standard: av)" + +#: builtin/blame.c:2364 +msgid "Ignore whitespace differences" +msgstr "Ignorera ändringar i blanksteg" + +#: builtin/blame.c:2365 +msgid "Spend extra cycles to find better match" +msgstr "Slösa extra cykler med att hitta bättre träff" + +#: builtin/blame.c:2366 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" + +#: builtin/blame.c:2367 +msgid "Use <file>'s contents as the final image" +msgstr "Använd <fil>s innehåll som slutgiltig bild" + +#: builtin/blame.c:2368 builtin/blame.c:2369 +msgid "score" +msgstr "poäng" + +#: builtin/blame.c:2368 +msgid "Find line copies within and across files" +msgstr "Hitta kopierade rader inuti och mellan filer" + +#: builtin/blame.c:2369 +msgid "Find line movements within and across files" +msgstr "Hitta flyttade rader inuti och mellan filer" + +#: builtin/blame.c:2370 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:2370 +msgid "Process only line range n,m, counting from 1" +msgstr "Behandla endast radintervallet n,m, med början på 1" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" + +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -1895,7 +2271,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -1904,166 +2280,331 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." +#: builtin/branch.c:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"Grenen \"%s\" har inte slagits samman i sin helhet.\n" +"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." + #: builtin/branch.c:180 +msgid "Update of config-file failed" +msgstr "Misslyckades uppdatera konfigurationsfil" + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:186 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:191 +#: builtin/branch.c:222 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande." -#: builtin/branch.c:202 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." msgstr "fjärrgrenen \"%s\" hittades inte." -#: builtin/branch.c:203 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:210 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" - -#: builtin/branch.c:216 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"Grenen \"%s\" har inte slagits samman i sin helhet.\n" -"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." - -#: builtin/branch.c:225 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" -#: builtin/branch.c:226 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:233 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Tog bort fjärrgrenen %s (var %s).\n" -#: builtin/branch.c:234 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:239 -msgid "Update of config-file failed" -msgstr "Misslyckades uppdatera konfigurationsfil" - -#: builtin/branch.c:337 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:409 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:411 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:415 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:417 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:420 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:423 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:535 +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr " **** ogiltig ref ****" + +#: builtin/branch.c:560 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "objektet \"%s\" pekar på en incheckning" + +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:613 +#: builtin/branch.c:638 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:623 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:638 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:642 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:646 +#: builtin/branch.c:671 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:653 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:668 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:692 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:783 +#: builtin/branch.c:747 +msgid "Generic options" +msgstr "Allmänna flaggor" + +#: builtin/branch.c:749 +msgid "show hash and subject, give twice for upstream branch" +msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" + +#: builtin/branch.c:750 +msgid "suppress informational messages" +msgstr "undertryck informationsmeddelanden" + +#: builtin/branch.c:751 +msgid "set up tracking mode (see git-pull(1))" +msgstr "ställ in spårningsläge (se git-pull(1))" + +#: builtin/branch.c:753 +msgid "change upstream info" +msgstr "ändra uppströmsinformation" + +#: builtin/branch.c:757 +msgid "use colored output" +msgstr "använd färgad utdata" + +#: builtin/branch.c:758 +msgid "act on remote-tracking branches" +msgstr "arbeta på fjärrspårande grenar" + +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 +msgid "commit" +msgstr "incheckning" + +#: builtin/branch.c:762 builtin/branch.c:768 +msgid "print only branches that contain the commit" +msgstr "visa endast grenar som innehåller incheckningen" + +#: builtin/branch.c:774 +msgid "Specific git-branch actions:" +msgstr "Specifika git-branch-åtgärder:" + +#: builtin/branch.c:775 +msgid "list both remote-tracking and local branches" +msgstr "visa både fjärrspårande och lokala grenar" + +#: builtin/branch.c:777 +msgid "delete fully merged branch" +msgstr "ta bort helt sammanslagen gren" + +#: builtin/branch.c:778 +msgid "delete branch (even if not merged)" +msgstr "ta bort gren (även om inte helt sammanslagen)" + +#: builtin/branch.c:779 +msgid "move/rename a branch and its reflog" +msgstr "flytta/ta bort en gren och dess reflogg" + +#: builtin/branch.c:780 +msgid "move/rename a branch, even if target exists" +msgstr "flytta/ta bort en gren, även om målet finns" + +#: builtin/branch.c:781 +msgid "list branch names" +msgstr "lista namn på grenar" + +#: builtin/branch.c:782 +msgid "create the branch's reflog" +msgstr "skapa grenens reflogg" + +#: builtin/branch.c:784 +msgid "edit the description for the branch" +msgstr "redigera beskrivning för grenen" + +#: builtin/branch.c:785 +msgid "force creation (when already exists)" +msgstr "tvinga skapande (när den redan finns)" + +#: builtin/branch.c:788 +msgid "print only not merged branches" +msgstr "visa endast ej sammanslagna grenar" + +#: builtin/branch.c:794 +msgid "print only merged branches" +msgstr "visa endast sammanslagna grenar" + +#: builtin/branch.c:798 +msgid "list branches in columns" +msgstr "visa grenar i spalter" + +#: builtin/branch.c:811 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:788 builtin/clone.c:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:808 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:857 +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "grennamn krävs" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "Kan inte beskriva frånkopplad HEAD" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "kan inte redigera beskrivning för mer än en gren" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Inga incheckningar på grenen \"%s\" ännu" + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "Ingen gren vid namnet \"%s\"." + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "för många grenar för namnbyte" + +#: builtin/branch.c:893 +#, c-format +msgid "branch '%s' does not exist" +msgstr "grenen \"%s\" finns inte" + +#: builtin/branch.c:905 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Grenen \"%s\" har ingen uppströmsinformation" + +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" +#: builtin/branch.c:923 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " +"eller --set-upstream-to\n" + +#: builtin/branch.c:940 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" +"\n" + +#: builtin/branch.c:941 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" + +#: builtin/branch.c:942 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" @@ -2077,95 +2618,246 @@ 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:114 builtin/checkout.c:147 +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>" + +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <objektlista>" + +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<typ> kan vara en av: blob, tree, commit, tag" + +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "visa objekttyp" + +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "visa objektstorlek" + +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" +msgstr "avsluta med noll när det inte uppstått något fel" + +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" +msgstr "visa objektets innehåll snyggt" + +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" +msgstr "för blob-objekt, kör textconv på objektets innehåll" + +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" +msgstr "visa information och innehåll för objekt som listas på standard in" + +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" +msgstr "visa information för objekt som listas på standard in" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | attr...] [--] sökväg..." + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "visa alla attribut som satts på filen" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "använd .gitattributes endast från indexet" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "läs filnamn från standard in" + +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "input paths are terminated by a null character" +msgstr "sökvägar avdelas med null-tecken" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "undertryck förloppsrapportering" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "kan inte ange sökvägsnamn med --stdin" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "-z kan endast användas tillsammans med --stdin" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "ingen sökväg angavs" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "kan inte använda både --quiet och --verbose" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [flaggor] [--] [<fil>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "checka ut alla filer i indexet" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "tvinga överskrivning av befintliga filer" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "ingen varning för existerande filer och filer ej i indexet" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "checka inte ut nya filer" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "uppdatera stat-information i indexfilen" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "läs listan över sökvägar från standard in" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "skriv innehåll till temporära filer" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "sträng" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "när filer skapas, lägg till <sträng> först" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "kopiera ut filer från namngiven etapp" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [flaggor] <gren>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [flaggor] [<gren>] -- <fil>..." + +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:118 builtin/checkout.c:151 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:132 +#: builtin/checkout.c:134 #, 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:176 +#: builtin/checkout.c:178 #, 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:193 +#: builtin/checkout.c:195 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:210 +#: builtin/checkout.c:212 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:235 builtin/checkout.c:392 +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "\"%s\" kan inte användas med %s" + +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." + +#: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:265 builtin/checkout.c:272 +#: builtin/checkout.c:295 builtin/checkout.c:302 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" -msgstr "kunde inte skriva ny indexfil" - -#: builtin/checkout.c:414 +#: builtin/checkout.c:448 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:569 #, 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:602 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:573 +#: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:612 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:616 #, 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:618 builtin/checkout.c:955 #, 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:620 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:640 +#: builtin/checkout.c:676 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:682 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2188,7 +2880,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:700 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2203,88 +2895,146 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:730 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:698 +#: builtin/checkout.c:734 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:724 builtin/checkout.c:919 +#: builtin/checkout.c:761 builtin/checkout.c:950 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:886 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:925 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:976 -msgid "-B cannot be used with -b" -msgstr "-B kan inte användas med -b" +#: builtin/checkout.c:964 +msgid "paths cannot be used with switching branches" +msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:985 -msgid "--patch is incompatible with all other options" -msgstr "--patch är inkompatibel med alla andra flaggor" +#: builtin/checkout.c:967 builtin/checkout.c:971 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:988 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detcah kan inte användas med -b/-B/--orphan" +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:990 -msgid "--detach cannot be used with -t" -msgstr "--detach kan inte användas med -t" +#: builtin/checkout.c:991 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:996 -msgid "--track needs a branch name" -msgstr "--track behöver ett namn på en gren" +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "gren" -#: builtin/checkout.c:1003 -msgid "Missing branch name; try -b" -msgstr "Grennamn saknas; försök med -b" +#: builtin/checkout.c:1014 +msgid "create and checkout a new branch" +msgstr "skapa och checka ut en ny gren" + +#: builtin/checkout.c:1016 +msgid "create/reset and checkout a branch" +msgstr "skapa/nollställ och checka ut en gren" + +#: builtin/checkout.c:1017 +msgid "create reflog for new branch" +msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1009 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan och -b|-B kan inte användas samtidigt" +#: builtin/checkout.c:1018 +msgid "detach the HEAD at named commit" +msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1011 -msgid "--orphan cannot be used with -t" -msgstr "--orphan kan inte användas med -t" +#: builtin/checkout.c:1019 +msgid "set upstream info for new branch" +msgstr "sätt uppströmsinformation för ny gren" + +#: builtin/checkout.c:1021 +msgid "new branch" +msgstr "ny gren" #: builtin/checkout.c:1021 -msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout: -f och -m är inkompatibla" +msgid "new unparented branch" +msgstr "ny gren utan förälder" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1022 +msgid "checkout our version for unmerged files" +msgstr "checka ut vår version för ej sammanslagna filer" + +#: builtin/checkout.c:1024 +msgid "checkout their version for unmerged files" +msgstr "checka ut deras version för ej sammanslagna filer" + +#: builtin/checkout.c:1026 +msgid "force checkout (throw away local modifications)" +msgstr "tvinga utcheckning (kasta bort lokala ändringar)" + +#: builtin/checkout.c:1027 +msgid "perform a 3-way merge with the new branch" +msgstr "utför en 3-vägssammanslagning för den nya grenen" + +#: builtin/checkout.c:1028 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "uppdatera ignorerade filer (standard)" + +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 +msgid "style" +msgstr "stil" + +#: builtin/checkout.c:1030 +msgid "conflict style (merge or diff3)" +msgstr "konfliktstil (merge eller diff3)" + +#: builtin/checkout.c:1033 +msgid "second guess 'git checkout no-such-branch'" +msgstr "förutspå \"git checkout gren-saknas\"" + +#: builtin/checkout.c:1057 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b, -B och --orphan är ömsesidigt uteslutande" + +#: builtin/checkout.c:1074 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" + +#: builtin/checkout.c:1081 +msgid "Missing branch name; try -b" +msgstr "Grennamn saknas; försök med -b" + +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1123 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" +"Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" 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?" +"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" +"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: builtin/checkout.c:1065 -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:1070 -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:1128 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1073 +#: builtin/checkout.c:1132 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2292,26 +3042,77 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1092 -msgid "Cannot switch branch to a non-commit." -msgstr "Kan inte växla gren på en icke-incheckning." +#: builtin/clean.c:20 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökvägar>..." + +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "Tar bort %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "Skulle ta bort %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Hoppar över arkivet %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Skulle hoppa över arkivet %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "misslyckades ta bort %s" + +#: builtin/clean.c:160 +msgid "do not print names of files removed" +msgstr "skriv inte ut namn på borttagna filer" + +#: builtin/clean.c:162 +msgid "force" +msgstr "tvinga" + +#: builtin/clean.c:164 +msgid "remove whole directories" +msgstr "ta bort hela kataloger" + +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 +msgid "pattern" +msgstr "mönster" + +#: builtin/clean.c:166 +msgid "add <pattern> to ignore rules" +msgstr "lägg till <mönster> till ignoreringsregler" + +#: builtin/clean.c:167 +msgid "remove ignored files, too" +msgstr "ta även bort ignorerade filer" -#: builtin/checkout.c:1095 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs är inkompatibla med att byta gren." +#: builtin/clean.c:169 +msgid "remove only ignored files" +msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce satt till true, men varken -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" @@ -2319,30 +3120,98 @@ msgstr "" "clean.requireForce har standardvärdet true, men varken -n eller -f angavs; " "vägrar städa" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "Skulle ta bort %s\n" +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "Tar bort %s\n" +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:436 +msgid "force progress reporting" +msgstr "tvinga förloppsrapportering" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "misslyckades ta bort %s" +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "skapa inte någon utcheckning" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "Skulle inte ta bort %s\n" +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "Tar inte bort %s\n" +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "skapa ett spegelarkiv (implicerar \"bare\")" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "för att klona från ett lokalt arkiv" + +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" +msgstr "skapa inte lokala hårda länkar, kopiera alltid" + +#: builtin/clone.c:78 +msgid "setup as shared repository" +msgstr "skapa som ett delat arkiv" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "initiera undermoduler i klonen" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "mallkatalog" + +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "katalog att använda mallar från" + +#: builtin/clone.c:86 +msgid "reference repository" +msgstr "referensarkiv" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "namn" + +#: builtin/clone.c:88 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" + +#: builtin/clone.c:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "checka ut <gren> istället för fjärrens HEAD" + +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" +msgstr "sökväg till git-upload-pack på fjärren" + +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 +msgid "depth" +msgstr "djup" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "skapa en grund klon på detta djup" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "klona endast en gren, HEAD eller --branch" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr "gitkat" + +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "separera gitkatalogen från arbetskatalogen" + +#: builtin/clone.c:99 +msgid "key=value" +msgstr "nyckel=värde" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" +msgstr "ställ in konfiguration i det nya arkivet" #: builtin/clone.c:243 #, c-format @@ -2394,77 +3263,117 @@ 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:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:646 +#: builtin/clone.c:694 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:657 +#: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:671 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:676 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:686 +#: builtin/clone.c:736 #, 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:696 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:759 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:712 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:731 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:733 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:789 +#: builtin/clone.c:818 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:838 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:845 +#: builtin/clone.c:874 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [flaggor]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "slå upp konfigurationsvariabler" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "utseende att använda" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "Maximal bredd" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "Spaltfyllnad i vänsterkanten" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "Spaltfyllnad i högerkanten" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "Spaltfyllnad mellan spalter" + #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit.c:43 +#: builtin/commit.c:34 +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [flaggor] [--] <sökväg>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [flaggor] [--] <sökväg>..." + +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2489,7 +3398,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -2499,7 +3408,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -2515,93 +3424,93 @@ msgstr "" "\n" "Annars använder du \"git reset\"\n" -#: builtin/commit.c:256 +#: builtin/commit.c:258 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:298 +#: builtin/commit.c:300 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:389 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:391 +#: builtin/commit.c:393 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:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:421 +#: builtin/commit.c:423 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:496 builtin/commit.c:502 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "felaktig incheckning: %s" -#: builtin/commit.c:525 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:585 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:635 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:637 +#: builtin/commit.c:612 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:641 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:647 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "incheckningen har ett tomt meddelande" -#: builtin/commit.c:663 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:667 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:671 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:723 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:734 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -2616,7 +3525,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:739 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -2631,177 +3540,378 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:751 +#: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" +"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " +"incheckningen.\n" -#: builtin/commit.c:756 +#: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:769 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "%sFörfattare: %s" -#: builtin/commit.c:776 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "%sIncheckare: %s" -#: builtin/commit.c:796 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:833 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:848 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, 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:945 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:960 builtin/commit.c:1160 +#: builtin/commit.c:944 builtin/commit.c:1138 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1000 +#: builtin/commit.c:974 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:1011 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1014 +#: builtin/commit.c:988 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:1016 +#: builtin/commit.c:990 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:1019 +#: builtin/commit.c:993 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1029 +#: builtin/commit.c:1003 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:1031 +#: builtin/commit.c:1005 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:1039 +#: builtin/commit.c:1013 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:1056 +#: builtin/commit.c:1030 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:1058 +#: builtin/commit.c:1032 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:1060 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1062 +#: builtin/commit.c:1036 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:1072 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1077 +#: builtin/commit.c:1051 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1260 +#: builtin/commit.c:1057 builtin/commit.c:1192 +msgid "--long and -z are incompatible" +msgstr "--long och -z är inkompatibla" + +#: builtin/commit.c:1152 builtin/commit.c:1388 +msgid "show status concisely" +msgstr "vis koncis status" + +#: builtin/commit.c:1154 builtin/commit.c:1390 +msgid "show branch information" +msgstr "visa information om gren" + +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 +msgid "machine-readable output" +msgstr "maskinläsbar utdata" + +#: builtin/commit.c:1159 builtin/commit.c:1394 +msgid "show status in long format (default)" +msgstr "visa status i långt format (standard)" + +#: builtin/commit.c:1162 builtin/commit.c:1397 +msgid "terminate entries with NUL" +msgstr "terminera poster med NUL" + +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 +msgid "mode" +msgstr "läge" + +#: builtin/commit.c:1165 builtin/commit.c:1400 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" + +#: builtin/commit.c:1168 +msgid "show ignored files" +msgstr "visa ignorerade filer" + +#: builtin/commit.c:1169 parse-options.h:151 +msgid "when" +msgstr "när" + +#: builtin/commit.c:1170 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " +"(Default: all)" + +#: builtin/commit.c:1172 +msgid "list untracked files in columns" +msgstr "visa ospårade filer i spalter" + +#: builtin/commit.c:1246 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1262 +#: builtin/commit.c:1248 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1303 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1305 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1449 +#: builtin/commit.c:1358 +msgid "suppress summary after successful commit" +msgstr "undertryck sammanfattning efter framgångsrik incheckning" + +#: builtin/commit.c:1359 +msgid "show diff in commit message template" +msgstr "visa diff i mallen för incheckningsmeddelandet" + +#: builtin/commit.c:1361 +msgid "Commit message options" +msgstr "Alternativ för incheckningsmeddelande" + +#: builtin/commit.c:1362 builtin/tag.c:457 +msgid "read message from file" +msgstr "läs meddelande från fil" + +#: builtin/commit.c:1363 +msgid "author" +msgstr "författare" + +#: builtin/commit.c:1363 +msgid "override author for commit" +msgstr "överstyr författare för incheckningen" + +#: builtin/commit.c:1364 builtin/gc.c:178 +msgid "date" +msgstr "datum" + +#: builtin/commit.c:1364 +msgid "override date for commit" +msgstr "överstyr datum för inchecknignen" + +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 +msgid "message" +msgstr "meddelande" + +#: builtin/commit.c:1365 +msgid "commit message" +msgstr "incheckningsmeddelande" + +#: builtin/commit.c:1366 +msgid "reuse and edit message from specified commit" +msgstr "återanvänd och redigera meddelande från angiven incheckning" + +#: builtin/commit.c:1367 +msgid "reuse message from specified commit" +msgstr "återanvänd meddelande från angiven incheckning" + +#: builtin/commit.c:1368 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"använd autosquash-formaterat meddelande för att fixa angiven incheckning" + +#: builtin/commit.c:1369 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" +"använd autosquash-formaterat meddelande för att slå ihop med angiven " +"incheckning" + +#: builtin/commit.c:1370 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" + +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "lägg till Signed-off-by:" + +#: builtin/commit.c:1372 +msgid "use specified template file" +msgstr "använd angiven mallfil" + +#: builtin/commit.c:1373 +msgid "force edit of commit" +msgstr "tvinga redigering av incheckning" + +#: builtin/commit.c:1374 +msgid "default" +msgstr "standard" + +#: builtin/commit.c:1374 builtin/tag.c:460 +msgid "how to strip spaces and #comments from message" +msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" + +#: builtin/commit.c:1375 +msgid "include status in commit message template" +msgstr "inkludera status i mallen för incheckningsmeddelandet" + +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 +msgid "key id" +msgstr "nyckel-id" + +#: builtin/commit.c:1377 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "GPG-signera incheckning" + +#. end commit message options +#: builtin/commit.c:1380 +msgid "Commit contents options" +msgstr "Alternativ för incheckningens innehåll" + +#: builtin/commit.c:1381 +msgid "commit all changed files" +msgstr "checka in alla ändrade filer" + +#: builtin/commit.c:1382 +msgid "add specified files to index for commit" +msgstr "lägg till angivna filer till indexet för incheckning" + +#: builtin/commit.c:1383 +msgid "interactively add files" +msgstr "lägg till filer interaktivt" + +#: builtin/commit.c:1384 +msgid "interactively add changes" +msgstr "lägg till ändringar interaktivt" + +#: builtin/commit.c:1385 +msgid "commit only specified files" +msgstr "checka endast in angivna filer" + +#: builtin/commit.c:1386 +msgid "bypass pre-commit hook" +msgstr "förbigå pre-commit-krok" + +#: builtin/commit.c:1387 +msgid "show what would be committed" +msgstr "visa vad som skulle checkas in" + +#: builtin/commit.c:1398 +msgid "amend previous commit" +msgstr "lägg till föregående incheckning" + +#: builtin/commit.c:1399 +msgid "bypass post-rewrite hook" +msgstr "förbigå post-rewrite-krok" + +#: builtin/commit.c:1404 +msgid "ok to record an empty change" +msgstr "ok att registrera en tom ändring" + +#: builtin/commit.c:1407 +msgid "ok to record a change with an empty message" +msgstr "ok att registrera en ändring med tomt meddelande" + +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1524 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1529 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2812,6 +3922,134 @@ msgstr "" "att kvoten inte har överskridits, och kör sedan\n" "\"git reset HEAD\" för att återställa." +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [flaggor]" + +#: builtin/config.c:51 +msgid "Config file location" +msgstr "Konfigurationsfilens plats" + +#: builtin/config.c:52 +msgid "use global config file" +msgstr "använd global konfigurationsfil" + +#: builtin/config.c:53 +msgid "use system config file" +msgstr "använd systemets konfigurationsfil" + +#: builtin/config.c:54 +msgid "use repository config file" +msgstr "använd arkivets konfigurationsfil" + +#: builtin/config.c:55 +msgid "use given config file" +msgstr "använd angiven konfigurationsil" + +#: builtin/config.c:56 +msgid "Action" +msgstr "Åtgärd" + +#: builtin/config.c:57 +msgid "get value: name [value-regex]" +msgstr "hämta värde: namn [värde-reguttr]" + +#: builtin/config.c:58 +msgid "get all values: key [value-regex]" +msgstr "hämta alla värden: nyckel [värde-reguttr]" + +#: builtin/config.c:59 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" + +#: builtin/config.c:60 +msgid "replace all matching variables: name value [value_regex]" +msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" + +#: builtin/config.c:61 +msgid "add a new variable: name value" +msgstr "lägg till en ny variabel: namn värde" + +#: builtin/config.c:62 +msgid "remove a variable: name [value-regex]" +msgstr "ta bort en variabel: namn [värde-reguttr]" + +#: builtin/config.c:63 +msgid "remove all matches: name [value-regex]" +msgstr "ta bort alla träffar: namn [värde-reguttr]" + +#: builtin/config.c:64 +msgid "rename section: old-name new-name" +msgstr "byt namn på sektion: gammalt-namn nytt-namn" + +#: builtin/config.c:65 +msgid "remove a section: name" +msgstr "ta bort en sektion: namn" + +#: builtin/config.c:66 +msgid "list all" +msgstr "visa alla" + +#: builtin/config.c:67 +msgid "open an editor" +msgstr "öppna textredigeringsprogram" + +#: builtin/config.c:68 builtin/config.c:69 +msgid "slot" +msgstr "plats" + +#: builtin/config.c:68 +msgid "find the color configured: [default]" +msgstr "hitta den inställda färgen: [default]" + +#: builtin/config.c:69 +msgid "find the color setting: [stdout-is-tty]" +msgstr "hitta färginställningen: [stdout-is-tty]" + +#: builtin/config.c:70 +msgid "Type" +msgstr "Typ" + +#: builtin/config.c:71 +msgid "value is \"true\" or \"false\"" +msgstr "värdet är \"true\" eller \"false\"" + +#: builtin/config.c:72 +msgid "value is decimal number" +msgstr "värdet är ett decimalt tal" + +#: builtin/config.c:73 +msgid "value is --bool or --int" +msgstr "värdet är --bool eller --int" + +#: builtin/config.c:74 +msgid "value is a path (file or directory name)" +msgstr "värdet är en sökväg (fil- eller katalognamn)" + +#: builtin/config.c:75 +msgid "Other" +msgstr "Andra" + +#: builtin/config.c:76 +msgid "terminate values with NUL byte" +msgstr "terminera värden med NUL-byte" + +#: builtin/config.c:77 +msgid "respect include directives on lookup" +msgstr "respektera inkluderingsdirektiv vid uppslag" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "git count-objects [-v]" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [flaggor] <incheckning-igt>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [flaggor] --dirty" + #: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" @@ -2884,6 +4122,50 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "hitta taggen som kommer efter incheckningen" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "felsök sökstrategin på standard fel" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "använd alla referenser i .git/refs" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "använd alla taggar i .git/refs/tags" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "använd alltid långt format" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "skriv endast ut exakta träffar" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "överväg de <n> nyaste taggarna (standard: 10)" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "överväg endast taggar som motsvarar <mönster>" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "visa förkortade incheckningsobjekt som standard" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "märke" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" + #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" @@ -2901,105 +4183,229 @@ msgstr "--dirty är inkompatibelt med \"committish\"-värden" msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "mer än %d träd angavs: \"%s\"" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/fetch.c:200 +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-flaggor]" + +#: builtin/fast-export.c:646 +msgid "show progress after <n> objects" +msgstr "visa förlopp efter <n> objekt" + +#: builtin/fast-export.c:648 +msgid "select handling of signed tags" +msgstr "välj hantering av signerade taggar" + +#: builtin/fast-export.c:651 +msgid "select handling of tags that tag filtered objects" +msgstr "välj hantering av taggar som har taggfiltrerade objekt" + +#: builtin/fast-export.c:654 +msgid "Dump marks to this file" +msgstr "Dump märken till filen" + +#: builtin/fast-export.c:656 +msgid "Import marks from this file" +msgstr "Importera märken från filen" + +#: builtin/fast-export.c:658 +msgid "Fake a tagger when tags lack one" +msgstr "Fejka taggare när taggen saknar en" + +#: builtin/fast-export.c:660 +msgid "Output full tree for each commit" +msgstr "Skriv ut hela trädet för varje incheckning" + +#: builtin/fast-export.c:662 +msgid "Use the done feature to terminate the stream" +msgstr "Använd done-funktionen för att avsluta strömmen" + +#: builtin/fast-export.c:663 +msgid "Skip output of blob data" +msgstr "Hoppa över skrivning av blob-data" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<flaggor>] <grupp>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<flaggor>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "hämta från alla fjärrar" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "sökväg till upload pack på fjärren" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "tvinga överskrivning av lokal gren" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "hämta från flera fjärrar" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "hämta alla taggar och associerade objekt" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "hämta inte alla taggar (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "rensa fjärrspårande grenar ej längre på fjärren" + +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "styr rekursiv hämtning av undermoduler" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "behåll hämtade paket" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "tillåt uppdatering av HEAD-referens" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "fördjupa historik för grund klon" + +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "konvertera till komplett arkiv" + +#: builtin/fetch.c:88 builtin/log.c:1119 +msgid "dir" +msgstr "kat" + +#: builtin/fetch.c:89 +msgid "prepend this to submodule path output" +msgstr "lägg till i början av undermodulens sökvägsutdata" + +#: builtin/fetch.c:92 +msgid "default mode for recursion" +msgstr "standardläge för rekursion" + +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:253 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -3008,55 +4414,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:890 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:907 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -3064,27 +4470,154 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:927 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:979 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth och --unshallow kan inte användas samtidigt" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow kan inte användas på ett komplett arkiv" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:992 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" + +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:660 +msgid "populate log with at most <n> entries from shortlog" +msgstr "fyll i loggen med som mest <n> poster från shortlog" + +#: builtin/fmt-merge-msg.c:663 +msgid "alias for --log (deprecated)" +msgstr "alias för --log (avråds)" + +#: builtin/fmt-merge-msg.c:666 +msgid "text" +msgstr "text" + +#: builtin/fmt-merge-msg.c:667 +msgid "use <text> as start of message" +msgstr "inled meddelande med <text>" + +#: builtin/fmt-merge-msg.c:668 +msgid "file to read from" +msgstr "fil att läsa från" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [flaggor] [<mönster>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "citera platshållare passande för skal" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "citera platshållare passande för perl" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "citera platshållare passande för python" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "citera platshållare passande för tcl" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "visa endast <n> träffade refs" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "format" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "format att använda för utdata" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "nyckel" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "fältnamn att sortera på" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [flaggor] [<objekt>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "visa onåbara objekt" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "visa dinglande objekt" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "rapportera taggar" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "rapportera rotnoder" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "gör indexojekt till huvudnoder" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "gör refloggar till huvudnoder (standard)" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "ta även hänsyn till paket och alternativa objekt" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "aktivera striktare kontroll" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "skriv dinglande objekt i .git/lost-found" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "visa förlopp" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [flaggor]" + #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" @@ -3095,12 +4628,19 @@ msgstr "Felaktigt %s: \"%s\"" msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "Packar arkivet automatiskt för optimal prestanda.\n" +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "rensa ej refererade objekt" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:224 +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "aktivera auto-gc-läge" + +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -3109,96 +4649,324 @@ msgstr "" "Packar arkivet automatiskt för optimal prestanda. Du kan även\n" "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:216 +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" + +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:454 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "Kunde inte byta katalog (chdir): %s" -#: builtin/grep.c:530 builtin/grep.c:564 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:578 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:636 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:653 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: builtin/grep.c:917 +#: builtin/grep.c:643 +msgid "search in index instead of in the work tree" +msgstr "sök i indexet istället för i arbetskatalogen" + +#: builtin/grep.c:645 +msgid "find in contents not managed by git" +msgstr "sök i innehål som inte hanteras av git" + +#: builtin/grep.c:647 +msgid "search in both tracked and untracked files" +msgstr "sök i både spårade och ospårade filer" + +#: builtin/grep.c:649 +msgid "search also in ignored files" +msgstr "sök även i ignorerade filer" + +#: builtin/grep.c:652 +msgid "show non-matching lines" +msgstr "vis rader som inte träffas" + +#: builtin/grep.c:654 +msgid "case insensitive matching" +msgstr "skiftlägesokänslig sökning" + +#: builtin/grep.c:656 +msgid "match patterns only at word boundaries" +msgstr "matcha endast mönster vid ordgränser" + +#: builtin/grep.c:658 +msgid "process binary files as text" +msgstr "hantera binärfiler som text" + +#: builtin/grep.c:660 +msgid "don't match patterns in binary files" +msgstr "träffa inte mönster i binärfiler" + +#: builtin/grep.c:663 +msgid "descend at most <depth> levels" +msgstr "gå som mest ned <djup> nivåer" + +#: builtin/grep.c:667 +msgid "use extended POSIX regular expressions" +msgstr "använd utökade POSIX-reguljära uttryck" + +#: builtin/grep.c:670 +msgid "use basic POSIX regular expressions (default)" +msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" + +#: builtin/grep.c:673 +msgid "interpret patterns as fixed strings" +msgstr "tolka mönster som fixerade strängar" + +#: builtin/grep.c:676 +msgid "use Perl-compatible regular expressions" +msgstr "använd Perlkompatibla reguljära uttryck" + +#: builtin/grep.c:679 +msgid "show line numbers" +msgstr "visa radnummer" + +#: builtin/grep.c:680 +msgid "don't show filenames" +msgstr "visa inte filnamn" + +#: builtin/grep.c:681 +msgid "show filenames" +msgstr "visa filnamn" + +#: builtin/grep.c:683 +msgid "show filenames relative to top directory" +msgstr "visa filnamn relativa till toppkatalogen" + +#: builtin/grep.c:685 +msgid "show only filenames instead of matching lines" +msgstr "visa endast filnamn istället för träffade rader" + +#: builtin/grep.c:687 +msgid "synonym for --files-with-matches" +msgstr "synonym för --files-with-matches" + +#: builtin/grep.c:690 +msgid "show only the names of files without match" +msgstr "visa endast namn på filer utan träffar" + +#: builtin/grep.c:692 +msgid "print NUL after filenames" +msgstr "skriv NUL efter filnamn" + +#: builtin/grep.c:694 +msgid "show the number of matches instead of matching lines" +msgstr "visa antal träffar istället för träffade rader" + +#: builtin/grep.c:695 +msgid "highlight matches" +msgstr "ljusmarkera träffar" + +#: builtin/grep.c:697 +msgid "print empty line between matches from different files" +msgstr "skriv tomma rader mellan träffar från olika filer" + +#: builtin/grep.c:699 +msgid "show filename only once above matches from same file" +msgstr "visa filnamn endast en gång ovanför träffar från samma fil" + +#: builtin/grep.c:702 +msgid "show <n> context lines before and after matches" +msgstr "visa <n> rader sammanhang före och efter träffar" + +#: builtin/grep.c:705 +msgid "show <n> context lines before matches" +msgstr "visa <n> rader sammanhang före träffar" + +#: builtin/grep.c:707 +msgid "show <n> context lines after matches" +msgstr "visa <n> rader sammanhang efter träffar" + +#: builtin/grep.c:708 +msgid "shortcut for -C NUM" +msgstr "genväg för -C NUM" + +#: builtin/grep.c:711 +msgid "show a line with the function name before matches" +msgstr "visa en rad med funktionsnamnet före träffen" + +#: builtin/grep.c:713 +msgid "show the surrounding function" +msgstr "visa den omkringliggande funktionen" + +#: builtin/grep.c:716 +msgid "read patterns from file" +msgstr "läs mönster från fil" + +#: builtin/grep.c:718 +msgid "match <pattern>" +msgstr "träffa <mönster>" + +#: builtin/grep.c:720 +msgid "combine patterns specified with -e" +msgstr "kombinera mönster som anges med -e" + +#: builtin/grep.c:732 +msgid "indicate hit with exit status without output" +msgstr "ange träff med slutstatuskod utan utdata" + +#: builtin/grep.c:734 +msgid "show only matches from files that match all patterns" +msgstr "visa endast träffar från filer som träffar alla mönster" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "visa analysträd för grep-uttryck" + +#: builtin/grep.c:740 +msgid "pager" +msgstr "bläddrare" + +#: builtin/grep.c:740 +msgid "show matching files in the pager" +msgstr "visa träffade filer i filbläddraren" + +#: builtin/grep.c:743 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" + +#: builtin/grep.c:744 builtin/show-ref.c:184 +msgid "show usage" +msgstr "visa användning" + +#: builtin/grep.c:811 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:931 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "felaktigt objekt %s" -#: builtin/grep.c:972 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:995 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:1000 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:1003 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: builtin/grep.c:1011 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." -#: builtin/help.c:65 +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" +"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] " +"<fil>..." + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <sökvägslista>" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "typ" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "objekttyp" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "skriv objektet till objektdatabasen" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "läs objektet från standard in" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "spara filen som den är utan filer" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "hantera filen som om den kom från sökvägen" + +#: builtin/help.c:42 +msgid "print all available commands" +msgstr "visa alla tillgängliga kommandon" + +#: builtin/help.c:43 +msgid "show man page" +msgstr "visa manualsida" + +#: builtin/help.c:44 +msgid "show manual in web browser" +msgstr "visa manual i webbläsare" + +#: builtin/help.c:46 +msgid "show info page" +msgstr "visa info-sida" + +#: builtin/help.c:52 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "git help [--all] [--man|--web|--info] [kommando]" + +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: %s" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "exec misslyckades för \"%s\": %s" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -3207,7 +4975,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:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -3216,29 +4984,25 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "De mest använda git-kommandona är:" - -#: builtin/help.c:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:384 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:392 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" @@ -3289,6 +5053,11 @@ msgstr "kan inte öppna paketfilen \"%s\"" msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "paketversion %<PRIu32> stöds ej" + #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" @@ -3369,7 +5138,7 @@ msgstr "misslyckades tillämpa delta" #: builtin/index-pack.c:986 msgid "Receiving objects" -msgstr "Tar bort objekt" +msgstr "Tar emot objekt" #: builtin/index-pack.c:986 msgid "Indexing objects" @@ -3395,93 +5164,123 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()" msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1105 +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "kunde inte skapa tråd: %s" + +#: builtin/index-pack.c:1106 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "slutfördes med %d lokala objekt" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Oväntad svanschecksumma för %s (trasig disk?)" + +#: builtin/index-pack.c:1125 #, 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:1149 +#: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1228 +#: builtin/index-pack.c:1229 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1253 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1274 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1286 +#: builtin/index-pack.c:1287 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1297 +#: builtin/index-pack.c:1298 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "felaktig pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "felaktigt antal trådar angivet (%d)" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "trådstöd saknas, ignorerar %s" + +#: builtin/index-pack.c:1399 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1401 #, 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:1447 +#: builtin/index-pack.c:1448 #, 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:1454 +#: builtin/index-pack.c:1455 #, 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:1481 +#: builtin/index-pack.c:1482 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1558 +#: builtin/index-pack.c:1559 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -3601,6 +5400,26 @@ msgstr " delat" msgid "cannot tell cwd" msgstr "kan inte läsa aktuell katalog (cwd)" +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared" +"[=<behörigheter>]] [katalog]" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "behörigheter" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "ange att git-arkivet skall delas bland flera användare" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "var tyst" + #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" @@ -3629,104 +5448,396 @@ msgstr "Kan inte komma åt aktuell arbetskatalog" msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/log.c:189 +#: builtin/log.c:39 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n" + +#: builtin/log.c:40 +msgid " or: git show [options] <object>..." +msgstr " eller: git show [flaggor] <objekt>..." + +#: builtin/log.c:102 +msgid "suppress diff output" +msgstr "undertryck diff-utdata" + +#: builtin/log.c:103 +msgid "show source" +msgstr "visa källkod" + +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "Använd e-postmappningsfil" + +#: builtin/log.c:105 +msgid "decorate options" +msgstr "dekoreringsflaggor" + +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:518 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:608 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:682 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:693 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:707 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:715 +#: builtin/log.c:739 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:789 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:862 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:935 +#: builtin/log.c:913 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" + +#: builtin/log.c:958 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1157 +#: builtin/log.c:1097 +msgid "use [PATCH n/m] even with a single patch" +msgstr "använd [PATCH n/m] även för en ensam patch" + +#: builtin/log.c:1100 +msgid "use [PATCH] even with multiple patches" +msgstr "använd [PATCH] även för flera patchar" + +#: builtin/log.c:1104 +msgid "print patches to standard out" +msgstr "skriv patcharna på stnadard ut" + +#: builtin/log.c:1106 +msgid "generate a cover letter" +msgstr "generera ett följebrev" + +#: builtin/log.c:1108 +msgid "use simple number sequence for output file names" +msgstr "använd enkel nummersekvens för utdatafilnamn" + +#: builtin/log.c:1109 +msgid "sfx" +msgstr "sfx" + +#: builtin/log.c:1110 +msgid "use <sfx> instead of '.patch'" +msgstr "använd <sfx> istället för \".patch\"" + +#: builtin/log.c:1112 +msgid "start numbering patches at <n> instead of 1" +msgstr "börja numrera patchar på <n> istället för 1" + +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "markera serien som N:te försök" + +#: builtin/log.c:1116 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "Använd [<prefix>] istället för [PATCH]" + +#: builtin/log.c:1119 +msgid "store resulting files in <dir>" +msgstr "spara filerna i <katalog>" + +#: builtin/log.c:1122 +msgid "don't strip/add [PATCH]" +msgstr "ta inte bort eller lägg till [PATCH]" + +#: builtin/log.c:1125 +msgid "don't output binary diffs" +msgstr "skriv inte binära diffar" + +#: builtin/log.c:1127 +msgid "don't include a patch matching a commit upstream" +msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" + +#: builtin/log.c:1129 +msgid "show patch format instead of default (patch + stat)" +msgstr "visa patchformat istället för standard (patch + stat)" + +#: builtin/log.c:1131 +msgid "Messaging" +msgstr "E-post" + +#: builtin/log.c:1132 +msgid "header" +msgstr "huvud" + +#: builtin/log.c:1133 +msgid "add email header" +msgstr "lägg till e-posthuvud" + +#: builtin/log.c:1134 builtin/log.c:1136 +msgid "email" +msgstr "epost" + +#: builtin/log.c:1134 +msgid "add To: header" +msgstr "Lägg till mottagarhuvud (\"To:\")" + +#: builtin/log.c:1136 +msgid "add Cc: header" +msgstr "Lägg till kopiehuvud (\"Cc:\")" + +#: builtin/log.c:1138 +msgid "message-id" +msgstr "meddelande-id" + +#: builtin/log.c:1139 +msgid "make first mail a reply to <message-id>" +msgstr "Gör det första brevet ett svar till <meddelande-id>" + +#: builtin/log.c:1140 builtin/log.c:1143 +msgid "boundary" +msgstr "gräns" + +#: builtin/log.c:1141 +msgid "attach the patch" +msgstr "bifoga patchen" + +#: builtin/log.c:1144 +msgid "inline the patch" +msgstr "gör patchen ett inline-objekt" + +#: builtin/log.c:1148 +msgid "enable message threading, styles: shallow, deep" +msgstr "aktivera brevtrådning, typer: shallow, deep" + +#: builtin/log.c:1150 +msgid "signature" +msgstr "signatur" + +#: builtin/log.c:1151 +msgid "add a signature" +msgstr "lägg till signatur" + +#: builtin/log.c:1153 +msgid "don't print the patch filenames" +msgstr "visa inte filnamn för patchar" + +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "felaktig incheckarinformation %s" -#: builtin/log.c:1202 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1204 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1212 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1214 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1216 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1239 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1241 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1394 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1498 +#: builtin/log.c:1488 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" + +#: builtin/log.c:1543 #, 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:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" +#: builtin/ls-files.c:409 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [flaggor] [<fil>...]" + +#: builtin/ls-files.c:466 +msgid "identify the file status with tags" +msgstr "identifiera filstatus med taggar" + +#: builtin/ls-files.c:468 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "använd små bokstäver för \"anta oförändrade\"-filer" + +#: builtin/ls-files.c:470 +msgid "show cached files in the output (default)" +msgstr "visa cachade filer i utdata (standard)" + +#: builtin/ls-files.c:472 +msgid "show deleted files in the output" +msgstr "visa borttagna filer i utdata" + +#: builtin/ls-files.c:474 +msgid "show modified files in the output" +msgstr "visa modifierade filer i utdata" + +#: builtin/ls-files.c:476 +msgid "show other files in the output" +msgstr "visa andra filer i utdata" + +#: builtin/ls-files.c:478 +msgid "show ignored files in the output" +msgstr "visa ignorerade filer i utdata" + +#: builtin/ls-files.c:481 +msgid "show staged contents' object name in the output" +msgstr "visa köat innehålls objektnamn i utdata" + +#: builtin/ls-files.c:483 +msgid "show files on the filesystem that need to be removed" +msgstr "visa filer i filsystemet som behöver tas bort" + +#: builtin/ls-files.c:485 +msgid "show 'other' directories' name only" +msgstr "visa endast namn för \"andra\" kataloger" + +#: builtin/ls-files.c:488 +msgid "don't show empty directories" +msgstr "visa inte tomma kataloger" + +#: builtin/ls-files.c:491 +msgid "show unmerged files in the output" +msgstr "visa ej sammanslagna filer i utdata" + +#: builtin/ls-files.c:493 +msgid "show resolve-undo information" +msgstr "visa \"resolve-undo\"-information" + +#: builtin/ls-files.c:495 +msgid "skip files matching pattern" +msgstr "hoppa över filer som motsvarar mönster" + +#: builtin/ls-files.c:498 +msgid "exclude patterns are read from <file>" +msgstr "exkludera mönster som läses från <fil>" + +#: builtin/ls-files.c:501 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" + +#: builtin/ls-files.c:503 +msgid "add the standard git exclusions" +msgstr "lägg till git:s standardexkluderingar" + +#: builtin/ls-files.c:506 +msgid "make the output relative to the project top directory" +msgstr "gör utdata relativ till projektets toppkatalog" + +#: builtin/ls-files.c:509 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "om en <fil> inte är indexet, betrakta det som ett fel" + +#: builtin/ls-files.c:510 +msgid "tree-ish" +msgstr "träd-igt" + +#: builtin/ls-files.c:511 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" + +#: builtin/ls-files.c:513 +msgid "show debugging data" +msgstr "visa felsökningsutdata" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "visa endast träd" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "rekursera ner i underträd" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "visa träd medan rekursering" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "terminera poster med NUL-byte" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "inkludera objektstorlek" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "visa endast filnamn" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "använd fullständiga sökvägsnamn" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "git merge [flaggor] [<incheckning>...]" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" @@ -3746,6 +5857,67 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "visa inte en diffstat när sammanslagningen är färdig" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "visa en diffstat när sammanslagningen är färdig" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "(synonym till --stat)" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "" +"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "skapa en ensam incheckning istället för en sammanslagning" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "utför en incheckning om sammanslagningen lyckades (standard)" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "redigera meddelande innan incheckning" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "tillåt snabbspolning (standard)" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "avbryt om snabbspolning inte är möjlig" + +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 +msgid "strategy" +msgstr "strategi" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "sammanslagninsstrategi att använda" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "alternativ=värde" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "alternativ för vald sammanslagningsstrategi" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "avbryt den pågående sammanslagningen" + #: builtin/merge.c:240 msgid "could not run stash." msgstr "kunde köra stash." @@ -3799,98 +5971,95 @@ msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "misslyckads läsa cachen" - -#: builtin/merge.c:709 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:723 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:876 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:885 +#: builtin/merge.c:782 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:891 +#: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n" "är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n" "temagren.\n" "\n" -"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" +"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:915 +#: builtin/merge.c:812 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:927 +#: builtin/merge.c:824 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:992 +#: builtin/merge.c:889 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:1008 +#: builtin/merge.c:905 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:1049 +#: builtin/merge.c:946 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1051 +#: builtin/merge.c:948 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1053 +#: builtin/merge.c:950 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1058 +#: builtin/merge.c:955 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1042 builtin/merge.c:1199 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1213 +#: builtin/merge.c:1110 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1126 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3898,11 +6067,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1129 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1236 +#: builtin/merge.c:1133 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3910,84 +6079,183 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1239 +#: builtin/merge.c:1136 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1248 +#: builtin/merge.c:1145 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1253 +#: builtin/merge.c:1150 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kan inte kombinera --no-ff med --ff-only." -#: builtin/merge.c:1260 +#: builtin/merge.c:1157 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1292 +#: builtin/merge.c:1189 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." -#: builtin/merge.c:1295 +#: builtin/merge.c:1192 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1297 +#: builtin/merge.c:1194 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1412 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1457 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1516 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1584 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" -msgstr "Sammanslaning med strategin %s misslyckades.\n" +msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1492 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <incheckning>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <incheckning>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "skriv ut alla gemensamma anfäder" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "hitta anfader för enkel n-vägssammanslagning" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "visa revisioner som inte kan nås från andra" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "är den första anfader till den andra?" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" +"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "sänd resultat till standard ut" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "använd diff3-baserad sammanslagning" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "för konflikter, använd vår version" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "för konflikter, använd deras version" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "för konflikter, använd en förenad version" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "för konflikter, använd denna markörstorlek" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "varna inte om konflikter" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "sätt etiketter för fil1/origfil/fil2" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "indata är NUL-terminerad" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "tillåt saknade objekt" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "tillåt skapa mer än ett träd" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [flaggor] <källa>... <mål>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "tvinga flytta/ändra namn även om målet finns" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "hoppa över fel vid flytt/namnändring" + #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" @@ -4050,114 +6318,282 @@ msgstr "Byter namn på %s till %s\n" msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [flaggor] <incheckning>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [flaggor] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [flaggor] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "skriv endast namn (ingen SHA-1)" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "använd endast taggar för att namnge incheckningar" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "använd endast referenser som motsvarar <mönster>" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "lista alla incheckningar som kan nås alla referenser" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "läs från standard in" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "tillåt att skriva \"odefinierade\" namn" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <anteckningsref>] add [-f] [-m <medd> | -F <fil> | (-c | -" +"C) <objekt>] [<objekt>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "" +"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <anteckningsref>] append [-m <medd> | -F <fil> | (-c | -C) " +"<objekt>] [<objekt>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <anteckningsref>] edit [<objekt>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" +"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] " +"<anteckningsref>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <anteckningsref>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<objekt>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<flaggor>] [<objekt>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<flaggor>] [<objekt>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<objekt>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<objekt>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<flaggor>] <anteckningsref>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<flaggor>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<flaggor>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<objekt>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<flaggor>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" -msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" - -#: builtin/notes.c:155 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" -msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:158 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:189 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "Ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:215 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:217 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:275 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:299 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: builtin/notes.c:340 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: builtin/notes.c:350 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: builtin/notes.c:441 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:456 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:580 +#: builtin/notes.c:534 builtin/notes.c:691 +msgid "note contents as a string" +msgstr "anteckningsinnehåll som sträng" + +#: builtin/notes.c:537 builtin/notes.c:694 +msgid "note contents in a file" +msgstr "anteckningsinnehåll i en fil" + +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 +msgid "object" +msgstr "objekt" + +#: builtin/notes.c:540 builtin/notes.c:697 +msgid "reuse and edit specified note object" +msgstr "återanvänd och redigera angivet anteckningsobjekt" + +#: builtin/notes.c:543 builtin/notes.c:700 +msgid "reuse specified note object" +msgstr "återanvänd angivet anteckningsobjekt" + +#: builtin/notes.c:545 builtin/notes.c:613 +msgid "replace existing notes" +msgstr "ersätt befintliga anteckningar" + +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -4166,16 +6602,24 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:635 +#: builtin/notes.c:614 +msgid "read objects from stdin" +msgstr "läs objekt från standard in" + +#: builtin/notes.c:616 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" + +#: builtin/notes.c:634 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:656 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -4184,12 +6628,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:668 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:717 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -4198,41 +6642,255 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:971 +#: builtin/notes.c:863 +msgid "General options" +msgstr "Allmänna flaggor" + +#: builtin/notes.c:865 +msgid "Merge options" +msgstr "Flaggor för sammanslagning" + +#: builtin/notes.c:867 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" +"cat_sort_uniq)" + +#: builtin/notes.c:869 +msgid "Committing unmerged notes" +msgstr "Checkar in ej sammanslagna anteckningar" + +#: builtin/notes.c:871 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" +"färdigställ sammanslagning av anteckningar genom att checka in ej " +"sammanslagna anteckningar" + +#: builtin/notes.c:873 +msgid "Aborting notes merge resolution" +msgstr "Avbryt lösning av sammanslagning av anteckningar" + +#: builtin/notes.c:875 +msgid "abort notes merge" +msgstr "avbryt sammanslagning av anteckningar" + +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:982 +msgid "attempt to remove non-existent note is not an error" +msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" + +#: builtin/notes.c:985 +msgid "read object names from the standard input" +msgstr "läs objektnamn från standard in" + +#: builtin/notes.c:1066 +msgid "notes_ref" +msgstr "anteckningar-ref" + +#: builtin/notes.c:1067 +msgid "use notes from <notes_ref>" +msgstr "använd anteckningar från <anteckningsref>" + +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" + #: 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 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" +#: builtin/pack-objects.c:2447 +msgid "do not show progress meter" +msgstr "visa inte förloppsindikator" + +#: builtin/pack-objects.c:2449 +msgid "show progress meter" +msgstr "visa förloppsindikator" + +#: builtin/pack-objects.c:2451 +msgid "show progress meter during object writing phase" +msgstr "visa förloppsindikator under objektskrivningsfasen" + +#: builtin/pack-objects.c:2454 +msgid "similar to --all-progress when progress meter is shown" +msgstr "som --all-progress när förloppsmätaren visas" + +#: builtin/pack-objects.c:2455 +msgid "version[,offset]" +msgstr "version[,offset]" + +#: builtin/pack-objects.c:2456 +msgid "write the pack index file in the specified idx format version" +msgstr "skriv paketindexfilen i angiven indexformatversion" + +#: builtin/pack-objects.c:2459 +msgid "maximum size of each output pack file" +msgstr "maximal storlek på varje utdatapaketfil" + +#: builtin/pack-objects.c:2461 +msgid "ignore borrowed objects from alternate object store" +msgstr "ignorera lånade objekt från alternativa objektlager" + +#: builtin/pack-objects.c:2463 +msgid "ignore packed objects" +msgstr "ignorera packade objekt" + +#: builtin/pack-objects.c:2465 +msgid "limit pack window by objects" +msgstr "begränsa paketfönster efter objekt" + +#: builtin/pack-objects.c:2467 +msgid "limit pack window by memory in addition to object limit" +msgstr "begränsa paketfönster efter minne förutom objektgräns" + +#: builtin/pack-objects.c:2469 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "maximal längd på deltakedja tillåten i slutligt paket" + +#: builtin/pack-objects.c:2471 +msgid "reuse existing deltas" +msgstr "återanvänd befintliga delta" + +#: builtin/pack-objects.c:2473 +msgid "reuse existing objects" +msgstr "återanvänd befintliga objekt" + +#: builtin/pack-objects.c:2475 +msgid "use OFS_DELTA objects" +msgstr "använd OFS_DELTA-objekt" + +#: builtin/pack-objects.c:2477 +msgid "use threads when searching for best delta matches" +msgstr "använd trådar vid sökning efter bästa deltaträffar" + +#: builtin/pack-objects.c:2479 +msgid "do not create an empty pack output" +msgstr "försök inte skapa tom paketutdata" + +#: builtin/pack-objects.c:2481 +msgid "read revision arguments from standard input" +msgstr "läs revisionsargument från standard in" + +#: builtin/pack-objects.c:2483 +msgid "limit the objects to those that are not yet packed" +msgstr "begränsa objekt till de som ännu inte packats" + +#: builtin/pack-objects.c:2486 +msgid "include objects reachable from any reference" +msgstr "inkludera objekt som kan nås från någon referens" + +#: builtin/pack-objects.c:2489 +msgid "include objects referred by reflog entries" +msgstr "inkludera objekt som refereras från referensloggposter" + +#: builtin/pack-objects.c:2492 +msgid "output pack to stdout" +msgstr "skriv paket på standard ut" + +#: builtin/pack-objects.c:2494 +msgid "include tag objects that refer to objects to be packed" +msgstr "inkludera taggobjekt som refererar objekt som skall packas" + +#: builtin/pack-objects.c:2496 +msgid "keep unreachable objects" +msgstr "behåll onåbara objekt" + +#: builtin/pack-objects.c:2497 parse-options.h:141 +msgid "time" +msgstr "tid" + +#: builtin/pack-objects.c:2498 +msgid "unpack unreachable objects newer than <time>" +msgstr "packa upp onåbara objekt nyare än <tid>" + +#: builtin/pack-objects.c:2501 +msgid "create thin packs" +msgstr "skapa tunna paket" + +#: builtin/pack-objects.c:2503 +msgid "ignore packs that have companion .keep file" +msgstr "ignorera paket som har tillhörande .keep-fil" + +#: builtin/pack-objects.c:2505 +msgid "pack compression level" +msgstr "komprimeringsgrad för paket" + +#: builtin/pack-objects.c:2507 +msgid "do not hide commits by grafts" +msgstr "göm inte incheckningar med ympningar (\"grafts\")" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [flaggor]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "packa allt" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "ta bort lösa referenser (standard)" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "ta inte bort, bara visa" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "rapportera borttagna objekt" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "låt tid gå ut för objekt äldre än <tid>" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" + #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" @@ -4336,9 +6994,10 @@ msgid "" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -"push.default har inte ställts in; dess underförstådda värde ändras i\n" -"Git 2.0 från \"matching\" till \"simple\". För att undertrycka det här\n" -"meddelandet och behålla nuvarande beteende efter att förvalet ändras,\n" +"push.default har inte ställts in; dess underförstådda värde\n" +"ändras i Git 2.0 från \"matching\" till \"simple\". För att\n" +"undertrycka det här meddelandet och behålla nuvarande beteende\n" +"efter att förvalet ändras,\n" "skriver du:\n" "\n" " git config --global push.default matching\n" @@ -4397,22 +7056,51 @@ msgstr "" "\"git pull\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Uppdateringar avvisades då fjärren innehåller ändringar som du inte\n" +"har lokalt. Det beror oftast på att ett annat arkiv har sänt in samma\n" +"referenser. Det kan vara en idé att först slå ihop fjärrändringarna\n" +"(t.ex. \"git pull\") innan du sänder igen.\n" +"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"Du kan inte uppdatera en fjärr-referens som pekar på ett objekt som\n" +"inte är en incheckning, eller uppdatera en fjärr-referens så att den\n" +"pekar på något som inte är en incheckning, utan att använda flaggan\n" +"\"--force\".\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4433,34 +7121,238 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:410 +#: builtin/push.c:419 +msgid "repository" +msgstr "arkiv" + +#: builtin/push.c:420 +msgid "push all refs" +msgstr "sänd alla referenser" + +#: builtin/push.c:421 +msgid "mirror all refs" +msgstr "spegla alla referenser" + +#: builtin/push.c:423 +msgid "delete refs" +msgstr "ta bort referenser" + +#: builtin/push.c:424 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "sänd taggar (kan inte användas med --all eller --mirror)" + +#: builtin/push.c:427 +msgid "force updates" +msgstr "tvinga uppdateringar" + +#: builtin/push.c:428 +msgid "check" +msgstr "kontrollera" + +#: builtin/push.c:429 +msgid "control recursive pushing of submodules" +msgstr "styr rekursiv insändning av undermoduler" + +#: builtin/push.c:431 +msgid "use thin pack" +msgstr "använd tunna paket" + +#: builtin/push.c:432 builtin/push.c:433 +msgid "receive pack program" +msgstr "program för att ta emot paket" + +#: builtin/push.c:434 +msgid "set upstream for git pull/status" +msgstr "ställ in uppström för git pull/status" + +#: builtin/push.c:437 +msgid "prune locally removed refs" +msgstr "ta bort lokalt borttagna referenser" + +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "förbigå pre-push-krok" + +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" +#: builtin/read-tree.c:36 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "skriv resulterande index till <fil>" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "töm bara indexet" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "Sammanslagning" + +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "utför en sammanslagning i tillägg till en läsning" + +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs" + +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "3-vägssammanslagning när det finns tillägg och borttagningar" + +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "som -m, men kasta bort ej sammanslagna poster" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<underkatalog>/" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "läs in trädet i indexet under <underkatalog>/" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "tillåt explicit ignorerade filer att skrivas över" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "kontrollera inte arbetskatalogen efter sammanslagning" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "uppdatera inte indexet eller arbetskatalogen" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "hoppa över att applicera filter för gles utcheckning" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "felsök unpack-trees" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:12 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <namn> <url>" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <gammal> <ny>" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <namn>" + +#: builtin/remote.c:15 builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <namn> (-a | -d | <gren>)" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <namn>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <namn>" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <namn> <gren>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <namn> <nyurl>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <namn> <url>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<flaggor>] <namn> <url>" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <namn> <gren>..." + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <namn> <gren>..." + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<flaggor>] <namn>" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<flaggor>] <namn>" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." + #: builtin/remote.c:98 #, c-format msgid "Updating %s" @@ -4479,6 +7371,34 @@ msgstr "" msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "hämta fjärrgrenarna" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "importera alla taggar och associerade objekt vid hämtning" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "eller hämta inte några taggar alls (--no-tags)" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "gren(ar) att spåra" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "huvudgren" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "ställ in arkiv som spegel att sända eller ta emot från" + #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" @@ -4675,6 +7595,10 @@ msgstr " %-*s tvingar till %s" msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "fråga inte fjärrar" + #: builtin/remote.c:1118 #, c-format msgid "* remote %s" @@ -4733,6 +7657,14 @@ msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "ta bort refs/remotes/<namn>/HEAD" + #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" @@ -4786,15 +7718,35 @@ msgstr " * [skulle rensa] %s" msgid " * [pruned] %s" msgstr " * [rensad] %s" +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "rensa fjärrar efter hämtning" + #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "lägg till gren" + #: builtin/remote.c:1414 msgid "no remote specified" msgstr "ingen fjärr angavs" +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "manipulera URL:ar för sändning" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "lägg till URL" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "ta bort URL:ar" + #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" @@ -4813,6 +7765,56 @@ msgstr "Ingen sådan URL hittades: %s" msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "var pratsam; måste skrivas före ett underkommando" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <objekt> <ersättning>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <objekt>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<mönster>]" + +#: builtin/replace.c:121 +msgid "list replace refs" +msgstr "visa ersättningsreferenser" + +#: builtin/replace.c:122 +msgid "delete replace refs" +msgstr "ta bort ersättningsreferenser" + +#: builtin/replace.c:123 +msgid "replace the ref if it exists" +msgstr "ersätt referensen om den finns" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "registrera rena lösningar i indexet" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" + #: builtin/reset.c:33 msgid "mixed" msgstr "blandad" @@ -4833,88 +7835,227 @@ msgstr "sammanslagning" msgid "keep" msgstr "behåll" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "Kunde inte skriva ny indexfil." - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "Kunde inte läsa indexet" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "Oköade ändringar efter återställning:" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format 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:303 +#: builtin/reset.c:248 +msgid "be quiet, only report errors" +msgstr "var tyst, rapportera endast fel" + +#: builtin/reset.c:250 +msgid "reset HEAD and index" +msgstr "återställ HEAD och index" + +#: builtin/reset.c:251 +msgid "reset only HEAD" +msgstr "återställ endast HEAD" + +#: builtin/reset.c:253 builtin/reset.c:255 +msgid "reset HEAD, index and working tree" +msgstr "återställ HEAD, index och arbetskatalog" + +#: builtin/reset.c:257 +msgid "reset HEAD but keep local changes" +msgstr "återställ HEAD men behåll lokala ändringar" + +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Kunde inte slå upp \"%s\" som en giltig revision." + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:317 +#: builtin/reset.c:301 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:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, 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:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "Oköade ändringar efter återställning:" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "Kunde inte skriva ny indexfil." + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [options] -- [<argument>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "behåll \"--\" sänt som argument" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "sluta tolka efter första argument som inte är flagga" + +#: builtin/rev-parse.c:464 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [options] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" +"git rev-parse --parseopt [flaggor] -- [<argument>...]\n" +" eller: git rev-parse --sq-quote [<argument>...]\n" +" eller: git rev-parse [flaggor] [<argument>...]\n" +"\n" +"Kör \"git rev-parse --parseopt -h\" för mer information om den första " +"varianten." + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "git revert [flaggor] <incheckning-igt>" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <underkommando>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "git cherry-pick [flaggor] <incheckning-igt>" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <underkommando>" + #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kan inte användas med %s" -#: builtin/revert.c:131 +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "avsluta revert- eller cherry-pick-sekvens" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "återuppta revert- eller cherry-pick-sekvens" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "avbryt revert- eller cherry-pick-sekvens" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "checka inte in automatiskt" + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "redigera incheckningsmeddelandet" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "nummer på förälder" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "sammanslagninsstrategi" + +#: builtin/revert.c:113 +msgid "option" +msgstr "alternativ" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "alternativ för sammanslagningsstrategi" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "lägg till incheckningsnamn" + +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "tillåt snabbspolning" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "behåll incheckningar som börjar som tomma" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "tillåt incheckningar med tomt meddelande" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "behåll redundanta, tomma incheckningar" + +#: builtin/revert.c:133 msgid "program error" msgstr "programfel" -#: builtin/revert.c:221 +#: builtin/revert.c:223 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:236 +#: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" -#: builtin/rm.c:109 +#: builtin/rm.c:15 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [flaggor] [--] <fil>..." + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"undermodulen \"%s\" (eller en av dess undermoduler) använder en .git-" +"katalog\n" +"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -4923,7 +8064,7 @@ msgstr "" "\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -4932,7 +8073,7 @@ msgstr "" "\"%s\" har köade ändringar i indexet\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" @@ -4941,21 +8082,241 @@ msgstr "" "\"%s\" har lokala ändringar\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:194 +#: builtin/rm.c:207 +msgid "do not list removed files" +msgstr "lista inte borttagna filer" + +#: builtin/rm.c:208 +msgid "only remove from the index" +msgstr "ta bara bort från indexet" + +#: builtin/rm.c:209 +msgid "override the up-to-date check" +msgstr "överstyr àjour-testet" + +#: builtin/rm.c:210 +msgid "allow recursive removal" +msgstr "tillåt rekursiv borttagning" + +#: builtin/rm.c:212 +msgid "exit with a zero status even if nothing matched" +msgstr "avsluta med nollstatus även om inget träffades" + +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "" +"git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]" + +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "Författare saknas: %s" +#: builtin/shortlog.c:229 +msgid "sort output according to the number of commits per author" +msgstr "sortera utdata enligt antal incheckningar per författare" + +#: builtin/shortlog.c:231 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Undertryck beskrivningar, visa bara antal incheckningar" + +#: builtin/shortlog.c:233 +msgid "Show the email address of each author" +msgstr "Visa e-postadress för varje författare" + +#: builtin/shortlog.c:234 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:235 +msgid "Linewrap output" +msgstr "Radbryt utdata" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" +msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<när>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<mönster>)...]" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "visa fjärrspårande och lokala grenar" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "visa fjärrspårande grenar" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "färga \"*!+-\" enligt grenen" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "synonym till more=-1" + +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "undertyck namnsträngar" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "inkludera aktuell gren" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "namnge incheckningar med deras objektnamn" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "visa möjliga sammanslaningsbaser" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "visa referenser som inte kan nås från någon annan referens" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "visa incheckningar i topologisk ordning" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "visa endast incheckningar inte på den första grenen" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "visa sammanslagningar som endast kan nås från en spets" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "visa incheckningar där ingen förälder kommer före dess barn" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "<n>[,<bas>]" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "visa <n> nyaste refloggposter med början på bas" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] " + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=mönster] < reflista" + +#: builtin/show-ref.c:165 +msgid "only show tags (can be combined with heads)" +msgstr "visa endast taggar (kan kombineras med huvuden)" + +#: builtin/show-ref.c:166 +msgid "only show heads (can be combined with tags)" +msgstr "visa endast huvuden (kan kombineras med taggar)" + +#: builtin/show-ref.c:167 +msgid "stricter reference checking, requires exact ref path" +msgstr "striktare referenskontroll, kräver exakt referenssökväg" + +#: builtin/show-ref.c:170 builtin/show-ref.c:172 +msgid "show the HEAD reference" +msgstr "visa HEAD-referensen" + +#: builtin/show-ref.c:174 +msgid "dereference tags into object IDs" +msgstr "avreferera taggar till objekt-id" + +#: builtin/show-ref.c:176 +msgid "only show SHA1 hash using <n> digits" +msgstr "visa SHA1-hash endast med <n> siffror" + +#: builtin/show-ref.c:180 +msgid "do not print results to stdout (useful with --verify)" +msgstr "visa inte resultat på standard ut (användbart med --verify)" + +#: builtin/show-ref.c:182 +msgid "show refs from stdin that aren't in local repository" +msgstr "visa referenser från standard in som inte finns i lokalt arkiv" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "git symbolic-ref [flaggor] namn [ref]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "git symbolic-ref -d [-q] namn" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" +"undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "ta bort symbolisk referens" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "förkorta ref-utdata" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason" +msgstr "skäl" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "skäl till uppdateringen" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "" +"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <taggnamn>..." + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" +"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>] \n" +"\t\t[<mönster>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <taggnamn>..." + #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" @@ -4982,153 +8343,358 @@ msgid "could not verify the tag '%s'" msgstr "kunde inte bekräfta taggen \"%s\"" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# Skriv ett taggmeddelande\n" -"# Rader som inleds med \"#\" ignoreras.\n" -"#\n" +"Skriv ett taggmeddelande\n" +"Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# Skriv ett taggmeddelande\n" -"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n" -"# du vill.\n" -"#\n" +"Skriv ett taggmeddelande\n" +"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" +"du vill.\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "flaggan \"points-at\" behöver ett object" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: builtin/tag.c:506 +#: builtin/tag.c:445 +msgid "list tag names" +msgstr "lista taggnamn" + +#: builtin/tag.c:447 +msgid "print <n> lines of each tag message" +msgstr "visa <n> rader från varje taggmeddelande" + +#: builtin/tag.c:449 +msgid "delete tags" +msgstr "ta bort taggar" + +#: builtin/tag.c:450 +msgid "verify tags" +msgstr "verifiera taggar" + +#: builtin/tag.c:452 +msgid "Tag creation options" +msgstr "Alternativ för att skapa taggar" + +#: builtin/tag.c:454 +msgid "annotated tag, needs a message" +msgstr "annoterad tagg, behöver meddelande" + +#: builtin/tag.c:456 +msgid "tag message" +msgstr "taggmeddelande" + +#: builtin/tag.c:458 +msgid "annotated and GPG-signed tag" +msgstr "annoterad och GPG-signerad tagg" + +#: builtin/tag.c:462 +msgid "use another key to sign the tag" +msgstr "använd annan nyckel för att signera taggen" + +#: builtin/tag.c:463 +msgid "replace the tag if exists" +msgstr "ersätt taggen om den finns" + +#: builtin/tag.c:464 +msgid "show tag list in columns" +msgstr "lista taggar i spalter" + +#: builtin/tag.c:466 +msgid "Tag listing options" +msgstr "Alternativ för listning av taggar" + +#: builtin/tag.c:469 +msgid "print only tags that contain the commit" +msgstr "visa endast taggar som innehåller incheckningen" + +#: builtin/tag.c:475 +msgid "print only tags of the object" +msgstr "visa endast taggar för objektet" + +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kan inte låsa referensen" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kan inte uppdatera referensen" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." -msgstr "" -"Se \"git help <kommando>\" för mer information om ett specifikt kommando." +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [flaggor] [--] [<fil>...]" -#: parse-options.h:133 parse-options.h:235 -msgid "n" -msgstr "n" +#: builtin/update-index.c:718 +msgid "continue refresh even when index needs update" +msgstr "fortsätt uppdatera även när index inte är àjour" -#: parse-options.h:141 -msgid "time" -msgstr "tid" +#: builtin/update-index.c:721 +msgid "refresh: ignore submodules" +msgstr "refresh: ignorera undermoduler" -# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e. -#: parse-options.h:149 -msgid "file" -msgstr "fil" +#: builtin/update-index.c:724 +msgid "do not ignore new files" +msgstr "ignorera inte nya filer" -#: parse-options.h:151 -msgid "when" -msgstr "när" +#: builtin/update-index.c:726 +msgid "let files replace directories and vice-versa" +msgstr "låt filer ersätta kataloger och omvänt" + +#: builtin/update-index.c:728 +msgid "notice files missing from worktree" +msgstr "lägg märke till filer som saknas i arbetskatalogen" + +#: builtin/update-index.c:730 +msgid "refresh even if index contains unmerged entries" +msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" + +#: builtin/update-index.c:733 +msgid "refresh stat information" +msgstr "uppdatera statusinformation" + +#: builtin/update-index.c:737 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "som --refresh, men ignorera assume-unchanged-inställning" + +#: builtin/update-index.c:741 +msgid "<mode> <object> <path>" +msgstr "<läge> <objekt> <sökväg>" + +#: builtin/update-index.c:742 +msgid "add the specified entry to the index" +msgstr "lägg till angiven post i indexet" + +#: builtin/update-index.c:746 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:747 +msgid "override the executable bit of the listed files" +msgstr "överstyr exekveringsbiten för angivna filer" + +#: builtin/update-index.c:751 +msgid "mark files as \"not changing\"" +msgstr "markera filer som \"ändras inte\"" + +#: builtin/update-index.c:754 +msgid "clear assumed-unchanged bit" +msgstr "rensa \"assume-unchanged\"-biten" + +#: builtin/update-index.c:757 +msgid "mark files as \"index-only\"" +msgstr "markera filer som \"endast index\"" + +#: builtin/update-index.c:760 +msgid "clear skip-worktree bit" +msgstr "töm \"skip-worktree\"-biten" + +#: builtin/update-index.c:763 +msgid "add to index only; do not add content to object database" +msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" + +#: builtin/update-index.c:765 +msgid "remove named paths even if present in worktree" +msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" + +#: builtin/update-index.c:767 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "med --stdin: indatarader termineras med null-byte" + +#: builtin/update-index.c:769 +msgid "read list of paths to be updated from standard input" +msgstr "läs lista över sökvägar att uppdatera från standard in" + +#: builtin/update-index.c:773 +msgid "add entries from standard input to the index" +msgstr "lägg poster från från standard in till indexet" + +#: builtin/update-index.c:777 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "återfyll etapp 2 och 3 från angivna sökvägar" + +#: builtin/update-index.c:781 +msgid "only update entries that differ from HEAD" +msgstr "uppdatera endast poster som skiljer sig från HEAD" + +#: builtin/update-index.c:785 +msgid "ignore files missing from worktree" +msgstr "ignorera filer som saknas i arbetskatalogen" + +#: builtin/update-index.c:788 +msgid "report actions to standard output" +msgstr "raportera åtgärder på standard ut" + +#: builtin/update-index.c:790 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(för porslin) glöm sparade olösta konflikter" + +#: builtin/update-index.c:794 +msgid "write index in this format" +msgstr "skriv index i detta format" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "ta bort referensen" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "uppdatera <refnamn> inte det den pekar på" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "uppdatera informationsfilerna från grunden" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..." + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "pratsam" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "visa endast statistik" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <tagg>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "visa innehåll för tag" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<prefix>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "visa trädobjekt för underkatalogen <prefix>" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "endast användbart vid felsökning" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Se \"git help <kommando>\" för mer information om ett specifikt kommando." #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" @@ -5169,8 +8735,8 @@ msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mönster" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" -msgstr "Skapa tomt git-arkiv eller ominitiera ett befintligt" +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" #: common-cmds.h:18 msgid "Show commit logs" @@ -5372,6 +8938,15 @@ msgstr "Inga ändringar -- Patchen har redan tillämpats." msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"En kopia av patchen som misslyckades finns i:\n" +" $dotest/patch" + #: git-am.sh:876 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" @@ -5556,7 +9131,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -5567,15 +9142,15 @@ msgstr "" "Varning: snabbspolar din arbetskatalog från\n" "Varning: incheckningen $orig_head." -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: git-pull.sh:257 +#: git-pull.sh:258 msgid "Cannot rebase onto multiple branches" msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" -#: git-rebase.sh:52 +#: git-rebase.sh:53 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" @@ -5586,27 +9161,31 @@ msgstr "" "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 +#: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:164 +#: git-rebase.sh:165 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 +#: git-rebase.sh:296 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 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:316 +#: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -5614,12 +9193,12 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:334 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -5640,57 +9219,57 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, 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 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:454 +#: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:474 +#: git-rebase.sh:483 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:495 +#: git-rebase.sh:504 #, 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 +#: git-rebase.sh:515 #, 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 +#: git-rebase.sh:524 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 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -5802,60 +9381,60 @@ msgstr "Kunde inte spara indexträd" msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:474 +#: git-stash.sh:475 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:491 +#: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:492 +#: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:499 +#: git-stash.sh:500 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:570 +#: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:88 +#: git-submodule.sh:90 #, 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:167 +#: git-submodule.sh:195 #, 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:211 +#: git-submodule.sh:238 #, 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:223 +#: git-submodule.sh:250 #, 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:312 +#: git-submodule.sh:343 #, 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:329 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:333 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5866,64 +9445,98 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:344 +#: git-submodule.sh:382 #, 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:346 +#: git-submodule.sh:384 #, 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:360 +#: git-submodule.sh:392 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" + +#: git-submodule.sh:394 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "" +"För att återanvända den lokala git-katalogen istället för att på nytt klona " +"från" + +#: git-submodule.sh:396 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" +"använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv" + +#: git-submodule.sh:397 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" +"eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name" +"\"." + +#: git-submodule.sh:399 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." + +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:365 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:370 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:413 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Går in i \"$prefix$sm_path\"" -#: git-submodule.sh:427 +#: git-submodule.sh:482 #, 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:471 +#: git-submodule.sh:526 #, 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:480 +#: git-submodule.sh:535 #, 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:482 +#: git-submodule.sh:537 #, 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:490 +#: git-submodule.sh:545 #, 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:590 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5932,92 +9545,166 @@ msgstr "" "Undermodulen \"$sm_path\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:603 +#: git-submodule.sh:662 #, 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:622 +#: git-submodule.sh:671 git-submodule.sh:695 #, 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:636 +#: git-submodule.sh:709 #, 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:637 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:642 +#: git-submodule.sh:715 #, 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:643 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:648 +#: git-submodule.sh:721 #, 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:649 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\"" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:779 +#: git-submodule.sh:852 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:819 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:837 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Varning: $name innehåller inte incheckning $sha1_src" -#: git-submodule.sh:840 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Varning: $name innehåller inte incheckning $sha1_dst" -#: git-submodule.sh:843 +#: git-submodule.sh:916 #, 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:868 +#: git-submodule.sh:941 msgid "blob" msgstr "blob" -#: git-submodule.sh:906 -msgid "# Submodules changed but not updated:" -msgstr "# Undermoduler ändrade men inte uppdaterade:" +#: git-submodule.sh:979 +msgid "Submodules changed but not updated:" +msgstr "Undermoduler ändrade men inte uppdaterade:" -#: git-submodule.sh:908 -msgid "# Submodule changes to be committed:" -msgstr "# Undermodulers ändringar att checka in:" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" +msgstr "Undermodulers ändringar att checka in:" -#: git-submodule.sh:1054 +#: git-submodule.sh:1129 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "Synkroniserar undermodul-url för \"$name\"" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\"" + +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "Du har ingen giltig HEAD" + +#~ msgid "oops" +#~ msgstr "hoppsan" + +#~ msgid "Would not remove %s\n" +#~ msgstr "Skulle inte ta bort %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "Tar inte bort %s\n" + +#~ msgid "Could not read index" +#~ msgstr "Kunde inte läsa indexet" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <namn> (-a | -d | <gren>])" + +#~ msgid " 0 files changed" +#~ msgstr " 0 filer ändrade" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d fil ändrad" +#~ msgstr[1] " %d filer ändrade" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] ", %d tillägg(+)" +#~ msgstr[1] ", %d tillägg(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] ", %d borttagning(-)" +#~ msgstr[1] ", %d borttagningar(-)" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "Packar arkivet automatiskt för optimal prestanda.\n" + +#~ msgid " (use \"git add\" to track)" +#~ msgstr " (spåra med \"git add\")" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "-B kan inte användas med -b" + +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch är inkompatibel med alla andra flaggor" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detcah kan inte användas med -b/-B/--orphan" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach kan inte användas med -t" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "--orphan och -b|-B kan inte användas samtidigt" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan kan inte användas med -t" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout: -f och -m är inkompatibla" + +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "" +#~ "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." #~ msgid "diff setup failed" #~ msgstr "misslyckades sätta upp för diff" @@ -6049,9 +9736,6 @@ msgstr "Synkroniserar undermodul-url för \"$name\"" #~ msgid "--" #~ msgstr "--" -#~ msgid "Too many options specified" -#~ msgstr "För många flaggor angavs" - #~ msgid "# Changed but not updated:" #~ msgstr "# Ändrade men inte uppdaterade:" @@ -6076,26 +9760,17 @@ msgstr "Synkroniserar undermodul-url för \"$name\"" #~ msgid "cannot mix --fixed-strings and regexp" #~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck" -#~ msgid "invalid --decorate option: %s" -#~ msgstr "felaktigt värde till --decorate: %s" - #~ msgid "%s; will overwrite!" #~ msgstr "%s; kommer skriva över!" #~ msgid "Failed to write current notes tree to database" #~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" -#~ msgid "Failed to commit notes tree to database" -#~ msgstr "Kunde inte checka in anteckningsträd i databasen" - # FIXME: Untranslatable! # #~ msgid "Refusing to %s notes in %s (outside of refs/notes/)" #~ msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" -#~ msgid "list" -#~ msgstr "list" - #~ msgid "add" #~ msgstr "add" @@ -1,26 +1,27 @@ # Vietnamese translation for GIT-CORE. -# Copyright (C) 2012, Trần Ngọc Quân. +# Copyright (C) 2012-2013 Trần Ngọc Quân. # This file is distributed under the same license as the git-core package. -# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012. +# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013. # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: git-1.7.12-146-g16d26\n" +"Project-Id-Version: git-v1.8.2-rc0-16-g20a59\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-09-05 06:20+0800\n" -"PO-Revision-Date: 2012-09-08 08:00+0700\n" +"POT-Creation-Date: 2013-02-19 13:32+0800\n" +"PO-Revision-Date: 2013-02-20 07:14+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Team-Website: <http://translationproject.org/team/vi.html>\n" "Plural-Forms: nplurals=2; plural=1;\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "gợi ý: %.*s\n" @@ -29,7 +30,7 @@ msgstr "gợi ý: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -37,34 +38,129 @@ msgid "" "or use 'git commit -a'." msgstr "" "Sửa chúng trong cây làm việc,\n" -"và sau đó dùng lệnh 'git add/rm <tập-tin>'\n" -"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao,\n" -"hoặc là dùng lệnh 'git commit -a'." +"và sau đó dùng lệnh “git add/rm <tập-tin>” dành riêng\n" +"cho việc đánh dấu tập tin cần giải quyết và tạo lần chuyển giao,\n" +"hoặc là dùng lệnh “git commit -a”." + +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [các-tùy-chọn] <tree-ish> [<đường-dẫn>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <kho> [--exec <lệnh>] [các-tùy-chọn] <tree-ish> [<đường-" +"dẫn>...]" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <kho> [--exec <lệnh>] --list" + +#: archive.c:323 +msgid "fmt" +msgstr "fmt" + +#: archive.c:323 +msgid "archive format" +msgstr "định dạng lưu trữ" + +#: archive.c:324 builtin/log.c:1115 +msgid "prefix" +msgstr "tiền tố" + +#: archive.c:325 +msgid "prepend prefix to each pathname in the archive" +msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" + +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "tập-tin" + +#: archive.c:327 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "ghi kho lưu vào tập tin này" + +#: archive.c:329 +msgid "read .gitattributes in working directory" +msgstr "đọc .gitattributes trong thư mục làm việc" + +#: archive.c:330 +msgid "report archived files on stderr" +msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi chuẩn)" + +#: archive.c:331 +msgid "store only" +msgstr "chỉ lưu (không nén)" + +#: archive.c:332 +msgid "compress faster" +msgstr "nén nhanh hơn" + +#: archive.c:340 +msgid "compress better" +msgstr "nén nhỏ hơn" + +#: archive.c:343 +msgid "list supported archive formats" +msgstr "liệt kê các kiểu nén được hỗ trợ" + +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "kho" + +#: archive.c:346 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "nhận kho lưu từ kho chứa <kho> trên máy chủ" + +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 +msgid "command" +msgstr "lệnh" + +#: archive.c:348 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" + +#: attr.c:259 +msgid "" +"Negative patterns are forbidden in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"Các mẫu dạng phủ định bị cấm dùng trong các thuộc tính của git\n" +"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than." #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' không giống như tập tin v2 bundle (cụm)" +msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump của git)" #: bundle.c:63 #, c-format 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:699 +#: bundle.c:89 builtin/commit.c:674 #, c-format msgid "could not open '%s'" -msgstr "không thể mở '%s'" +msgstr "không thể mở “%s”" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" -msgstr "Khó chứa thiếu những lần chuyển giao (commit) cần trước hết này:" +msgstr "Kho chứa thiếu những lần chuyển giao (commit) cần trước hết này:" -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" -msgstr "Cài đặt việc di chuyển qua các điểm xét lại gặp lỗi" +msgstr "cài đặt việc di chuyển qua các điểm xét lại gặp lỗi" #: bundle.c:186 #, c-format @@ -86,9 +182,9 @@ msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này" #: bundle.c:294 msgid "rev-list died" -msgstr "rev-list bị chết" +msgstr "rev-list đã chết" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" @@ -96,7 +192,7 @@ msgstr "đối số không được thừa nhận: %s" #: 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" +msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list" #: bundle.c:380 msgid "Refusing to create empty bundle." @@ -113,29 +209,29 @@ msgstr "pack-objects đã chết" #: bundle.c:419 #, c-format msgid "cannot create '%s'" -msgstr "không thể tạo '%s'" +msgstr "không thể tạo “%s”" #: bundle.c:441 msgid "index-pack died" msgstr "index-pack đã chết" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "không thể phân tích %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s không phải là một lần commit!" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" -msgstr "cạn bộ nhớ" +msgstr "hết bộ nhớ" #: connected.c:39 msgid "Could not run 'git rev-list'" -msgstr "Không thể chạy 'git rev-list'" +msgstr "Không thể chạy “git rev-list”" #: connected.c:48 #, c-format @@ -214,51 +310,31 @@ msgid_plural "%lu years ago" msgstr[0] "%lu năm trước" msgstr[1] "%lu năm trước" -#: diff.c:105 +#: diff.c:112 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n" -#: diff.c:110 +#: diff.c:117 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " Không hiểu đối số dirstat '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " Không hiểu đối số dirstat “%s”\n" #: diff.c:210 #, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”" + +#: diff.c:260 +#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -"Tìm thấy các lỗi trong biến cấu hình 'diff.dirstat':\n" +"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:1401 -msgid " 0 files changed" -msgstr " 0 có tập tin nào thay đổi cả" - -#: diff.c:1405 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d tập tin thay đổi" -msgstr[1] " %d tập tin thay đổi" - -#: diff.c:1422 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] ", %d thêm(+)" -msgstr[1] ", %d thêm(+)" - -#: diff.c:1433 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] ", %d xóa(-)" -msgstr[1] ", %d xóa(-)" - -#: diff.c:3460 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -267,75 +343,94 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: gpg-interface.c:59 +#: diff.c:3482 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" + +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "không thể chạy gpg." #: gpg-interface.c:71 msgid "gpg did not accept the data" -msgstr "gpg đã không đồng ý dữ liệu" +msgstr "gpg đã không chấp nhận dữ liệu" #: gpg-interface.c:82 msgid "gpg failed to sign the data" msgstr "gpg gặp lỗi khi ký dữ liệu" -#: grep.c:1320 +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "không thể tạo tập tin tạm thời “%s”: %s" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”: %s" + +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" -msgstr "'%s': không thể đọc %s" +msgstr "“%s”: không thể đọc %s" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" -msgstr "'%s': %s" +msgstr "“%s”: %s" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" -msgstr "'%s': đọc ngắn %s" +msgstr "“%s”: đọc ngắn %s" #: 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'" +msgstr "các lệnh git sẵn sàng để dùng trong “%s”" #: 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:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "Những lệnh git hay được sử dụng nhất là:" + +#: help.c:292 #, 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 "" -"'%s' trông như là một lệnh git, nhưng chúng tôi không\n" +"“%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:332 +#: help.c:349 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:354 +#: help.c:371 #, 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 "" -"CẢNH BÁO: Bạn đã gọi lệnh Git có tên '%s', mà nó lại không có sẵn.\n" -"Giả định rằng ý bạn là '%s'" +"CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n" +"Giả định rằng ý bạn là “%s”" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "trong %0.1f giây một cách tự động..." -#: help.c:366 +#: help.c:383 #, 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 'git --help'." +msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”." -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -349,6 +444,15 @@ msgstr[1] "" "\n" "Có phải ý bạn là một trong số những cái này không?" +#: merge.c:56 +msgid "failed to read the cache" +msgstr "gặp lỗi khi đọc bộ nhớ tạm" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +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" + #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" @@ -357,7 +461,7 @@ 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'" +msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”" #: merge-recursive.c:268 msgid "error building trees" @@ -366,7 +470,7 @@ msgstr "gặp lỗi khi xây dựng cây" #: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" -msgstr "gặp lỗi khi tạo đường dẫn '%s'%s" +msgstr "gặp lỗi khi tạo đường dẫn “%s”%s" #: merge-recursive.c:683 #, c-format @@ -382,47 +486,47 @@ msgstr ": có lẽ là một xung đột D/F?" #: merge-recursive.c:708 #, 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'" +msgstr "từ chối đóng tập tin không được theo vết tại “%s”" #: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" -msgstr "không thể đọc đối tượng %s '%s'" +msgstr "không thể đọc đối tượng %s “%s”" #: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" -msgstr "đối tượng blob được mong đợi cho %s '%s'" +msgstr "đối tượng blob được mong đợi cho %s “%s”" #: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" -msgstr "gặp lỗi khi mở '%s'" +msgstr "gặp lỗi khi mở “%s”" #: merge-recursive.c:781 #, 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'" +msgstr "gặp lỗi khi tạo liên kết tượng trưng (symlink) “%s”" #: merge-recursive.c:784 #, 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'" +msgstr "không hiểu phải làm gì với %06o %s “%s”" -#: merge-recursive.c:921 +#: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-recursive.c:925 +#: merge-recursive.c:926 #, 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:941 +#: merge-recursive.c:942 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:1020 merge-recursive.c:1034 +#: merge-recursive.c:1021 merge-recursive.c:1035 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -431,7 +535,7 @@ 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:1026 merge-recursive.c:1039 +#: merge-recursive.c:1027 merge-recursive.c:1040 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -440,20 +544,20 @@ 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:1080 +#: merge-recursive.c:1081 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1080 +#: merge-recursive.c:1081 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1136 +#: merge-recursive.c:1137 #, 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:1158 +#: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -462,190 +566,212 @@ 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:1163 +#: merge-recursive.c:1164 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1217 +#: merge-recursive.c:1218 #, 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:1247 +#: merge-recursive.c:1248 #, 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:1446 +#: merge-recursive.c:1447 #, 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:1456 +#: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "Thêm hòa trộn %s" -#: merge-recursive.c:1461 merge-recursive.c:1659 +#: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:1512 +#: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-recursive.c:1515 +#: merge-recursive.c:1516 #, 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:1563 +#: merge-recursive.c:1564 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modified" -msgstr "đã bị sửa" +msgstr "đã sửa" -#: merge-recursive.c:1573 +#: merge-recursive.c:1574 msgid "content" msgstr "nội dung" -#: merge-recursive.c:1580 +#: merge-recursive.c:1581 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:1614 +#: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" -#: merge-recursive.c:1628 +#: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1632 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" -msgstr "mô-đun con" +msgstr "mô-đun-con" -#: merge-recursive.c:1633 +#: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-recursive.c:1723 +#: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:1748 +#: merge-recursive.c:1749 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:1754 +#: merge-recursive.c:1755 msgid "directory/file" msgstr "thư-mục/tập tin" -#: merge-recursive.c:1759 +#: merge-recursive.c:1760 #, 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:1769 +#: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:1786 +#: merge-recursive.c:1787 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:1805 +#: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:1814 +#: merge-recursive.c:1815 #, 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:1844 +#: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "Đường dẫn chưa được xử lý??? %s" -#: merge-recursive.c:1889 +#: merge-recursive.c:1890 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:1902 +#: merge-recursive.c:1903 #, 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:1939 +#: merge-recursive.c:1940 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:1996 +#: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" -msgstr "Không thể phân tích đối tượng '%s'" +msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:2008 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-SỐ" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "“%s” nằm ngoài một liên kết tượng trưng" + +#: remote.c:1653 #, 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" +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:1659 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n" -#: remote.c:1638 +#: remote.c:1662 #, 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ể " +"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ể " +"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:1646 +#: remote.c:1670 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n" + +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -654,110 +780,112 @@ msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" -"Nhánh của bạn và '%s' bị phân kỳ,\n" +"Nhánh của bạn và “%s” bị phân kỳ,\n" "và có %d và %d lần chuyển giao (commit) khác nhau cho từng cái,\n" "tương ứng với mỗi lần.\n" msgstr[1] "" -"Your branch and '%s' have diverged,\n" +"Your branch and “%s” have diverged,\n" "and have %d and %d different commit each, respectively.\n" -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +#: remote.c:1683 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr "" +" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " +"bạn)\n" + +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 +#: builtin/merge.c:994 #, c-format msgid "Could not open '%s' for writing" -msgstr "Không thể mở %s' để ghi" +msgstr "Không thể mở “%s” để ghi" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 +#: builtin/merge.c:999 #, c-format msgid "Could not write to '%s'" -msgstr "Không thể ghi vào '%s'" +msgstr "Không thể ghi vào “%s”" -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" -"với lệnh 'git add <đường_dẫn>' hoặc 'git rm <đường_dẫn>'" +"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”" -#: sequencer.c:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" -"với lệnh 'git add <đường_dẫn>' hoặc 'git rm <đường_dẫn>'\n" -"và chuyển giao (commit) kết quả bằng lệnh 'git commit'" +"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n" +"và chuyển giao (commit) kết quả bằng lệnh “git commit”" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi vào %s" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "Lỗi bao bọc %s" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick." -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh revert." -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." msgstr "Chuyển giao (commit) các thay đổi của bạn hay stash chúng để xử lý." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:261 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n" -#: sequencer.c:282 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "Không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:324 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" -#: sequencer.c:329 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Không thể phân tích commit (lần chuyển giao) cha mẹ %s\n" -#: sequencer.c:395 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "Tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:398 -msgid "You do not have a valid HEAD" -msgstr "Bạn không có HEAD nào hợp lệ" - -#: sequencer.c:413 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" "Lần chuyển giao (commit) %s là một lần hòa trộn nhưng không đưa ra tùy chọn -" "m." -#: sequencer.c:421 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "Lần chuyển giao (commit) %s không có cha mẹ %d" -#: sequencer.c:425 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -766,143 +894,143 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:436 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:440 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "Không thể lấy thông điệp lần chuyển giao (commit) cho %s" -#: sequencer.c:524 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "không thể revert %s... %s" -#: sequencer.c:525 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "không thể apply (áp dụng miếng vá) %s... %s" -#: sequencer.c:553 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "lần chuyển giao (commit) trống rỗng đặt là hợp quy cách" -#: sequencer.c:561 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:566 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:624 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "Không thể %s trong khi %s" -#: sequencer.c:646 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "Không phân tích được dòng %d." -#: sequencer.c:651 +#: sequencer.c:667 msgid "No commits parsed." msgstr "Không có lần chuyển giao (commit) nào được phân tích." -#: sequencer.c:664 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "Không thể mở %s" -#: sequencer.c:668 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "Không thể đọc %s." -#: sequencer.c:675 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:703 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "Khóa không đúng: %s" -#: sequencer.c:706 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "Giá trị không hợp lệ %s: %s" -#: sequencer.c:718 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "Bảng tùy chọn dị hình: %s" -#: sequencer.c:739 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "một thao tác cherry-pick hoặc revert đang được thực hiện" -#: sequencer.c:740 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:744 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "Không thể tạo thư mục xếp dãy %s" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "Lỗi bao bọc %s." -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay revert trong tiến trình" -#: sequencer.c:781 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:783 +#: sequencer.c:799 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:3987 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" -#: sequencer.c:808 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: sequencer.c:809 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "kết thúc tập tin đột xuất" -#: sequencer.c:815 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "tập tin HEAD 'pre-cherry-pick' đã lưu '%s' bị hỏng" +msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:838 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "Không thể định dạng %s." -#: sequencer.c:1000 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "Không thể revert một lần chuyển giao (commit) khởi tạo" -#: sequencer.c:1001 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" @@ -913,26 +1041,36 @@ msgstr "HEAD không chỉ đến một nhánh nào cả" #: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" -msgstr "Không có nhánh nào như thế: '%s'" +msgstr "Không có nhánh nào như thế: “%s”" #: 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'" +msgstr "Không có thượng nguồn (upstream) được cấu hình cho nhánh “%s”" #: 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'" +"Nhánh thượng nguồn (upstream) “%s” không được lưu lại như là một nhánh " +"“remote-tracking”" + +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "không thể truy cập “%s”: %s" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "không thể truy cập “%s”" -#: wrapper.c:413 +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s" -#: wrapper.c:414 +#: wrapper.c:435 msgid "no such user" msgstr "không có người dùng như vậy" @@ -956,8 +1094,8 @@ msgstr " (dùng \"git add <tập-tin>...\" để đánh dấu là cần giải #: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -" (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)" +" (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:177 msgid " (use \"git rm <file>...\" to mark resolution)" @@ -981,8 +1119,7 @@ msgstr "" #: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -" (dùng \"git add/rm <tập-tin>...\" để cập nhật những gì sẽ được chuyển " -"giao)" +" (dùng \"git add/rm <tập-tin>...\" để cập nhật những gì sẽ được chuyển giao)" #: wt-status.c:213 msgid "" @@ -997,11 +1134,6 @@ 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:224 -#, c-format -msgid "%s files:" -msgstr "%s tập tin:" - #: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" @@ -1019,7 +1151,7 @@ msgstr "bị xóa bởi cả hai:" #: wt-status.c:250 msgid "added by us:" -msgstr "được thêm vào bởi chúng tôi:" +msgstr "được thêm vào bởi chúng ta:" #: wt-status.c:251 msgid "deleted by them:" @@ -1031,7 +1163,7 @@ msgstr "được thêm vào bởi họ:" #: wt-status.c:253 msgid "deleted by us:" -msgstr "bị xóa bởi chúng tôi:" +msgstr "bị xóa bởi chúng ta:" #: wt-status.c:254 msgid "both added:" @@ -1047,7 +1179,7 @@ msgstr "lần chuyển giao (commit) mới, " #: wt-status.c:287 msgid "modified content, " -msgstr "nội dung được sửa đổi, " +msgstr "nội dung bị sửa đổi, " #: wt-status.c:289 msgid "untracked content, " @@ -1098,194 +1230,236 @@ msgstr "chưa hòa trộn: %s" 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:785 +#: wt-status.c:789 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 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột sau đó chạy \"git commit\")" -#: wt-status.c:791 +#: wt-status.c:795 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 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." -msgstr "Bạn đang ở giữa của một phiên 'am'." +msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:811 +#: wt-status.c:815 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 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (dùng \"git am --skip\" để bỏ qua lần vá này)" +msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (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 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh '%s' trên '%s'." + +#: wt-status.c:884 wt-status.c:901 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 +#: wt-status.c:887 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 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (dùng \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:886 +#: wt-status.c:904 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 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao (commit) " +"trong khi đang rebase nhánh '%s' trên '%s'." + +#: wt-status.c:913 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 +#: wt-status.c:916 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 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao (commit) trong " +"khi đang rebase nhánh '%s' trên '%s'." + +#: wt-status.c:925 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 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (dùng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)" -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (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 +#: wt-status.c:940 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 +#: wt-status.c:947 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 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "" +"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect) trên nhánh " +"'%s'." + +#: wt-status.c:962 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 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "Lần chuyển giao (commit) khởi đầu" -#: wt-status.c:1011 -msgid "Untracked" -msgstr "Không được theo vết" +#: wt-status.c:1097 +msgid "Untracked files" +msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1013 -msgid "Ignored" -msgstr "Bị bỏ qua" +#: wt-status.c:1099 +msgid "Ignored files" +msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1015 +#: wt-status.c:1101 #, 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:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1027 +#: wt-status.c:1114 #, 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" +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" +"không có thay đổi nào được thêm vào commit (dùng \"git add\" và/hoặc \"git " +"commit -a\")\n" -#: wt-status.c:1029 -msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr " (dùng \"git add\" và/hoặc \"git commit -a\")" +#: wt-status.c:1117 +#, c-format +msgid "no changes added to commit\n" +msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)\n" -#: wt-status.c:1031 +#: wt-status.c:1120 #, c-format -msgid "nothing added to commit but untracked files present%s\n" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\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" +"không được theo dấu vết hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1033 -msgid " (use \"git add\" to track)" -msgstr " (dùng \"git add\" để theo dõi dấu vết)" +#: wt-status.c:1123 +#, c-format +msgid "nothing added to commit but untracked files present\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\n" -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 +#: wt-status.c:1126 #, c-format -msgid "nothing to commit%s\n" -msgstr "không có gì để chuyển giao (commit) %s\n" +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" +" không có gì để commit (tạo/sao-chép các tập tin và dùng \"git add\" để theo " +"dõi dấu vết)\n" -#: 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à dùng \"git add\" để theo dõi dấu vết)" +#: wt-status.c:1129 wt-status.c:1134 +#, c-format +msgid "nothing to commit\n" +msgstr "không có gì để chuyển giao (commit)\n" -#: wt-status.c:1039 -msgid " (use -u to show untracked files)" -msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" +#: wt-status.c:1132 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" +"không có gì để chuyển giao (commit) (dùng -u để bỏ các tập tin cần theo dấu " +"vết)\n" -#: wt-status.c:1042 -msgid " (working directory clean)" -msgstr " (thư mục làm việc sạch sẽ)" +#: wt-status.c:1136 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "không có gì để chuyển giao (commit), thư mục làm việc sạch sẽ\n" -#: wt-status.c:1150 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1156 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "Lần chuyển giao (commit) khởi tạo trên " -#: wt-status.c:1171 +#: wt-status.c:1265 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1174 wt-status.c:1177 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "phía trước " -#: wt-status.c:1179 +#: wt-status.c:1273 msgid ", behind " msgstr ", đằng sau " @@ -1294,110 +1468,204 @@ msgstr ", đằng sau " msgid "failed to unlink '%s'" msgstr "bỏ liên kết (unlink) %s không thành công" -#: builtin/add.c:62 +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [các-tùy-chọn] [--] <pathspec>..." + +#: builtin/add.c:63 #, c-format 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:229 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" -msgstr "gỡ bỏ '%s'\n" - -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "Đường dẫn '%s' thì ở trong mô-đun-con '%.*s'" +msgstr "gỡ bỏ “%s”\n" -#: builtin/add.c:192 +#: builtin/add.c:148 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:459 builtin/rm.c:186 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" -msgstr "pathspec '%s' không khớp với bất kỳ tập tin nào" +msgstr "pathspec “%s” không khớp với bất kỳ tập tin nào" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "'%s' nằm ngoài một liên kết tượng trưng" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." -msgstr "Không thể mở '%s' để ghi" +msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" -msgstr "không thể lấy trạng thái về '%s'" +msgstr "không thể lấy trạng thái về “%s”" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Đã bỏ qua." -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" -msgstr "Không thể apply (áp dụng miếng vá) '%s'" +msgstr "Không thể apply (áp dụng miếng vá) “%s”" -#: builtin/add.c:312 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:352 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 +#: builtin/rm.c:206 +msgid "dry run" +msgstr "chạy thử" + +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "chi tiết" + +#: builtin/add.c:280 +msgid "interactive picking" +msgstr "sửa bằng cách tương tác" + +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 +msgid "select hunks interactively" +msgstr "chọn “hunks” một cách tương tác" + +#: builtin/add.c:282 +msgid "edit current diff and apply" +msgstr "sửa diff hiện nay và áp dụng nó" + +#: builtin/add.c:283 +msgid "allow adding otherwise ignored files" +msgstr "cho phép thêm các tập tin bị bỏ qua khác" + +#: builtin/add.c:284 +msgid "update tracked files" +msgstr "cập nhật các tập tin được theo vết" + +#: builtin/add.c:285 +msgid "record only the fact that the path will be added later" +msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" + +#: builtin/add.c:286 +msgid "add changes from all tracked and untracked files" +msgstr "" +"thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " +"vết" + +#: builtin/add.c:287 +msgid "don't add, only refresh the index" +msgstr "không thêm, chỉ làm tươi mới bảng mục lục" + +#: builtin/add.c:288 +msgid "just skip files which cannot be added because of errors" +msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" + +#: builtin/add.c:289 +msgid "check if - even missing - files are ignored in dry run" +msgstr "" +"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" + +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" -#: builtin/add.c:353 +#: builtin/add.c:312 msgid "no files added" msgstr "chưa có tập tin nào được thêm vào" -#: builtin/add.c:359 +#: builtin/add.c:318 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:391 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" +"Cách ứng xử của lệnh “git add %s (hay %s)” khi không có tham số đường dẫn " +"từ\n" +"thư-mục con của cây sẽ thay đổi kể từ Git 2.0 và không thể sử dụng như thế " +"nữa.\n" +"Để thêm nội dung cho toàn bộ cây, chạy:\n" +"\n" +" git add %s :/\n" +" (hay git add %s :/)\n" +"\n" +"Để hạn chế lệnh cho thư-mục hiện tại, chạy:\n" +"\n" +" git add %s .\n" +" (hay git add %s .)\n" +"\n" +"Với phiên bản hiện tại của Git, lệnh bị hạn chế cho thư-mục hiện tại." + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:393 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" -#: builtin/add.c:413 +#: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" -#: builtin/add.c:414 +#: builtin/add.c:415 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Có lẽ bạn muốn nói là 'git add .' phải không?\n" +msgstr "Có lẽ bạn muốn là “git add .” phải không?\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 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" @@ -1408,12 +1676,12 @@ msgstr "git apply [các-tùy-chọn] [<miếng-vá>...]" #: 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'" +msgstr "không nhận ra tùy chọn về khoảng trắng “%s”" #: 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'" +msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”" #: builtin/apply.c:823 #, c-format @@ -1450,19 +1718,19 @@ msgstr "git apply: git-diff sai - tên tập tin cũ mâu thuấn trên dòng %d #: builtin/apply.c:957 #, 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" +msgstr "git apply: git-diff sai - cần /dev/null trên dòng %d" -#: builtin/apply.c:1402 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" -msgstr "chi tiết: dòng không được mong đợi: %.*s" +msgstr "chi tiết: dòng không cần: %.*s" -#: builtin/apply.c:1459 +#: builtin/apply.c:1479 #, 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:1476 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1477,82 +1745,78 @@ 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:1636 +#: builtin/apply.c:1656 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:1638 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: builtin/apply.c:1664 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: builtin/apply.c:1700 +#: builtin/apply.c:1720 #, 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:1702 +#: builtin/apply.c:1722 #, 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:1705 +#: builtin/apply.c:1725 #, 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:1851 +#: builtin/apply.c:1871 #, 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:1880 +#: builtin/apply.c:1900 #, 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:1966 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" -msgstr "vá chỉ với 'garbage' tại dòng %d" +msgstr "vá chỉ với “garbage” tại dòng %d" -#: builtin/apply.c:2056 +#: builtin/apply.c:2076 #, 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:2060 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" -msgstr "không thể mở để đọc hay ghi %s" - -#: builtin/apply.c:2131 -msgid "oops" -msgstr "ôi?" +msgstr "không thể mở hay đọc %s" -#: builtin/apply.c:2653 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" -msgstr "sai khởi đầu dòng: '%c'" +msgstr "sai khởi đầu dòng: “%c”" -#: builtin/apply.c:2771 +#: builtin/apply.c:2802 #, 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:2783 +#: builtin/apply.c:2814 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Nội dung bị giảm xuống (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: builtin/apply.c:2789 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" @@ -1561,327 +1825,325 @@ msgstr "" "Trong khi đang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2808 +#: builtin/apply.c:2839 #, 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'" +msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" -#: builtin/apply.c:2911 +#: builtin/apply.c:2942 #, 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'" +msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" -#: builtin/apply.c:2917 +#: builtin/apply.c:2948 #, 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 (mong chờ %s, lại nhận %s)" +"vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " +"%s)" -#: builtin/apply.c:2938 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "vá gặp lỗi: %s:%ld" -#: builtin/apply.c:3060 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "không thể \"checkout\" %s" -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3138 builtin/apply.c:3360 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa/đổi tên" -#: builtin/apply.c:3219 builtin/apply.c:3374 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, 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:3223 builtin/apply.c:3366 builtin/apply.c:3388 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3228 builtin/apply.c:3382 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3330 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: builtin/apply.c:3399 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3401 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, mong chờ %o" -#: builtin/apply.c:3502 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3505 +#: builtin/apply.c:3536 #, 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:3525 +#: builtin/apply.c:3556 #, 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:3530 +#: builtin/apply.c:3561 #, 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:3538 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3551 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s..." -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, 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'" +msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" -#: builtin/apply.c:3749 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:3777 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "miếng vá sai hỏng cho dự án con (subproject) %s" -#: builtin/apply.c:3781 +#: builtin/apply.c:3850 #, 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:3786 +#: builtin/apply.c:3855 #, 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" +msgstr "không thể tạo “backing store” cho tập tin được tạo mới hơn %s" -#: builtin/apply.c:3789 builtin/apply.c:3897 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, 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:3822 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" -msgstr "đang đóng tập tin '%s'" +msgstr "đang đóng tập tin “%s”" -#: builtin/apply.c:3871 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" -msgstr "không thể ghi vào tập tin '%s' chế độ (mode) %o" +msgstr "không thể ghi vào tập tin “%s” chế độ (mode) %o" -#: builtin/apply.c:3958 +#: builtin/apply.c:4027 #, 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:3966 +#: builtin/apply.c:4035 msgid "internal error" msgstr "lỗi nội bộ" #. Say this even without --verbose -#: builtin/apply.c:3969 +#: builtin/apply.c:4038 #, 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:3979 +#: builtin/apply.c:4048 #, 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:4000 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:4003 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "hunk #%d bị từ chối." -#: builtin/apply.c:4153 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:4164 +#: builtin/apply.c:4233 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:4283 builtin/apply.c:4286 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 +#: builtin/fetch.c:63 msgid "path" msgstr "đường-dẫn" -#: builtin/apply.c:4284 +#: builtin/apply.c:4353 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:4287 +#: builtin/apply.c:4356 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:4289 +#: builtin/apply.c:4358 msgid "num" msgstr "số" -#: builtin/apply.c:4290 +#: builtin/apply.c:4359 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:4293 +#: builtin/apply.c:4362 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:4295 +#: builtin/apply.c:4364 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:4299 -msgid "shows number of added and deleted lines in decimal notation" +#: builtin/apply.c:4368 +msgid "show 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:4301 +#: builtin/apply.c:4370 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:4303 +#: builtin/apply.c:4372 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:4305 +#: builtin/apply.c:4374 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:4307 +#: builtin/apply.c:4376 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:4309 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: builtin/apply.c:4311 +#: builtin/apply.c:4380 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:4313 +#: builtin/apply.c:4382 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:4315 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 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:4318 +#: builtin/apply.c:4387 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:4319 +#: builtin/apply.c:4388 msgid "action" msgstr "hành động" -#: builtin/apply.c:4320 +#: builtin/apply.c:4389 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:4323 builtin/apply.c:4326 +#: builtin/apply.c:4392 builtin/apply.c:4395 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:4329 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4331 +#: builtin/apply.c:4400 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:4333 +#: builtin/apply.c:4402 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:4335 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4336 -msgid "be verbose" -msgstr "chi tiết" - -#: builtin/apply.c:4338 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: builtin/apply.c:4341 +#: builtin/apply.c:4410 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:4343 +#: builtin/apply.c:4412 msgid "root" msgstr "root" -#: builtin/apply.c:4344 +#: builtin/apply.c:4413 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:4366 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: builtin/apply.c:4374 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4377 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4393 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" -msgstr "không thể mở miếng vá '%s'" +msgstr "không thể mở miếng vá “%s”" -#: builtin/apply.c:4407 +#: builtin/apply.c:4476 #, 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:4413 builtin/apply.c:4423 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1891,7 +2153,7 @@ msgstr[1] "%d dòng thêm khoảng trắng lỗi." #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" -msgstr "không thể tạo tập tin kho (lưu trữ, nén) '%s'" +msgstr "không thể tạo tập tin kho (lưu trữ, nén) “%s”" #: builtin/archive.c:20 msgid "could not redirect output" @@ -1923,187 +2185,484 @@ msgstr "git archive: lỗi giao thức" msgid "git archive: expected a flush" msgstr "git archive: đã mong chờ một flush" -#: builtin/branch.c:144 +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "thực hiện “git bisect next”" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "" +"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao (commit) " +"hiện hành" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [các-tùy-chọn] [rev-opts] [rev] [--] tập-tin" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[rev-opts] được mô tả trong git-rev-list(1)" + +#: builtin/blame.c:2350 +msgid "Show blame entries as we find them, incrementally" +msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần" + +#: builtin/blame.c:2351 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "" +"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)" + +#: builtin/blame.c:2352 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" + +#: builtin/blame.c:2353 +msgid "Show work cost statistics" +msgstr "Hiển thị thống kê công sức làm việc" + +#: builtin/blame.c:2354 +msgid "Show output score for blame entries" +msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”" + +#: builtin/blame.c:2355 +msgid "Show original filename (Default: auto)" +msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" + +#: builtin/blame.c:2356 +msgid "Show original linenumber (Default: off)" +msgstr "Hiển thị số dòng gốc (Mặc định: off)" + +#: builtin/blame.c:2357 +msgid "Show in a format designed for machine consumption" +msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" + +#: builtin/blame.c:2358 +msgid "Show porcelain format with per-line commit information" +msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng" + +#: builtin/blame.c:2359 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "Dùng cùng chế độ xuất ra vóigit-annotate (Mặc định: off)" + +#: builtin/blame.c:2360 +msgid "Show raw timestamp (Default: off)" +msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" + +#: builtin/blame.c:2361 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Hiển thị SHA1 của lần chuyển giao (commit) dạng dài (Mặc định: off)" + +#: builtin/blame.c:2362 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" + +#: builtin/blame.c:2363 +msgid "Show author email instead of name (Default: off)" +msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" + +#: builtin/blame.c:2364 +msgid "Ignore whitespace differences" +msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" + +#: builtin/blame.c:2365 +msgid "Spend extra cycles to find better match" +msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" + +#: builtin/blame.c:2366 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "" +"Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”" + +#: builtin/blame.c:2367 +msgid "Use <file>'s contents as the final image" +msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" + +#: builtin/blame.c:2368 builtin/blame.c:2369 +msgid "score" +msgstr "điểm số" + +#: builtin/blame.c:2368 +msgid "Find line copies within and across files" +msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" + +#: builtin/blame.c:2369 +msgid "Find line movements within and across files" +msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" + +#: builtin/blame.c:2370 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:2370 +msgid "Process only line range n,m, counting from 1" +msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [các-tùy-chọn] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "git branch [các-tùy-chọn] [-l] [-f] <tên-nhánh> [<điểm-đầu>]" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git branch [các-tùy-chọn] [-r] (-d | -D) <tên-nhánh> ..." + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [các-tùy-chọn] (-m | -M) [<nhánh-cũ>] <nhánh-mới>" + +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"đang xóa nhánh '%s' mà nó lại đã được hòa trộn vào\n" -" '%s', nhưng vẫn chưa được hòa trộn vào HEAD." +"đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n" +" “%s”, nhưng vẫn chưa được hòa trộn vào HEAD." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"không xóa nhánh '%s' cái mà chưa được hòa trộng vào\n" -" '%s', cho dù là nó đã được hòa trộn vào HEAD." +"không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n" +" “%s”, cho dù là nó đã được hòa trộn vào HEAD." + +#: builtin/branch.c:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho “%s”" + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"Nhánh “%s” không được trộn một cách đầy đủ.\n" +"Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”." #: builtin/branch.c:180 +msgid "Update of config-file failed" +msgstr "Cập nhật tập tin cấu hình gặp lỗi" + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "không thể dùng tùy chọn -a với -d" -#: builtin/branch.c:186 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho HEAD" -#: builtin/branch.c:191 +#: builtin/branch.c:222 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Không thể xóa nhánh '%s' cái mà bạn hiện nay đang ở." +msgstr "Không thể xóa nhánh “%s” cái mà bạn hiện nay đang ở." -#: builtin/branch.c:202 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." -msgstr "không tìm thấy nhánh máy chủ '%s'." +msgstr "không tìm thấy nhánh máy chủ “%s”." -#: builtin/branch.c:203 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." -msgstr "không tìm thấy nhánh '%s'." - -#: builtin/branch.c:210 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho '%s'" - -#: builtin/branch.c:216 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"Nhánh '%s' không được trộn một cách đầy đủ.\n" -"Nếu bạn thực sự muốn xóa nó, thì chạy lệnh 'git branch -D %s'." +msgstr "không tìm thấy nhánh “%s”." -#: builtin/branch.c:225 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" -msgstr "Gặp lỗi khi đang xóa nhánh máy chủ '%s'" +msgstr "Gặp lỗi khi đang xóa nhánh trên máy chủ “%s”" -#: builtin/branch.c:226 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" -msgstr "Lỗi khi xoá bỏ nhánh '%s'" +msgstr "Lỗi khi xoá bỏ nhánh “%s”" -#: builtin/branch.c:233 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" -msgstr "Nhánh máy chủ \"%s\" đã bị xóa (từng là %s).\n" +msgstr "Nhánh trên máy chủ \"%s\" đã bị xóa (từng là %s).\n" -#: builtin/branch.c:234 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" -msgstr "Nhánh '%s' đã bị xóa (từng là %s)\n" - -#: builtin/branch.c:239 -msgid "Update of config-file failed" -msgstr "Cập nhật tập tin cấu hình gặp lỗi" +msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n" -#: builtin/branch.c:337 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" -msgstr "nhánh '%s' không chỉ đến một lần chuyển giao (commit) nào cả" +msgstr "nhánh “%s” không chỉ đến một lần chuyển giao (commit) nào cả" -#: builtin/branch.c:409 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "[%s: đằng sau %d]" -#: builtin/branch.c:411 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "[đằng sau %d]" -#: builtin/branch.c:415 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: phía trước %d]" -#: builtin/branch.c:417 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "[phía trước %d]" -#: builtin/branch.c:420 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" -msgstr "[%s: phía trước %d, phía sau %d]" +msgstr "[%s: trước %d, sau %d]" -#: builtin/branch.c:423 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" -msgstr "[phía trước %d, phía sau %d]" +msgstr "[trước %d, sau %d]" + +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr " **** tham chiếu sai ****" -#: builtin/branch.c:535 +#: builtin/branch.c:560 msgid "(no branch)" msgstr "(không nhánh)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "đối tượng “%s” không chỉ đến một lần chuyển giao (commit) nào cả" + +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "một số tham chiếu đã không thể đọc được" -#: builtin/branch.c:613 +#: builtin/branch.c:638 msgid "cannot rename the current branch while not on any." msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả." -#: builtin/branch.c:623 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" -msgstr "Sai tên nhánh: '%s'" +msgstr "Sai tên nhánh: “%s”" -#: builtin/branch.c:638 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "Đổi tên nhánh gặp lỗi" -#: builtin/branch.c:642 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" -msgstr "Đã đổi tên nhánh khuyết danh '%s' đi" +msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:646 +#: builtin/branch.c:671 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!" -#: builtin/branch.c:653 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi" -#: builtin/branch.c:668 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: builtin/branch.c:692 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "không thể ghi vào mẫu mô tả nhánh: %s" -#: builtin/branch.c:783 +#: builtin/branch.c:747 +msgid "Generic options" +msgstr "Tùy chọn chung" + +#: builtin/branch.c:749 +msgid "show hash and subject, give twice for upstream branch" +msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn" + +#: builtin/branch.c:750 +msgid "suppress informational messages" +msgstr "Thu hồi các thông điệp thông tin" + +#: builtin/branch.c:751 +msgid "set up tracking mode (see git-pull(1))" +msgstr "cài đặt chế độ theo vết (xem git-pull(1))" + +#: builtin/branch.c:753 +msgid "change upstream info" +msgstr "thay đổi thông tin thượng nguồn (upstream)" + +#: builtin/branch.c:757 +msgid "use colored output" +msgstr "sử dụng kết xuất có tô màu" + +#: builtin/branch.c:758 +msgid "act on remote-tracking branches" +msgstr "thao tác trên nhánh “remote-tracking”" + +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 +msgid "commit" +msgstr "commit" + +#: builtin/branch.c:762 builtin/branch.c:768 +msgid "print only branches that contain the commit" +msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" + +#: builtin/branch.c:774 +msgid "Specific git-branch actions:" +msgstr "Hành động git-branch:" + +#: builtin/branch.c:775 +msgid "list both remote-tracking and local branches" +msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" + +#: builtin/branch.c:777 +msgid "delete fully merged branch" +msgstr "xóa một cách đầy đủ nhánh đã hòa trộn" + +#: builtin/branch.c:778 +msgid "delete branch (even if not merged)" +msgstr "xoá nhánh (cho dù là chưa được hòa trộn)" + +#: builtin/branch.c:779 +msgid "move/rename a branch and its reflog" +msgstr "di chuyển hay đổi tên một nhánh và reflog của nó" + +#: builtin/branch.c:780 +msgid "move/rename a branch, even if target exists" +msgstr "di chuyển hoặc đổi tên một nhánh, thậm chí cả khi đích đã có sẵn" + +#: builtin/branch.c:781 +msgid "list branch names" +msgstr "liệt kê các tên nhánh" + +#: builtin/branch.c:782 +msgid "create the branch's reflog" +msgstr "tạo reflog của nhánh" + +#: builtin/branch.c:784 +msgid "edit the description for the branch" +msgstr "sửa mô tả cho nhánh" + +#: builtin/branch.c:785 +msgid "force creation (when already exists)" +msgstr "ép buộc tạo (khi đã sẵn tồn tại rồi)" + +#: builtin/branch.c:788 +msgid "print only not merged branches" +msgstr "chỉ hiển thị các nhánh chưa được hòa trộn" + +#: builtin/branch.c:794 +msgid "print only merged branches" +msgstr "chỉ hiển thị các nhánh được hòa trộn" + +#: builtin/branch.c:798 +msgid "list branches in columns" +msgstr "liệt kê các nhánh trong các cột" + +#: builtin/branch.c:811 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ệ." +msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu (ref) hợp lệ." -#: builtin/branch.c:788 builtin/clone.c:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:808 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "--column và --verbose xung khắc nhau" -#: builtin/branch.c:857 +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "cần tên nhánh" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "Không thể đưa ra mô tả HEAD đã tách rời" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "không thể sửa mô tả cho nhiều hơn một nhánh" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Vẫn chưa chuyển giao trên nhánh “%s”." + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "Không có nhánh nào có tên “%s”." + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "quá nhiều nhánh dành cho thao tác đổi tên" + +#: builtin/branch.c:893 +#, c-format +msgid "branch '%s' does not exist" +msgstr "nhánh “%s” chưa sẵn có" + +#: builtin/branch.c:905 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Nhánh “%s” không có thông tin thượng nguồn (upstream)" + +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -"hai tùy chọn -a và -r áp dụng cho lệnh 'git branch' không hợp lý đối với tên " +"hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên " "nhánh" +#: builtin/branch.c:923 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"Cờ --set-upstream bị phản đối và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-" +"upstream-to\n" + +#: builtin/branch.c:940 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" +"\n" + +#: builtin/branch.c:941 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" + +#: builtin/branch.c:942 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" -msgstr "'%s' tốt\n" +msgstr "“%s” tốt\n" #: builtin/bundle.c:56 msgid "Need a repository to create a bundle." @@ -2113,95 +2672,250 @@ 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:114 builtin/checkout.c:147 +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "git cat-file (-t|-s|-e|-p|<kiểu>|--textconv) <đối tượng>" + +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <danh-sách-đối-tượng>" + +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<kiểu> là một trong số: blob, tree, commit, tag" + +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "hiển thị kiểu đối tượng" + +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "hiển thị kích thước đối tượng" + +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" +msgstr "thoát với 0 khi không có lỗi" + +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" +msgstr "in nội dung đối tượng dạng dễ đọc" + +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" +msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" + +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" +msgstr "" +"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" + +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" +msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | attr...] [--] tên-đường-dẫn..." + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "" +"git check-attr --stdin [-z] [-a | --all | attr...] < <danh-sách-đường-dẫn>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "chỉ sử dụng .gitattributes từ bảng mục lục" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" + +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "input paths are terminated by a null character" +msgstr "các đường dẫn được ngăn cách bởi ký tự null" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "chặn các báo cáo tiến trình hoạt động" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "không thể chỉ định các tên đường dẫn với --stdin" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "-z chỉ hợp lý với --stdin" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "chưa ghi rõ đường dẫn" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [các-tùy-chọn] [--] [<tập-tin>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "" +"không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "không checkout các tập tin mới" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr " đọc danh sách đường dẫn từ thiết bị nhập chuẩn" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "ghi nội dung vào tập tin tạm" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "chuỗi" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "khi tạo các tập tin, nối thêm <chuỗi>" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "sao chép ra các tập tin từ trạng thái được đặt tên" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [các-tùy-chọn] <nhánh>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [các-tùy-chọn] [<nhánh>] -- <tập-tin>..." + +#: builtin/checkout.c:116 builtin/checkout.c:149 #, 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" +msgstr "đường dẫn “%s” không có các phiên bản của chúng ta" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:118 builtin/checkout.c:151 #, 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" +msgstr "đường dẫn “%s” không có các phiên bản của chúng" -#: builtin/checkout.c:132 +#: builtin/checkout.c:134 #, 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" +msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết" -#: builtin/checkout.c:176 +#: builtin/checkout.c:178 #, 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" +msgstr "đường dẫn “%s” không có các phiên bản cần thiết" -#: builtin/checkout.c:193 +#: builtin/checkout.c:195 #, c-format msgid "path '%s': cannot merge" -msgstr "đường dẫn '%s': không thể hòa trộn" +msgstr "đường dẫn “%s”: không thể hòa trộn" -#: builtin/checkout.c:210 +#: builtin/checkout.c:212 #, 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'" +msgstr "Không thể thêm kết quả hòa trộn cho “%s”" + +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "“%s” không thể được sử dụng với các đường dẫn cập nhật" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "“%s” không thể được sử dụng với %s" + +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "" +"Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc." -#: builtin/checkout.c:235 builtin/checkout.c:392 +#: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/checkout.c:265 builtin/checkout.c:272 +#: builtin/checkout.c:295 builtin/checkout.c:302 #, c-format msgid "path '%s' is unmerged" -msgstr "đường dẫn '%s' không được hòa trộn" +msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 -#: builtin/merge.c:811 -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:414 +#: builtin/checkout.c:448 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 đã!" +msgstr "bạn cần phải phân giải bảng mục lục hiện tại của bạn trước đã" -#: builtin/checkout.c:533 +#: builtin/checkout.c:569 #, c-format msgid "Can not do reflog for '%s'\n" -msgstr "Không thể thực hiện reflog cho '%s'\n" +msgstr "Không thể thực hiện reflog cho “%s”\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:602 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:573 +#: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" -msgstr "Đặt lại nhánh '%s'\n" +msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:612 #, c-format msgid "Already on '%s'\n" -msgstr "Đã sẵn sàng trên '%s'\n" +msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:616 #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "Đã chuyển tới và reset nhánh '%s'\n" +msgstr "Đã chuyển tới và reset nhánh “%s”\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:618 builtin/checkout.c:955 #, c-format msgid "Switched to a new branch '%s'\n" -msgstr "Đã chuyển đến nhánh mới '%s'\n" +msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:620 #, c-format msgid "Switched to branch '%s'\n" -msgstr "Đã chuyển đến nhánh '%s'\n" +msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:640 +#: builtin/checkout.c:676 #, 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:682 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2226,7 +2940,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:700 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2242,92 +2956,149 @@ msgstr "" " git branch tên_nhánh_mới %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:730 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:734 msgid "Previous HEAD position was" msgstr "Vị trí kế trước của HEAD là" -#: builtin/checkout.c:724 builtin/checkout.c:919 +#: builtin/checkout.c:761 builtin/checkout.c:950 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:886 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu sai: %s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:925 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là một cây (tree):%s" -#: builtin/checkout.c:976 -msgid "-B cannot be used with -b" -msgstr "tùy chọn -B không thể dùng -b" +#: builtin/checkout.c:964 +msgid "paths cannot be used with switching branches" +msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" -#: builtin/checkout.c:985 -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:967 builtin/checkout.c:971 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "“%s” không thể được sử dụng với các nhánh chuyển" -#: builtin/checkout.c:988 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detach không thể được sử dụng với tùy chọn -b/-B/--orphan" +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "“%s” không thể được sử dụng với “%s”" -#: builtin/checkout.c:990 -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:991 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Không thể chuyển nhánh đến một non-commit “%s”" -#: builtin/checkout.c:996 -msgid "--track needs a branch name" -msgstr "--track cần tên một nhánh" +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "nhánh" -#: builtin/checkout.c:1003 -msgid "Missing branch name; try -b" -msgstr "Thiếu tên nhánh; hãy thử -b" +#: builtin/checkout.c:1014 +msgid "create and checkout a new branch" +msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1009 -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:1016 +msgid "create/reset and checkout a branch" +msgstr "create/reset và checkout một nhánh" -#: builtin/checkout.c:1011 -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:1017 +msgid "create reflog for new branch" +msgstr "tạo reflog cho nhánh mới" + +#: builtin/checkout.c:1018 +msgid "detach the HEAD at named commit" +msgstr "rời bỏ HEAD tại lần chuyển giao danh nghĩa" + +#: builtin/checkout.c:1019 +msgid "set upstream info for new branch" +msgstr "đặt thông tin thượng nguồn (upstream) cho nhánh mới" #: builtin/checkout.c:1021 -msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout: hai tùy chọn -f và -m xung khắc nhau" +msgid "new branch" +msgstr "nhánh mới" + +#: builtin/checkout.c:1021 +msgid "new unparented branch" +msgstr "nhánh mồ côi mới" + +#: builtin/checkout.c:1022 +msgid "checkout our version for unmerged files" +msgstr "" +"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" + +#: builtin/checkout.c:1024 +msgid "checkout their version for unmerged files" +msgstr "" +"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" + +#: builtin/checkout.c:1026 +msgid "force checkout (throw away local modifications)" +msgstr "ép buộc lấy ra (checkout) (bỏ đi những thay đổi nội bộ)" + +#: builtin/checkout.c:1027 +msgid "perform a 3-way merge with the new branch" +msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1028 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" + +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 +msgid "style" +msgstr "kiểu" + +#: builtin/checkout.c:1030 +msgid "conflict style (merge or diff3)" +msgstr "xung đột kiểu (hòa trộn hay diff3)" + +#: builtin/checkout.c:1033 +msgid "second guess 'git checkout no-such-branch'" +msgstr "gợi ý thứ hai “git checkout không-nhánh-nào-như-vậy”" + +#: builtin/checkout.c:1057 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "Tùy chọn -b|-B và --orphan loại từ lẫn nhau" + +#: builtin/checkout.c:1074 +msgid "--track needs a branch name" +msgstr "--track cần tên một nhánh" + +#: builtin/checkout.c:1081 +msgid "Missing branch name; try -b" +msgstr "Thiếu tên nhánh; hãy thử -b" + +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1123 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" +"Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" 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 " +"Không thể cập nhật và chuyển thành nhánh “%s” cùng lúc\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:1065 -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:1070 -msgid "git checkout: --detach does not take a path argument" -msgstr "git checkout: --detach không nhận một đối số là đường dẫn" +#: builtin/checkout.c:1128 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”" -#: builtin/checkout.c:1073 +#: builtin/checkout.c:1132 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2335,26 +3106,76 @@ msgstr "" "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" "checkout bảng mục lục (index)." -#: builtin/checkout.c:1092 -msgid "Cannot switch branch to a non-commit." -msgstr "Không thể chuyển đến một non-commit." +#: builtin/clean.c:20 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "git clean [-d] [-f] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>..." + +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "Đang gỡ bỏ %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "Có thể gỡ bỏ %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Đang bỏ qua kho chứa %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Nên bỏ qua kho chứa %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "gặp lỗi khi gỡ bỏ %s" + +#: builtin/clean.c:160 +msgid "do not print names of files removed" +msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" + +#: builtin/clean.c:162 +msgid "force" +msgstr "ép buộc" + +#: builtin/clean.c:164 +msgid "remove whole directories" +msgstr "gỡ bỏ toàn bộ thư mục" + +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 +msgid "pattern" +msgstr "mẫu" + +#: builtin/clean.c:166 +msgid "add <pattern> to ignore rules" +msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" + +#: builtin/clean.c:167 +msgid "remove ignored files, too" +msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/checkout.c:1095 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs là xung khắc nhau khi chuyển đổi các nhánh." +#: builtin/clean.c:169 +msgid "remove only ignored files" +msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng một lúc với nhau" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce được đặt thành true và không đưa ra tùy chọn -n mà cũng " "không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" @@ -2362,35 +3183,103 @@ msgstr "" "clean.requireForce mặc định được đặt thành true và không đưa ra tùy chọn -n " "mà cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "Có thể gỡ bỏ %s\n" +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]" -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "Đang gỡ bỏ %s\n" +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:436 +msgid "force progress reporting" +msgstr "ép buộc báo cáo tiến trình" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "gặp lỗi khi gỡ bỏ %s" +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "không tạo một checkout" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "Không thể gỡ bỏ %s\n" +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "tạo kho chứa bare" -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "Không xóa %s\n" +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "tạo kho bản sao (mirror) (ngụ ý là bare)" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "để nhân bản từ kho nội bộ" + +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" +msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép" + +#: builtin/clone.c:78 +msgid "setup as shared repository" +msgstr "cài đặt đây là kho chia sẻ" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "khởi tạo mô-đun-con trong bản sao" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "thư-mục-tạm" + +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "thư mục mà tại đó các mẫu sẽ được dùng" + +#: builtin/clone.c:86 +msgid "reference repository" +msgstr "kho tham chiếu" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "tên" + +#: builtin/clone.c:88 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "dùng <tên> thay vì “origin” để theo dõi thượng nguồn (uptream)" + +#: builtin/clone.c:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "lấy ra nhánh (checkout <nhánh>) thay vì HEAD của máy chủ" + +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" +msgstr "đường dẫn đến git-upload-pack trên máy chủ" + +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 +msgid "depth" +msgstr "độ sâu" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "nhân bản (clone) chỉ một nhánh, HEAD hoặc --branch" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr "gitdir" + +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc" + +#: builtin/clone.c:99 +msgid "key=value" +msgstr "khóa=giá trị" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" +msgstr "đặt cấu hình bên trong một kho chứa mới" #: builtin/clone.c:243 #, c-format 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ộ." +msgstr "kho tham chiếu “%s” không phải là một thư mục nội bộ." #: builtin/clone.c:306 #, c-format @@ -2400,7 +3289,7 @@ msgstr "tạo thư mục \"%s\" gặp lỗi" #: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" -msgstr "gặp lỗi stat (lấy trạng thái về) '%s'" +msgstr "gặp lỗi stat (lấy trạng thái về) “%s”" #: builtin/clone.c:310 #, c-format @@ -2420,7 +3309,7 @@ msgstr "gặp lỗi khi tạo được liên kết mềm %s" #: builtin/clone.c:350 #, c-format msgid "failed to copy file to '%s'" -msgstr "gặp lỗi khi chép tập tin tới '%s'" +msgstr "gặp lỗi khi chép tập tin tới “%s”" #: builtin/clone.c:373 #, c-format @@ -2436,77 +3325,117 @@ msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." 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:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:646 +#: builtin/clone.c:694 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:657 +#: builtin/clone.c:705 #, 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:671 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" -msgstr "kho chứa '%s' chưa tồn tại" +msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:676 +#: builtin/clone.c:726 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:686 +#: builtin/clone.c:736 #, 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." +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:696 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." -msgstr "cây làm việc '%s' đã sẵn tồn tại rồi." +msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:759 builtin/clone.c:771 #, 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'" +msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:712 +#: builtin/clone.c:762 #, 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'." +msgstr "không thể tạo cây thư mục làm việc dir “%s”." -#: builtin/clone.c:731 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "Đang nhân bản thành kho chứa bare '%s'...\n" +msgstr "Đang nhân bản thành kho chứa bare “%s”...\n" -#: builtin/clone.c:733 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" -msgstr "Đang nhân bản thành '%s'...\n" +msgstr "Đang nhân bản thành “%s”...\n" -#: builtin/clone.c:789 +#: builtin/clone.c:818 #, 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:838 +#: builtin/clone.c:867 #, 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" +msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn (upstream) %s" -#: builtin/clone.c:845 +#: builtin/clone.c:874 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." +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [các-tùy-chọn]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "tìm kiếm biến cấu hình" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "bố cục để dùng" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "Độ rộng tối đa" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "Chèn thêm khoảng trống vào bờ bên trái" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "Chèn thêm khoảng trắng vào tiếp giáp bên phải" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "Chèn thêm khoảng trắng giữa các cột" + #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command phải là đối số đầu tiên" -#: builtin/commit.c:43 +#: builtin/commit.c:34 +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [các-tùy-chọn] [--] <pathspec>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [các-tùy-chọn] [--] <pathspec>..." + +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2534,7 +3463,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -2547,7 +3476,7 @@ msgstr "" "hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n" "\"git reset HEAD^\".\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -2562,99 +3491,99 @@ msgstr "" "\n" " git commit --allow-empty\n" "\n" -"Nếu không, hãy thử dùng 'git reset'\n" +"Nếu không, hãy thử dùng “git reset”\n" -#: builtin/commit.c:256 +#: builtin/commit.c:258 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:298 +#: builtin/commit.c:300 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:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "việc thêm tương tác gặp lỗi" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 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:389 +#: builtin/commit.c:391 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:391 +#: builtin/commit.c:393 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:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:421 +#: builtin/commit.c:423 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:496 builtin/commit.c:502 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "lần chuyển giao (commit) không hợp lệ: %s" -#: builtin/commit.c:525 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "đối số --author bị dị hình" -#: builtin/commit.c:585 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" -msgstr "Chuỗi thụt lề đầu dòng dị hình: '%s'" +msgstr "Chuỗi thụt lề đầu dòng dị hình: “%s”" -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, 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:635 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, 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:637 +#: builtin/commit.c:612 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:641 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" -msgstr "không đọc được tệp nhật ký '%s'" +msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:647 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "lần chuyển giao (commit) có ghi chú trống rỗng" -#: builtin/commit.c:663 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:667 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:671 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" -msgstr "Không thể đọc '%s'." +msgstr "Không thể đọc “%s”." -#: builtin/commit.c:723 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "không thể ghi mẫu commit" -#: builtin/commit.c:734 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -2669,7 +3598,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:739 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -2684,191 +3613,395 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:751 +#: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" 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" +"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " +"chuyển giao (commit).\n" -#: builtin/commit.c:756 +#: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" 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 " +"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; 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" +"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" +"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao (commit).\n" -#: builtin/commit.c:769 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "%sTác giả: %s" -#: builtin/commit.c:776 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "%sNgười chuyển giao (commit): %s" -#: builtin/commit.c:796 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:833 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:848 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, 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:945 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" -msgstr "Không tìm thấy tác giả có sẵn với '%s'" +msgstr "Không tìm thấy tác giả có sẵn với “%s”" -#: builtin/commit.c:960 builtin/commit.c:1160 +#: builtin/commit.c:944 builtin/commit.c:1138 #, 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'" +msgstr "Chế độ cho các tập tin không bị theo vết không hợp lệ “%s”" -#: builtin/commit.c:1000 +#: builtin/commit.c:974 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:1011 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "Không có gì để amend (tu bổ) cả." -#: builtin/commit.c:1014 +#: builtin/commit.c:988 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:1016 +#: builtin/commit.c:990 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:1019 +#: builtin/commit.c:993 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:1029 +#: builtin/commit.c:1003 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:1031 +#: builtin/commit.c:1005 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:1039 +#: builtin/commit.c:1013 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:1056 +#: builtin/commit.c:1030 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:1058 +#: builtin/commit.c:1032 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:1060 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "Giỏi... tu bổ cái cuối với bảng mục lục phi nghĩa." -#: builtin/commit.c:1062 +#: builtin/commit.c:1036 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:1072 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1077 +#: builtin/commit.c:1051 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:1260 +#: builtin/commit.c:1057 builtin/commit.c:1192 +msgid "--long and -z are incompatible" +msgstr "hai tùy chọn -long và -z không tương thích với nhau" + +#: builtin/commit.c:1152 builtin/commit.c:1388 +msgid "show status concisely" +msgstr "hiển thị trạng thái ở dạng súc tích" + +#: builtin/commit.c:1154 builtin/commit.c:1390 +msgid "show branch information" +msgstr "hiển thị thông tin nhánh" + +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 +msgid "machine-readable output" +msgstr "kết xuất dạng máy-có-thể-đọc" + +#: builtin/commit.c:1159 builtin/commit.c:1394 +msgid "show status in long format (default)" +msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" + +#: builtin/commit.c:1162 builtin/commit.c:1397 +msgid "terminate entries with NUL" +msgstr "chấm dứt các mục bằng NUL" + +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 +msgid "mode" +msgstr "chế độ" + +#: builtin/commit.c:1165 builtin/commit.c:1400 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" +"hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " +"normal, no. (Mặc định: all)" + +#: builtin/commit.c:1168 +msgid "show ignored files" +msgstr "hiển thị các tập tin ẩn" + +#: builtin/commit.c:1169 parse-options.h:151 +msgid "when" +msgstr "khi" + +#: builtin/commit.c:1170 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"bỏ qua các thay đổi trong mô-đun con, tùy chọn khi: all, dirty, untracked. " +"(Mặc định: all)" + +#: builtin/commit.c:1172 +msgid "list untracked files in columns" +msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" + +#: builtin/commit.c:1246 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:1262 +#: builtin/commit.c:1248 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:1303 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1305 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1449 +#: builtin/commit.c:1358 +msgid "suppress summary after successful commit" +msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" + +#: builtin/commit.c:1359 +msgid "show diff in commit message template" +msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" + +#: builtin/commit.c:1361 +msgid "Commit message options" +msgstr "Các tùy chọn ghi chú commit" + +#: builtin/commit.c:1362 builtin/tag.c:457 +msgid "read message from file" +msgstr "đọc chú thích từ tập tin" + +#: builtin/commit.c:1363 +msgid "author" +msgstr "tác giả" + +#: builtin/commit.c:1363 +msgid "override author for commit" +msgstr "ghi đè tác giả cho commit" + +#: builtin/commit.c:1364 builtin/gc.c:178 +msgid "date" +msgstr "ngày tháng" + +#: builtin/commit.c:1364 +msgid "override date for commit" +msgstr "ghi đè ngày tháng cho commit" + +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 +msgid "message" +msgstr "thông điệp" + +#: builtin/commit.c:1365 +msgid "commit message" +msgstr "chú thích của lần commit" + +#: builtin/commit.c:1366 +msgid "reuse and edit message from specified commit" +msgstr "" +"dùng lại các ghi chú từ lần chuyển giao (commit) đã cho nhưng có cho sửa chữa" + +#: builtin/commit.c:1367 +msgid "reuse message from specified commit" +msgstr "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho" + +#: builtin/commit.c:1368 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" + +#: builtin/commit.c:1369 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" +"dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " +"ra" + +#: builtin/commit.c:1370 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" +"lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" + +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "thêm dòng Signed-off-by:" + +#: builtin/commit.c:1372 +msgid "use specified template file" +msgstr "sử dụng tập tin mẫu đã cho" + +#: builtin/commit.c:1373 +msgid "force edit of commit" +msgstr "ép buộc sửa lần commit" + +#: builtin/commit.c:1374 +msgid "default" +msgstr "mặc định" + +#: builtin/commit.c:1374 builtin/tag.c:460 +msgid "how to strip spaces and #comments from message" +msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" + +#: builtin/commit.c:1375 +msgid "include status in commit message template" +msgstr "bao gồm các trạng thái ghi mẫu ghi chú chuyển giao (commit)" + +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 +msgid "key id" +msgstr "id khóa" + +#: builtin/commit.c:1377 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "ký lần commit dùng GPG" + +#. end commit message options +#: builtin/commit.c:1380 +msgid "Commit contents options" +msgstr "Các tùy nội dung ghi chú commit" + +#: builtin/commit.c:1381 +msgid "commit all changed files" +msgstr "chuyển giao tất cả các tập tin có thay đổi" + +#: builtin/commit.c:1382 +msgid "add specified files to index for commit" +msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao (commit)" + +#: builtin/commit.c:1383 +msgid "interactively add files" +msgstr "thêm các tập-tin bằng tương tác" + +#: builtin/commit.c:1384 +msgid "interactively add changes" +msgstr "thêm các thay đổi bằng tương tác" + +#: builtin/commit.c:1385 +msgid "commit only specified files" +msgstr "chỉ chuyển giao các tập tin đã chỉ ra" + +#: builtin/commit.c:1386 +msgid "bypass pre-commit hook" +msgstr "vòng qua móc (hook) pre-commit" + +#: builtin/commit.c:1387 +msgid "show what would be committed" +msgstr "hiển thị xem cái gì có thể được chuyển giao" + +#: builtin/commit.c:1398 +msgid "amend previous commit" +msgstr "tu bổ (amend) lần commit trước" + +#: builtin/commit.c:1399 +msgid "bypass post-rewrite hook" +msgstr "vòng qua móc (hook) post-rewrite" + +#: builtin/commit.c:1404 +msgid "ok to record an empty change" +msgstr "ok để ghi lại một thay đổi trống rỗng" + +#: builtin/commit.c:1407 +msgid "ok to record a change with an empty message" +msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" + +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" -msgstr "không thể mở %s' để đọc" +msgstr "không thể mở “%s” để đọc" -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, 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:1534 +#: builtin/commit.c:1524 #, 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:1539 +#: builtin/commit.c:1529 #, 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:1554 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "không thể khóa HEAD ref (tham chiếu)" -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "không thể cập nhật ref (tham chiếu) HEAD" -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2879,6 +4012,134 @@ msgstr "" "hay quota (hạn nghạch đĩa cứng) bị vượt quá, và sau đó \"git reset HEAD\" để " "khắc phục." +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [các-tùy-chọn]" + +#: builtin/config.c:51 +msgid "Config file location" +msgstr "Vị trí tập tin cấu hình" + +#: builtin/config.c:52 +msgid "use global config file" +msgstr "đặt tập tin cấu hình cần toàn cục" + +#: builtin/config.c:53 +msgid "use system config file" +msgstr "sử dụng tập tin cấu hình hệ thống" + +#: builtin/config.c:54 +msgid "use repository config file" +msgstr "dùng tập tin cấu hình của kho" + +#: builtin/config.c:55 +msgid "use given config file" +msgstr "sử dụng tập tin cấu hình đã cho" + +#: builtin/config.c:56 +msgid "Action" +msgstr "Hành động" + +#: builtin/config.c:57 +msgid "get value: name [value-regex]" +msgstr "lấy giá-trị: tên [value-regex]" + +#: builtin/config.c:58 +msgid "get all values: key [value-regex]" +msgstr "lấy tất cả giá-trị: khóa [value-regex]" + +#: builtin/config.c:59 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "lấy giá trị cho regexp: name-regex [value-regex]" + +#: builtin/config.c:60 +msgid "replace all matching variables: name value [value_regex]" +msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]" + +#: builtin/config.c:61 +msgid "add a new variable: name value" +msgstr "thêm biến mới: tên giá-trị" + +#: builtin/config.c:62 +msgid "remove a variable: name [value-regex]" +msgstr "gỡ bỏ biến: tên [value-regex]" + +#: builtin/config.c:63 +msgid "remove all matches: name [value-regex]" +msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]" + +#: builtin/config.c:64 +msgid "rename section: old-name new-name" +msgstr "đổi tên chương: tên-cũ tên-mới" + +#: builtin/config.c:65 +msgid "remove a section: name" +msgstr "gỡ bỏ chương: tên" + +#: builtin/config.c:66 +msgid "list all" +msgstr "liệt kê tất" + +#: builtin/config.c:67 +msgid "open an editor" +msgstr "mở một trình biên soạn" + +#: builtin/config.c:68 builtin/config.c:69 +msgid "slot" +msgstr "khe" + +#: builtin/config.c:68 +msgid "find the color configured: [default]" +msgstr "tìm cấu hình màu sắc: [mặc định]" + +#: builtin/config.c:69 +msgid "find the color setting: [stdout-is-tty]" +msgstr "tìm các cài đặt về màu sắc: [stdout-là-tty]" + +#: builtin/config.c:70 +msgid "Type" +msgstr "Kiểu" + +#: builtin/config.c:71 +msgid "value is \"true\" or \"false\"" +msgstr "giá trị là \"true\" hoặc \"false\"" + +#: builtin/config.c:72 +msgid "value is decimal number" +msgstr "giá trị ở dạng số thập phân" + +#: builtin/config.c:73 +msgid "value is --bool or --int" +msgstr "giá trị là --bool hoặc --int" + +#: builtin/config.c:74 +msgid "value is a path (file or directory name)" +msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)" + +#: builtin/config.c:75 +msgid "Other" +msgstr "Khác" + +#: builtin/config.c:76 +msgid "terminate values with NUL byte" +msgstr "chấm dứt giá trị với byte NUL" + +#: builtin/config.c:77 +msgid "respect include directives on lookup" +msgstr "tôn trọng kể cà các hướng trong tìm kiếm" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "git count-objects [-v]" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [các-tùy-chọn] <committish>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [các-tùy-chọn] --dirty" + #: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" @@ -2892,7 +4153,7 @@ msgstr "thẻ được chú giải %s không có tên nhúng" #: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" -msgstr "thẻ '%s' đã thực sự ở đây '%s' rồi" +msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi" #: builtin/describe.c:267 #, c-format @@ -2902,12 +4163,12 @@ msgstr "Không phải tên đối tượng %s hợp lệ" #: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" -msgstr "%s không phải là một đối tượng '%s' hợp lệ" +msgstr "%s không phải là một đối tượng “%s” hợp lệ" #: builtin/describe.c:287 #, c-format msgid "no tag exactly matches '%s'" -msgstr "không có thẻ nào khớp chính xác với '%s'" +msgstr "không có thẻ nào khớp chính xác với “%s”" #: builtin/describe.c:289 #, c-format @@ -2925,7 +4186,7 @@ msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -"Không có thẻ được chú giải nào được mô tả là '%s'.\n" +"Không có thẻ được chú giải nào được mô tả là “%s”.\n" "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags." #: builtin/describe.c:357 @@ -2934,7 +4195,7 @@ msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -"Không có thẻ (tag) có thể mô tả '%s'.\n" +"Không có thẻ (tag) có thể mô tả “%s”.\n" "Hãy thử --always, hoặt tạo một số thẻ." #: builtin/describe.c:378 @@ -2951,6 +4212,50 @@ msgstr "" "tìm thấy nhiều hơn %i thẻ (tag); đã liệt kê %i gần đây nhất\n" "bỏ đi tìm kiếm tại %s\n" +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "tìm các thẻ mà nó đến trước lần chuyển giao" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "chiến lược tìm kiếm trên đầu ra lỗi chuẩn stderr" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "sử dụng bất kỳ ref nào trong .git/refs" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "sử dụng bất kỳ thẻ nào trong .git/refs/tags" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "luôn dùng định dạng dài" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "chỉ xuất những gì khớp chính xác" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "dấu" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")" + #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long là xung khắc với tùy chọn --abbrev=0" @@ -2966,166 +4271,292 @@ msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao ( #: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "'%s': không phải tập tin bình thường hay liên kết tượng trưng" +msgstr "“%s”: không phải tập tin bình thường hay liên kết tượng trưng" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "tùy chọn sai: %s" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." -msgstr "đối tượng đã cho '%s' không hợp lệ." +msgstr "đối tượng đã cho “%s” không hợp lệ." -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" -msgstr "đã chỉ ra nhiều hơn %d cây (tree): '%s'" +msgstr "đã chỉ ra nhiều hơn %d cây (tree): “%s”" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" -msgstr "đã cho nhiều hơn hai đối tượng blob: '%s'" +msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." -msgstr "đã cho đối tượng không thể nắm giữ '%s'." +msgstr "đã cho đối tượng không thể nắm giữ “%s”." + +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-opts]" + +#: builtin/fast-export.c:646 +msgid "show progress after <n> objects" +msgstr "hiển thị tiến triển sau <n> đối tượng" + +#: builtin/fast-export.c:648 +msgid "select handling of signed tags" +msgstr "chọn điều khiển của thẻ đã ký" + +#: builtin/fast-export.c:651 +msgid "select handling of tags that tag filtered objects" +msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra" + +#: builtin/fast-export.c:654 +msgid "Dump marks to this file" +msgstr "Đổ các đánh dấu này vào tập-tin" + +#: builtin/fast-export.c:656 +msgid "Import marks from this file" +msgstr "nhập vào đánh dấu từ tập tin này" + +#: builtin/fast-export.c:658 +msgid "Fake a tagger when tags lack one" +msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái" + +#: builtin/fast-export.c:660 +msgid "Output full tree for each commit" +msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao" + +#: builtin/fast-export.c:662 +msgid "Use the done feature to terminate the stream" +msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu" + +#: builtin/fast-export.c:663 +msgid "Skip output of blob data" +msgstr "Bỏ qua kết xuất của dữ liệu blob" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<các-tùy-chọn>] [<nhóm>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<các-tùy-chọn>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "fetch từ tất cả các máy chủ" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" -#: builtin/fetch.c:200 +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "đường dẫn đến gói (pack) tải lên trên máy chủ cuối" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "ép buộc ghi đè lên nhánh nội bộ" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "fetch từ nhiều máy chủ cùng lúc" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "lấy (fetch) tất cả các thẻ cùng với các đối tượng liên quan đến nó" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "không lấy (fetch) tất cả các thẻ (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "" +"cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ " +"nữa" + +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "khi-cần" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "điều khiển việc lấy về (fetch) đệ quy trong các mô-đun-con" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "giữ các gói đã tải về" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "cho phép cập nhật ref (tham chiếu) HEAD" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "làm sâu hơn lịch sử của bản sao" + +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "chuyển đổi hoàn toàn sang kho git" + +#: builtin/fetch.c:88 builtin/log.c:1119 +msgid "dir" +msgstr "tmục" + +#: builtin/fetch.c:89 +msgid "prepend this to submodule path output" +msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" + +#: builtin/fetch.c:92 +msgid "default mode for recursion" +msgstr "chế độ mặc định cho đệ qui" + +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:253 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) về nhánh hiện hành)" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " (không thể cập nhật tham chiếu (ref) nội bộ)" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu (ref) nội bộ" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" "một số tham chiếu (refs) nội bộ không thể được cập nhật; hãy thử chạy\n" -" 'git remote prune %s' để bỏ đi những nhánh cũ, hay bị xung đột" +" “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy (fetch) vào trong nhánh hiện tại %s của một kho chứa không " "phải kho trần (bare)" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "Không biết làm cách nào để lấy về (fetch) từ %s" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy (fetch) %s\n" -#: builtin/fetch.c:890 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "không thể fetch (lấy) %s" -#: builtin/fetch.c:907 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -3133,43 +4564,177 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:927 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:979 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:992 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <thông điệp>] [--log[=<n>]|--no-log] [--file <tập-tin>]" + +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:660 +msgid "populate log with at most <n> entries from shortlog" +msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog”" + +#: builtin/fmt-merge-msg.c:663 +msgid "alias for --log (deprecated)" +msgstr "bí danh cho --log (không được dùng)" + +#: builtin/fmt-merge-msg.c:666 +msgid "text" +msgstr "văn bản" + +#: builtin/fmt-merge-msg.c:667 +msgid "use <text> as start of message" +msgstr "dùng <văn bản thường> để bắt đầu ghi chú" + +#: builtin/fmt-merge-msg.c:668 +msgid "file to read from" +msgstr "tập tin để đọc dữ liệu từ đó" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [các-tùy-chọn] [<mẫu>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "trích dẫn để phù hợp cho perl" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "trích dẫn để phù hợp cho python" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "trích dẫn để phù hợp cho tcl" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "hiển thị chỉ <n> tham chiếu khớp" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "định dạng" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "định dạng sẽ dùng cho đầu ra" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "khóa" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "tên trường cần sắp xếp" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [các-tùy-chọn] [<đối-tượng>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "hiển thị các đối tượng không thể đọc được" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "hiển thị các đối tượng không được quản lý" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "báo cáo các thẻ" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "báo cáo node gốc" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "tạo “ index objects head nodes”" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "tạo reflogs head nodes (mặc định)" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "cũng cân nhắc đến các đối tượng gói và thay thế" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "cho phép kiểm tra hạn chế hơn" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "ghi các đối tượng không được quản lý trong .git/lost-found" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "hiển thị quá trình" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [các-tùy-chọn]" + #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" -msgstr "%s không hợp lệ: '%s'" +msgstr "%s không hợp lệ: “%s”" #: builtin/gc.c:90 #, c-format msgid "insanely long object directory %.*s" msgstr "thư mục đối tượng dài một cách điên rồ %.*s" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "xóa bỏ các đối tượng không được tham chiếu" -#: builtin/gc.c:224 +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "cẩn thận hơn nữa (tăng thời gian chạy)" + +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "bật chế độ auto-gc" + +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -3179,141 +4744,366 @@ msgstr "" "chạy lệnh \"git gc\" một cách thủ công. Hãy xem \"git help gc\" để biết thêm " "chi tiết.\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -"Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh 'git prune' " +"Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” " "để xóa bỏ chúng đi." -#: builtin/grep.c:216 +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [các-tùy-chọn] [-e] <mẫu> [<rev>...] [[--] <đường-dẫn>...]" + +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: gặp lỗi tạo tuyến (thread): %s" -#: builtin/grep.c:454 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "Gặp lỗi với lệnh chdir: %s" -#: builtin/grep.c:530 builtin/grep.c:564 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "không thể đọc cây (%s)" -#: builtin/grep.c:578 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" -#: builtin/grep.c:636 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" -msgstr "chuyển đến `%c' mong chờ một giá trị bằng số" +msgstr "chuyển đến “%c” cần một giá trị bằng số" -#: builtin/grep.c:653 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" -msgstr "không mở được '%s'" +msgstr "không mở được “%s”" + +#: builtin/grep.c:643 +msgid "search in index instead of in the work tree" +msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" + +#: builtin/grep.c:645 +msgid "find in contents not managed by git" +msgstr "tìm trong nội dung không được quản lý bởi git" + +#: builtin/grep.c:647 +msgid "search in both tracked and untracked files" +msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" + +#: builtin/grep.c:649 +msgid "search also in ignored files" +msgstr "tìm cả trong các tập tin đã bị lờ đi" + +#: builtin/grep.c:652 +msgid "show non-matching lines" +msgstr "hiển thị những dòng không khớp với mẫu" + +#: builtin/grep.c:654 +msgid "case insensitive matching" +msgstr "phân biệt chữ hoa/thường" + +#: builtin/grep.c:656 +msgid "match patterns only at word boundaries" +msgstr "chỉ khớp mẫu tại đường ranh giới từ" + +#: builtin/grep.c:658 +msgid "process binary files as text" +msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" + +#: builtin/grep.c:660 +msgid "don't match patterns in binary files" +msgstr "không khớp mẫu trong các tập tin nhị phân" + +#: builtin/grep.c:663 +msgid "descend at most <depth> levels" +msgstr "giảm xuống ít nhất mức <sâu>" + +#: builtin/grep.c:667 +msgid "use extended POSIX regular expressions" +msgstr "dùng biểu thức chính qui POSIX có mở rộng" + +#: builtin/grep.c:670 +msgid "use basic POSIX regular expressions (default)" +msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" + +#: builtin/grep.c:673 +msgid "interpret patterns as fixed strings" +msgstr "diễn dịch các mẫu như là chuỗi cố định" + +#: builtin/grep.c:676 +msgid "use Perl-compatible regular expressions" +msgstr "sử dụng biểu thức chính quy tương thích Perl" + +#: builtin/grep.c:679 +msgid "show line numbers" +msgstr "hiển thị số của dòng" + +#: builtin/grep.c:680 +msgid "don't show filenames" +msgstr "không hiển thị tên tập tin" + +#: builtin/grep.c:681 +msgid "show filenames" +msgstr "hiển thị các tên tập tin" + +#: builtin/grep.c:683 +msgid "show filenames relative to top directory" +msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" + +#: builtin/grep.c:685 +msgid "show only filenames instead of matching lines" +msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" + +#: builtin/grep.c:687 +msgid "synonym for --files-with-matches" +msgstr "đồng nghĩa với --files-with-matches" + +#: builtin/grep.c:690 +msgid "show only the names of files without match" +msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" + +#: builtin/grep.c:692 +msgid "print NUL after filenames" +msgstr "thêm NUL vào sau tên tập tin" + +#: builtin/grep.c:694 +msgid "show the number of matches instead of matching lines" +msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" + +#: builtin/grep.c:695 +msgid "highlight matches" +msgstr "tô sáng cái khớp" + +#: builtin/grep.c:697 +msgid "print empty line between matches from different files" +msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" + +#: builtin/grep.c:699 +msgid "show filename only once above matches from same file" +msgstr "" +"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" + +#: builtin/grep.c:702 +msgid "show <n> context lines before and after matches" +msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" + +#: builtin/grep.c:705 +msgid "show <n> context lines before matches" +msgstr "hiển thị <n> dòng nội dung trước khớp" + +#: builtin/grep.c:707 +msgid "show <n> context lines after matches" +msgstr "hiển thị <n> dòng nội dung sau khớp" + +#: builtin/grep.c:708 +msgid "shortcut for -C NUM" +msgstr "Dạng tắt cho -C SỐ" + +#: builtin/grep.c:711 +msgid "show a line with the function name before matches" +msgstr "hiển thị dòng vói tên hàm trước các lần khớp" + +#: builtin/grep.c:713 +msgid "show the surrounding function" +msgstr "hiển thị hàm bao quanh" + +#: builtin/grep.c:716 +msgid "read patterns from file" +msgstr "đọc mẫu từ tập-tin" + +#: builtin/grep.c:718 +msgid "match <pattern>" +msgstr "match <mẫu>" + +#: builtin/grep.c:720 +msgid "combine patterns specified with -e" +msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" -#: builtin/grep.c:917 +#: builtin/grep.c:732 +msgid "indicate hit with exit status without output" +msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất" + +#: builtin/grep.c:734 +msgid "show only matches from files that match all patterns" +msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)" + +#: builtin/grep.c:740 +msgid "pager" +msgstr "trang giấy" + +#: builtin/grep.c:740 +msgid "show matching files in the pager" +msgstr "hiển thị các tập tin khớp trong trang giấy" + +#: builtin/grep.c:743 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" + +#: builtin/grep.c:744 builtin/show-ref.c:184 +msgid "show usage" +msgstr "hiển thị cách dùng" + +#: builtin/grep.c:811 msgid "no pattern given." msgstr "chưa chỉ ra mẫu." -#: builtin/grep.c:931 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "đối tượng sai %s" -#: builtin/grep.c:972 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" -#: builtin/grep.c:995 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached hay --untracked không được sử dụng với --no-index." -#: builtin/grep.c:1000 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index hay --untracked không được sử dụng cùng với các tùy chọn liên " "quan đến revs." -#: builtin/grep.c:1003 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết." -#: builtin/grep.c:1011 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." -#: builtin/help.c:65 +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" +"git hash-object [-t <kiểu>] [-w] [--path=<tập-tin>|--no-filters] [--stdin] " +"[--] <tập-tin>..." + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <danh-sách-đường-dẫn>" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "kiểu" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "kiểu đối tượng" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "ghi đối tượng vào dữ liệu đối tượng" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "lưu các tập tin mà nó không có các bộ lọc" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "xử lý tập tin như là nó đang ở thư mục này" + +#: builtin/help.c:42 +msgid "print all available commands" +msgstr "hiển thị danh sách các câu lệnh người dùng có thể sử dụng" + +#: builtin/help.c:43 +msgid "show man page" +msgstr "hiển thị trang man" + +#: builtin/help.c:44 +msgid "show manual in web browser" +msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web" + +#: builtin/help.c:46 +msgid "show info page" +msgstr "hiện trang info" + +#: builtin/help.c:52 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "git help [--all] [--man|--web|--info] [lệnh]" + +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" -msgstr "không nhận ra định dạng trợ giúp '%s'" +msgstr "không nhận ra định dạng trợ giúp “%s”" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "Lỗi khởi chạy emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "phiên bản của emacsclient '%d' quá cũ (< 22)." +msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)." -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" -msgstr "gặp lỗi khi thực thi '%s': %s" +msgstr "gặp lỗi khi thực thi “%s”: %s" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." 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ế." +"“%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:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." 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:299 -msgid "The most commonly used git commands are:" -msgstr "Những lệnh git hay được sử dụng nhất là:" +"“%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:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." -msgstr "'%s': không rõ chương trình xem man." +msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:384 +#: builtin/help.c:366 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:392 +#: builtin/help.c:374 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:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "cách sử dụng: %s%s" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" -msgstr "`git %s' được đặt bí danh thành `%s'" +msgstr "“git %s” được đặt bí danh thành “%s”" #: builtin/index-pack.c:170 #, c-format @@ -3350,17 +5140,22 @@ 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:273 #, c-format msgid "unable to create '%s'" -msgstr "không thể tạo '%s'" +msgstr "không thể tạo “%s”" #: builtin/index-pack.c:278 #, c-format msgid "cannot open packfile '%s'" -msgstr "không thể mở packfile '%s'" +msgstr "không thể mở packfile “%s”" #: builtin/index-pack.c:292 msgid "pack signature mismatch" msgstr "chữ ký cho pack không khớp" +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "không hỗ trợ phiên bản pack %<PRIu32>" + #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" @@ -3467,93 +5262,123 @@ msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1105 +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "không thể tạo tuyến: %s" + +#: builtin/index-pack.c:1106 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "đầy đủ với %d đối tượng nội bộ" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Tổng kiểm tra tail không như mong đợi cho %s (đĩa hỏng?)" + +#: builtin/index-pack.c:1125 #, 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:1149 +#: builtin/index-pack.c:1150 #, 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:1228 +#: builtin/index-pack.c:1229 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1253 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin pack" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 #, c-format msgid "cannot write keep file '%s'" -msgstr "không thể ghi tập tin giữ lại '%s'" +msgstr "không thể ghi tập tin giữ lại “%s”" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1274 #, c-format msgid "cannot close written keep file '%s'" -msgstr "không thể đóng tập tin giữ lại đã được ghi '%s'" +msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”" -#: builtin/index-pack.c:1286 +#: builtin/index-pack.c:1287 msgid "cannot store pack file" msgstr "không thể lưu tập tin pack" -#: builtin/index-pack.c:1297 +#: builtin/index-pack.c:1298 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "sai pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "số tuyến chỉ ra không hợp lệ (%d)" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "không hỗ trợ đa tuyến, bỏ qua %s" + +#: builtin/index-pack.c:1399 #, c-format msgid "Cannot open existing pack file '%s'" -msgstr "Không thể mở tập tin pack đã sẵn có '%s'" +msgstr "Không thể mở tập tin pack đã sẵn có “%s”" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1401 #, c-format msgid "Cannot open existing pack idx file for '%s'" -msgstr "Không thể mở tập tin 'pack idx' cho '%s'" +msgstr "Không thể mở tập tin “pack idx” cho “%s”" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1448 #, 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:1454 +#: builtin/index-pack.c:1455 #, 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:1481 +#: builtin/index-pack.c:1482 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1558 +#: builtin/index-pack.c:1559 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:1562 builtin/index-pack.c:1572 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, 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'" +msgstr "tên tập tin packfile “%s” không được kết thúc bằng đuôi “.pack”" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" @@ -3570,22 +5395,22 @@ msgstr "tên mẫu dài một cách điên rồ %s" #: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" -msgstr "không thể lấy trạng thái (stat) về '%s'" +msgstr "không thể lấy trạng thái (stat) về “%s”" #: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" -msgstr "không thể stat (lấy trạng thái về) mẫu '%s'" +msgstr "không thể stat (lấy trạng thái về) mẫu “%s”" #: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" -msgstr "không thể opendir '%s'" +msgstr "không thể opendir “%s”" #: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" -msgstr "không thể readlink '%s'" +msgstr "không thể readlink “%s”" #: builtin/init-db.c:99 #, c-format @@ -3595,7 +5420,7 @@ msgstr "liên kết tượng trưng dài một cách điên rồ %s" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "không thể tạo liên kết tượng trưng (symlink) '%s' '%s'" +msgstr "không thể tạo liên kết tượng trưng (symlink) “%s” “%s”" #: builtin/init-db.c:106 #, c-format @@ -3620,7 +5445,7 @@ msgstr "các mẫu không được tìm thấy %s" #: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ '%s'" +msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ “%s”" #: builtin/init-db.c:192 #, c-format @@ -3645,7 +5470,7 @@ msgstr "không di chuyển được %s vào %s" #: 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'" +msgstr "Không thể tạo liên kết git “%s”" #. #. * TRANSLATORS: The first '%s' is either "Reinitialized @@ -3673,6 +5498,26 @@ msgstr " đã chia sẻ" msgid "cannot tell cwd" msgstr "không nói chuyện được với lệnh cwd" +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" +"quyền>]] [thư-mục]" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "các quyền" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "im lặng" + #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" @@ -3699,116 +5544,411 @@ msgstr "Không thể truy cập thư mục làm việc hiện hành" #: 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'" +msgstr "không thể truy cập cây (tree) làm việc “%s”" + +#: builtin/log.c:39 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git log [<các-tùy-chọn>] [<kể-từ>..<cho-đến>] [[--] <đường-dẫn>...]\n" + +#: builtin/log.c:40 +msgid " or: git show [options] <object>..." +msgstr " or: git show [các-tùy-chọn] <đối-tượng>..." + +#: builtin/log.c:102 +msgid "suppress diff output" +msgstr "chặn mọi kết xuất từ diff" + +#: builtin/log.c:103 +msgid "show source" +msgstr "hiển thị mã nguồn" + +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "Sử dụng tập tin ánh xạ thư" -#: builtin/log.c:189 +#: builtin/log.c:105 +msgid "decorate options" +msgstr "các tùy chọn trang trí" + +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "Không thể đọc đối tượng %s" -#: builtin/log.c:518 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "Không nhận ra kiểu: %d" -#: builtin/log.c:608 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:682 +#: builtin/log.c:701 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:693 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "Không thể mở tập tin miếng vá: %s" -#: builtin/log.c:707 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:715 +#: builtin/log.c:739 msgid "Not a range." msgstr "Không phải là một vùng." -#: builtin/log.c:789 +#: builtin/log.c:812 msgid "Cover letter needs email format" -msgstr "'Cover letter' cần cho định dạng thư" +msgstr "”Cover letter” cần cho định dạng thư" -#: builtin/log.c:862 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:935 +#: builtin/log.c:913 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [các-tùy-chọn] [<kể-từ> | <vùng-xem-xét>]" + +#: builtin/log.c:958 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: builtin/log.c:1157 +#: builtin/log.c:1097 +msgid "use [PATCH n/m] even with a single patch" +msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" + +#: builtin/log.c:1100 +msgid "use [PATCH] even with multiple patches" +msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" + +#: builtin/log.c:1104 +msgid "print patches to standard out" +msgstr "hiển thị miếng vá ra đầu ra chuẩn" + +#: builtin/log.c:1106 +msgid "generate a cover letter" +msgstr "tạo bì thư" + +#: builtin/log.c:1108 +msgid "use simple number sequence for output file names" +msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" + +#: builtin/log.c:1109 +msgid "sfx" +msgstr "sfx" + +#: builtin/log.c:1110 +msgid "use <sfx> instead of '.patch'" +msgstr "sử dụng <sfx> thay cho “.patch”" + +#: builtin/log.c:1112 +msgid "start numbering patches at <n> instead of 1" +msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" + +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" + +#: builtin/log.c:1116 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" + +#: builtin/log.c:1119 +msgid "store resulting files in <dir>" +msgstr "lưu các tập tin kết quả trong <t.mục>" + +#: builtin/log.c:1122 +msgid "don't strip/add [PATCH]" +msgstr "không strip/add [VÁ]" + +#: builtin/log.c:1125 +msgid "don't output binary diffs" +msgstr "không kết xuất diff (những khác biệt) nhị phân" + +#: builtin/log.c:1127 +msgid "don't include a patch matching a commit upstream" +msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" + +#: builtin/log.c:1129 +msgid "show patch format instead of default (patch + stat)" +msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" + +#: builtin/log.c:1131 +msgid "Messaging" +msgstr "Lời nhắn" + +#: builtin/log.c:1132 +msgid "header" +msgstr "đầu đề thư" + +#: builtin/log.c:1133 +msgid "add email header" +msgstr "thêm đầu đề thư" + +#: builtin/log.c:1134 builtin/log.c:1136 +msgid "email" +msgstr "thư điện tử" + +#: builtin/log.c:1134 +msgid "add To: header" +msgstr "thêm To: đầu đề thư" + +#: builtin/log.c:1136 +msgid "add Cc: header" +msgstr "thêm Cc: đầu đề thư" + +#: builtin/log.c:1138 +msgid "message-id" +msgstr "message-id" + +#: builtin/log.c:1139 +msgid "make first mail a reply to <message-id>" +msgstr "dùng thư đầu tiên để trả lời <message-id>" + +#: builtin/log.c:1140 builtin/log.c:1143 +msgid "boundary" +msgstr "ranh giới" + +#: builtin/log.c:1141 +msgid "attach the patch" +msgstr "đính kèm miếng vá" + +#: builtin/log.c:1144 +msgid "inline the patch" +msgstr "dùng miếng vá làm nội dung" + +#: builtin/log.c:1148 +msgid "enable message threading, styles: shallow, deep" +msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" + +#: builtin/log.c:1150 +msgid "signature" +msgstr "chữ ký" + +#: builtin/log.c:1151 +msgid "add a signature" +msgstr "thêm chữ ký" + +#: builtin/log.c:1153 +msgid "don't print the patch filenames" +msgstr "không hiển thị các tên tập tin của miếng vá" + +#: builtin/log.c:1202 #, 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:1202 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1204 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix và -k xung khắc nhau." -#: builtin/log.c:1212 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1214 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1216 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1239 +#: builtin/log.c:1284 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:1241 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" -msgstr "Không thể tạo thư mục '%s'" +msgstr "Không thể tạo thư mục “%s”" -#: builtin/log.c:1394 +#: builtin/log.c:1439 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:1498 +#: builtin/log.c:1488 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<thượng-nguồn> [<head> [<giới-hạn>]]]" + +#: builtin/log.c:1543 #, 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 " +"Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <thượng-nguồn> một cách " "thủ công.\n" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao (commit) %s" +#: builtin/ls-files.c:409 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [các-tùy-chọn] [<tập-tin>...]" + +#: builtin/ls-files.c:466 +msgid "identify the file status with tags" +msgstr "nhận dạng các trạng thái tập tin với thẻ" + +#: builtin/ls-files.c:468 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" +"dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không " +"thay đổi)" + +#: builtin/ls-files.c:470 +msgid "show cached files in the output (default)" +msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" + +#: builtin/ls-files.c:472 +msgid "show deleted files in the output" +msgstr "hiển thị các tập tin đã xóa trong kết xuất" + +#: builtin/ls-files.c:474 +msgid "show modified files in the output" +msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" + +#: builtin/ls-files.c:476 +msgid "show other files in the output" +msgstr "hiển thị các tập tin khác trong kết xuất" + +#: builtin/ls-files.c:478 +msgid "show ignored files in the output" +msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" + +#: builtin/ls-files.c:481 +msgid "show staged contents' object name in the output" +msgstr "hiển thị tên đối tượng của nội dung được lưu trạng thái ở kết xuất" + +#: builtin/ls-files.c:483 +msgid "show files on the filesystem that need to be removed" +msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" + +#: builtin/ls-files.c:485 +msgid "show 'other' directories' name only" +msgstr "chỉ hiển thị tên của các thư mục “khác”" + +#: builtin/ls-files.c:488 +msgid "don't show empty directories" +msgstr "không hiển thị thư mục rỗng" + +#: builtin/ls-files.c:491 +msgid "show unmerged files in the output" +msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" + +#: builtin/ls-files.c:493 +msgid "show resolve-undo information" +msgstr "hiển thị thông tin resolve-undo" + +#: builtin/ls-files.c:495 +msgid "skip files matching pattern" +msgstr "bỏ qua những tập tin khớp với một mẫu" + +#: builtin/ls-files.c:498 +msgid "exclude patterns are read from <file>" +msgstr "mẫu loại trừ được đọc từ <tập tin>" + +#: builtin/ls-files.c:501 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" + +#: builtin/ls-files.c:503 +msgid "add the standard git exclusions" +msgstr "thêm loại trừ tiêu chuẩn kiểu git" + +#: builtin/ls-files.c:506 +msgid "make the output relative to the project top directory" +msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" + +#: builtin/ls-files.c:509 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" + +#: builtin/ls-files.c:510 +msgid "tree-ish" +msgstr "tree-ish" + +#: builtin/ls-files.c:511 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" +"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" + +#: builtin/ls-files.c:513 +msgid "show debugging data" +msgstr "hiển thị dữ liệu gỡ lỗi" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "chỉ hiển thị các tree" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "đệ quy vào các thư mục con" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "hiển thị cây khi đệ quy" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "chấm dứt mục tin với byte NUL" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "gồm cả kích thước đối tượng" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "chỉ liệt kê tên tập tin" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "dùng tên đường dẫn đầy đủ" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "git merge [các-tùy-chọn] [<commit>...]" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [các-tùy-chọn] <tin-nhắn> HEAD <commit>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + #: builtin/merge.c:90 msgid "switch `m' requires a value" -msgstr "switch `m' yêu cầu một giá trị" +msgstr "switch “m” yêu cầu một giá trị" #: builtin/merge.c:127 #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "Không tìm thấy chiến lược hòa trộn '%s'.\n" +msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n" #: builtin/merge.c:128 #, c-format @@ -3820,6 +5960,67 @@ msgstr "Các chiến lược sẵn sàng là:" msgid "Available custom strategies are:" msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "(đồng nghĩa với --stat)" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "tạo một lần chuyển giao (commit) đưon thay vì thực hiện việc hòa trộn" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "sửa chú thích trước khi chuyển giao (commit)" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "cho phép fast-forward (mặc định)" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "bỏ qua nếu fast-forward không thể được" + +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 +msgid "strategy" +msgstr "chiến lược" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "chiến lược hòa trộn sẽ dùng" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "tùy_chọn=giá_trị" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" +"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn non-fast-forward)" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" + #: builtin/merge.c:240 msgid "could not run stash." msgstr "không thể chạy stash." @@ -3862,7 +6063,7 @@ msgstr "Không thông điệp hòa trộn -- không cập nhật HEAD\n" #: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" -msgstr "'%s' không chỉ đến một lần chuyển giao (commit) nào cả" +msgstr "“%s” không chỉ đến một lần chuyển giao (commit) nào cả" #: builtin/merge.c:535 #, c-format @@ -3873,102 +6074,99 @@ msgstr "Chuỗi branch.%s.mergeoptions sai: %s" msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "gặp lỗi khi đọc bộ nhớ tạm" - -#: builtin/merge.c:709 +#: builtin/merge.c:656 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" -#: builtin/merge.c:723 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:876 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" -msgstr "Không thể đọc từ '%s'" +msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:885 +#: builtin/merge.c:782 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Vẫn chưa hòa trộn các lần chuyển giao (commit); sử dụng lệnh 'git commit' để " +"Vẫn chưa hòa trộn các lần chuyển giao (commit); sử dụng lệnh “git commit” để " "hoàn tất việc hòa trộn.\n" -#: builtin/merge.c:891 +#: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "Hãy nhập vào các thông tin để giải thích tại sao sự hòa trộn này là cần " "thiết,\n" -"đặc biệt là khi nó hòa trộn dòng ngược đã cập nhật vào trong một nhánh " +"đặc biệt là khi nó hòa trộn ngược dòng đã cập nhật vào trong một nhánh " "topic.\n" "\n" -"Những dòng được bắt đầu bằng '#' sẽ được bỏ qua, và phần chú thích này nếu " +"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và phần chú thích này nếu " "rỗng\n" -"sẽ làm hủy bỏ lần chuyển giao (commit).\n" +"sẽ hủy bỏ lần chuyển giao (commit).\n" -#: builtin/merge.c:915 +#: builtin/merge.c:812 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:927 +#: builtin/merge.c:824 #, c-format msgid "Wonderful.\n" msgstr "Thần kỳ.\n" -#: builtin/merge.c:992 +#: builtin/merge.c:889 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao " "(commit) kết quả.\n" -#: builtin/merge.c:1008 +#: builtin/merge.c:905 #, c-format msgid "'%s' is not a commit" msgstr "%s không phải là một lần commit (chuyển giao)" -#: builtin/merge.c:1049 +#: builtin/merge.c:946 msgid "No current branch." msgstr "không phải nhánh hiện hành" -#: builtin/merge.c:1051 +#: builtin/merge.c:948 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:1053 +#: builtin/merge.c:950 msgid "No default upstream defined for the current branch." -msgstr "Không có dòng ngược mặc định được định nghĩa cho nhánh hiện hành." +msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." -#: builtin/merge.c:1058 +#: builtin/merge.c:955 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "Không nhánh mạng theo vết cho %s từ %s" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1042 builtin/merge.c:1199 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn" -#: builtin/merge.c:1213 +#: builtin/merge.c:1110 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1126 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3976,11 +6174,11 @@ msgstr "" "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại).\n" "Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1129 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại)." -#: builtin/merge.c:1236 +#: builtin/merge.c:1133 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3988,95 +6186,195 @@ msgstr "" "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" "Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1239 +#: builtin/merge.c:1136 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1248 +#: builtin/merge.c:1145 msgid "You cannot combine --squash with --no-ff." msgstr "Bạn không thể kết hợp --squash với --no-ff." -#: builtin/merge.c:1253 +#: builtin/merge.c:1150 msgid "You cannot combine --no-ff with --ff-only." msgstr "Bạn không thể kết hợp --no-ff với --ff-only." -#: builtin/merge.c:1260 +#: builtin/merge.c:1157 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Không chỉ ra lần chuyển giao (commit) và merge.defaultToUpstream chưa được " "đặt." -#: builtin/merge.c:1292 +#: builtin/merge.c:1189 msgid "Can merge only exactly one commit into empty head" msgstr "" "Không thể hòa trộn một cách đúng đắn một lần chuyển giao (commit) vào một " "head rỗng" -#: builtin/merge.c:1295 +#: builtin/merge.c:1192 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" -#: builtin/merge.c:1297 +#: builtin/merge.c:1194 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyển giao (commit) không-fast-forward không hợp lý ở trong một head trống " "rỗng" -#: builtin/merge.c:1412 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "Đang thử hòa trộn kiểu 'trivial in-index'...\n" +msgstr "Đang thử hòa trộn kiểu “trivial in-index”...\n" -#: builtin/merge.c:1457 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh fast-forward là không thể được, đang bỏ qua." -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Đang tua lại cây thành thời xa xưa...\n" -#: builtin/merge.c:1516 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s...\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1584 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1492 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Hòa trộn tự động đã trở nên tốt; bị dừng trước khi việc chuyển giao được yêu " "cầu\n" +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <commit> <commit>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <lần commit>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <lần commit>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <commit>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "xuất ra tất cả các ông bà, tổ tiên chung" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "tìm tổ tiên của hòa trộn n-way đơn" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "liệt kê các “rev” mà nó không thể đọc được từ cái khác" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "là cha mẹ đầu tiên của cái khác?" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" +"git merge-file [các-tùy-chọn] [-L tên1 [-L gốc [-L tên2]]] tập-tin1 tập-tin-" +"gốc tập-tin2" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "gửi kết quả vào đầu ra tiêu chuẩn" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "dùng kiểu hòa dựa trên diff3" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "để tránh xung đột, sử dụng phiên bản của chúng ta" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "để tránh xung đột, sử dụng phiên bản của họ" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "để tránh xung đột, sử dụng phiên bản kết hợp" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "để tránh xung đột, hãy sử dụng kích thước bộ tạo này" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "không cảnh báo về các xung đột xảy ra" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "đầu vào được chấm dứt bởi NUL" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "cho phép thiếu đối tượng" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "cho phép tạo nhiều hơn một cây" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [các-tùy-chọn] <nguồn>... <đích>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên" + #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" -msgstr "Đang kiểm tra việc đổi tên của '%s' thành '%s'\n" +msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n" #: builtin/mv.c:112 msgid "bad source" @@ -4110,7 +6408,7 @@ msgstr "đích đã tồn tại sẵn rồi" #: builtin/mv.c:181 #, c-format msgid "overwriting '%s'" -msgstr "đang ghi đè lên '%s'" +msgstr "đang ghi đè lên “%s”" #: builtin/mv.c:184 msgid "Cannot overwrite" @@ -4135,191 +6433,585 @@ msgstr "Đổi tên %s thành %s\n" msgid "renaming '%s' failed" msgstr "đổi tên %s gặp lỗi" +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [các-tùy-chọn] <commit>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [các-tùy-chọn] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [các-tùy-chọn] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "chỉ hiển thị tên (không SHA-1)" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "chỉ sử dụng các tham chiếu (refs) khớp với <mẫu>" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "" +"liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "đọc từ đầu vào tiêu chuẩn" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "cho phép hiển thị các tên “chưa định nghĩa“" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <notes_ref>] [list [<đối-tượng>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <notes_ref>] add [-f] [-m <lời-nhắn> | -F <tập-tin> | (-c | " +"-C) <đối-tượng>] [<đối-tượng>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <notes_ref>] copy [-f] <từ-đối-tượng> <đến-đối-tượng>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <notes_ref>] append [-m <lời-nhắn> | -F <tập-tin> | (-c | -" +"C) <đối-tượng>] [<đối-tượng>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <notes_ref>] edit [<đối-tượng>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <notes_ref>] show [<đối-tượng>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <chiến-lược> ] <notes_ref>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <notes_ref>] remove [<đối-tượng>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <notes_ref>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <notes_ref>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<đối tượng>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<các-tùy-chọn>] [<đối-tượng>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<các-tùy-chọn>] <từ-đối-tượng> <đến-đối-tượng>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<từ-đối-tượng> <đến-đối-tượng>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<các-tùy-chọn>] [<đối-tượng>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<đối tượng>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<đối tượng>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<các-tùy-chọn>] <notes_ref>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<các-tùy-chọn>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<các-tùy-chọn>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<đối tượng>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<các-tùy-chọn>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "không thể khởi chạy 'show' cho đối tượng '%s'" +msgstr "không thể khởi chạy “show” cho đối tượng “%s”" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" -msgstr "không thể fdopen 'show' (lệnh hiển thị) mô tả tập tin (fd) kết xuất" +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "không thể đọc kết xuất “show”" -#: builtin/notes.c:155 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" -msgstr "gặp lỗi khi đóng đường ống cho lệnh 'show' cho đối tượng '%s'" - -#: builtin/notes.c:158 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "gặp lỗi khi hoàn thành 'show' cho đối tượng '%s'" +msgstr "gặp lỗi khi hoàn thành “show” cho đối tượng “%s”" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" -msgstr "không thể tạo tập tin '%s'" +msgstr "không thể tạo tập tin “%s”" -#: builtin/notes.c:189 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "" "Xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n" -#: builtin/notes.c:215 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "không thể ghi đối tượng ghi chú (note)" -#: builtin/notes.c:217 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "Nội dung ghi chú còn lại %s" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" -msgstr "không thể đọc '%s'" +msgstr "không thể đọc “%s”" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" -msgstr "không thể mở để đọc hay ghi '%s'" +msgstr "không thể mở hay đọc “%s”" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "Gặp lỗi khi giải quyết '%s' như là một tham chiếu (ref) hợp lệ." +msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu (ref) hợp lệ." -#: builtin/notes.c:275 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." -msgstr "Gặp lỗi khi đọc đối tượng '%s'." +msgstr "Gặp lỗi khi đọc đối tượng “%s”." -#: builtin/notes.c:299 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "Không thể chuyển giao (commit) chưa được khởi tạo hoặc không được tham chiếu " "cây ghi chú" -#: builtin/notes.c:340 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" -msgstr "Giá trị notes.rewriteMode sai: '%s'" +msgstr "Giá trị notes.rewriteMode sai: “%s”" -#: builtin/notes.c:350 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài của refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" -msgstr "Giá trị %s sai: '%s'" +msgstr "Giá trị %s sai: “%s”" -#: builtin/notes.c:441 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." -msgstr "Dòng nhập vào dị hình: '%s'." +msgstr "Dòng nhập vào dị hình: “%s”." -#: builtin/notes.c:456 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "Gặp lỗi khi sao chép ghi chú (note) từ '%s' tới '%s'" +msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "quá nhiều đối số" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "không tìm thấy ghi chú cho đối tượng %s." -#: builtin/notes.c:580 +#: builtin/notes.c:534 builtin/notes.c:691 +msgid "note contents as a string" +msgstr "nội dung ghi chú (note) nằm trong một chuỗi" + +#: builtin/notes.c:537 builtin/notes.c:694 +msgid "note contents in a file" +msgstr "nội dung ghi chú (note) nằm trong một tập tin" + +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 +msgid "object" +msgstr "đối tượng" + +#: builtin/notes.c:540 builtin/notes.c:697 +msgid "reuse and edit specified note object" +msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra" + +#: builtin/notes.c:543 builtin/notes.c:700 +msgid "reuse specified note object" +msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra" + +#: builtin/notes.c:545 builtin/notes.c:613 +msgid "replace existing notes" +msgstr "thay thế ghi chú trước" + +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" "Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng " -"%s. Sử dụng tùy chọn '-f' để ghi đè lên các ghi chú cũ" +"%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n" -#: builtin/notes.c:635 +#: builtin/notes.c:614 +msgid "read objects from stdin" +msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn" + +#: builtin/notes.c:616 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)" + +#: builtin/notes.c:634 msgid "too few parameters" msgstr "quá ít đối số" -#: builtin/notes.c:656 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" "Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối " -"tượng %s. Sử dụng tùy chọn '-f' để ghi đè lên các ghi chú cũ" +"tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:668 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Thiếu ghi chú trên đối tượng nguốn %s. Không thể sao chép." -#: builtin/notes.c:717 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -"Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con 'edit'.\n" -"Xin hãy sử dụng lệnh sau để thay thế: 'git notes add -f -m/-F/-c/-C'.\n" +"Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n" +"Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n" -#: builtin/notes.c:971 +#: builtin/notes.c:863 +msgid "General options" +msgstr "Tùy chọn chung" + +#: builtin/notes.c:865 +msgid "Merge options" +msgstr "Tùy chọn về hòa trộn" + +#: builtin/notes.c:867 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/" +"theirs/union/cat_sort_uniq)" + +#: builtin/notes.c:869 +msgid "Committing unmerged notes" +msgstr "Chuyển giao các note chưa được hòa trộn" + +#: builtin/notes.c:871 +msgid "finalize notes merge by committing unmerged notes" +msgstr "" +"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " +"giao" + +#: builtin/notes.c:873 +msgid "Aborting notes merge resolution" +msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" + +#: builtin/notes.c:875 +msgid "abort notes merge" +msgstr "bỏ qua hòa trộn các ghi chú (note)" + +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "Đối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:982 +msgid "attempt to remove non-existent note is not an error" +msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" + +#: builtin/notes.c:985 +msgid "read object names from the standard input" +msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" + +#: builtin/notes.c:1066 +msgid "notes_ref" +msgstr "notes_ref" + +#: builtin/notes.c:1067 +msgid "use notes from <notes_ref>" +msgstr "dùng “notes” từ <notes_ref>" + +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "" +"git pack-objects --stdout [các-tùy-chọn...] [< danh-sách-ref | < danh-sách-" +"đối-tượng]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "" +"git pack-objects [các-tùy-chọn...] base-name [< danh-sách-ref | < danh-sách-" +"đối-tượng]" + #: 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 +#: builtin/pack-objects.c:2397 #, 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:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" -msgstr "phiên bản mục lục sai '%s'" +msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, 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:2429 +#: builtin/pack-objects.c:2428 #, 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" +msgstr "không thể phân tích giá trị “%s” cho tùy chọn %s" + +#: builtin/pack-objects.c:2447 +msgid "do not show progress meter" +msgstr "không hiển thị bộ đo tiến trình" + +#: builtin/pack-objects.c:2449 +msgid "show progress meter" +msgstr "hiển thị bộ đo tiến trình" + +#: builtin/pack-objects.c:2451 +msgid "show progress meter during object writing phase" +msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" + +#: builtin/pack-objects.c:2454 +msgid "similar to --all-progress when progress meter is shown" +msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" + +#: builtin/pack-objects.c:2455 +msgid "version[,offset]" +msgstr "phiên bản[,offset]" + +#: builtin/pack-objects.c:2456 +msgid "write the pack index file in the specified idx format version" +msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" + +#: builtin/pack-objects.c:2459 +msgid "maximum size of each output pack file" +msgstr "kcíh thước tối đa cho tập tin gói được tạo" + +#: builtin/pack-objects.c:2461 +msgid "ignore borrowed objects from alternate object store" +msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" + +#: builtin/pack-objects.c:2463 +msgid "ignore packed objects" +msgstr "bỏ qua các đối tượng đóng gói" + +#: builtin/pack-objects.c:2465 +msgid "limit pack window by objects" +msgstr "giới hạn cửa sổ đóng gói theo đối tượng" + +#: builtin/pack-objects.c:2467 +msgid "limit pack window by memory in addition to object limit" +msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" + +#: builtin/pack-objects.c:2469 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả" + +#: builtin/pack-objects.c:2471 +msgid "reuse existing deltas" +msgstr "dùng lại các delta sẵn có" + +#: builtin/pack-objects.c:2473 +msgid "reuse existing objects" +msgstr "dùng lại các đối tượng sẵn có" + +#: builtin/pack-objects.c:2475 +msgid "use OFS_DELTA objects" +msgstr "dùng các đối tượng OFS_DELTA" + +#: builtin/pack-objects.c:2477 +msgid "use threads when searching for best delta matches" +msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất" + +#: builtin/pack-objects.c:2479 +msgid "do not create an empty pack output" +msgstr "không thể tạo kết xuất gói (pack) trống rỗng" + +#: builtin/pack-objects.c:2481 +msgid "read revision arguments from standard input" +msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn" + +#: builtin/pack-objects.c:2483 +msgid "limit the objects to those that are not yet packed" +msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" + +#: builtin/pack-objects.c:2486 +msgid "include objects reachable from any reference" +msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" + +#: builtin/pack-objects.c:2489 +msgid "include objects referred by reflog entries" +msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" + +#: builtin/pack-objects.c:2492 +msgid "output pack to stdout" +msgstr "xuất gói ra đầu ra tiêu chuẩn" + +#: builtin/pack-objects.c:2494 +msgid "include tag objects that refer to objects to be packed" +msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" + +#: builtin/pack-objects.c:2496 +msgid "keep unreachable objects" +msgstr "giữ lại các đối tượng không thể đọc được" + +#: builtin/pack-objects.c:2497 parse-options.h:141 +msgid "time" +msgstr "thời-gian" + +#: builtin/pack-objects.c:2498 +msgid "unpack unreachable objects newer than <time>" +msgstr "" +"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" + +#: builtin/pack-objects.c:2501 +msgid "create thin packs" +msgstr "tạo gói nhẹ" + +#: builtin/pack-objects.c:2503 +msgid "ignore packs that have companion .keep file" +msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" + +#: builtin/pack-objects.c:2505 +msgid "pack compression level" +msgstr "mức nén gói" + +#: builtin/pack-objects.c:2507 +msgid "do not hide commits by grafts" +msgstr "không ẩn các lần chuyển giao bởi “grafts”" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [các-tùy-chọn]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "đóng gói mọi thứ" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "prune (cắt cụt) những tham chiếu (refs) bị mất (mặc định)" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <thời-gian>] [--] [<head>...]" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "không gỡ bỏ, chỉ hiển thị" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "báo cáo các đối tượng đã prune" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>...]]" #: builtin/push.c:45 msgid "tag shorthand without <tag>" @@ -4335,8 +7027,8 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong 'git help " -"config'." +"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help " +"config”." #: builtin/push.c:102 #, c-format @@ -4352,8 +7044,8 @@ msgid "" " git push %s %s\n" "%s" msgstr "" -"Nhánh dòng ngược (upstream) của nhánh hiện tại của bạn không khớp\n" -"với tên của nhánh hiện tại của bạn. Để push đến nhánh dòng ngược\n" +"Nhánh thượng nguồn (upstream) của nhánh hiện tại của bạn không khớp\n" +"với tên của nhánh hiện tại của bạn. Để push đến nhánh thượng nguồn\n" "trên máy chủ, sử dụng\n" "\n" " git push %s HEAD:%s\n" @@ -4386,8 +7078,8 @@ msgid "" "\n" " git push --set-upstream %s %s\n" msgstr "" -"Nhánh hiện tại %s không có nhánh dòng ngược (upstream) nào.\n" -"Để push (đẩy lên) nhánh hiện tại và đặt máy chủ như là dòng ngược " +"Nhánh hiện tại %s không có nhánh thượng nguồn (upstream) nào.\n" +"Để push (đẩy lên) nhánh hiện tại và đặt máy chủ như là thượng nguồn " "(upstream), sử dụng\n" "\n" " git push --set-upstream %s %s\n" @@ -4395,7 +7087,7 @@ msgstr "" #: builtin/push.c:136 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "Nhánh hiện tại %s có đa nhánh dòng ngược (upstream), từ chối push." +msgstr "Nhánh hiện tại %s có đa nhánh thượng nguồn (upstream), từ chối push." #: builtin/push.c:139 #, c-format @@ -4404,9 +7096,9 @@ msgid "" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"Bạn đang push (đẩy lên) máy chủ '%s', mà nó không phải là dòng ngược " +"Bạn đang push (đẩy lên) máy chủ “%s”, mà nó không phải là thượng nguồn " "(upstream) của\n" -"nhánh hiện tại '%s' của bạn, mà không báo cho tôi biết là cái gì được push\n" +"nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n" "để cập nhật nhánh máy chủ nào." #: builtin/push.c:151 @@ -4426,20 +7118,21 @@ msgid "" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" -"push.default chưa được đặt; giá trị ngầm định của nó đã được thay đổi trong\n" -"Git 2.0 từ 'matching' thành 'simple'. Để chấm dứt lời nhắc nhở này\n" -"và duy trì cách xử lý sau những thay đổi mặc định này, hãy chạy lệnh:\n" +"biến push.default chưa được đặt; giá trị ngầm định của nó\n" +"đã được thay đổi trong Git 2.0 từ “matching” thành “simple”.\n" +"Để không hiển thị nhắc nhở này và duy trì cách xử lý sau\n" +"những thay đổi mặc định này, hãy chạy lệnh:\n" "\n" " git config --global push.default matching\n" "\n" -"Để chấm dứt lời nhắc nhở này và sử dụng cách xử lý mới, hãy chạy lệnh:\n" +"Để không hiển thị nhắc nhở này và áp dụng cách xử lý mới, hãy chạy lệnh:\n" "\n" " git config --global push.default simple\n" "\n" -"Xem 'git help config' và tìm đến 'push.default' để có thêm thông tin.\n" -"(chế độ 'simple' được bắt đầu sử dụng từ Git 1.7.11. Sử dụng chế độ tương " +"Xem “git help config” và tìm đến “push.default” để có thêm thông tin.\n" +"(chế độ “simple” được bắt đầu sử dụng từ Git 1.7.11. Sử dụng chế độ tương " "tự\n" -"'current' thay vì 'simple' nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)" +"“current” thay vì “simple” nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)" #: builtin/push.c:199 msgid "" @@ -4456,10 +7149,10 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" -"phận tương ứng của máy chủ. Hòa trộn với các thay đổi từ máy chủ (v.d. 'git " -"pull')\n" +"phận tương ứng của máy chủ. Hòa trộn với các thay đổi từ máy chủ (v.d. “git " +"pull”)\n" "trước khi lại push lần nữa.\n" -"Xem trong phần 'Note about fast-forwards' từ lệnh 'git push --help' để có " +"Xem trong phần “Note about fast-forwards” từ lệnh “git push --help” để có " "thông tin chi tiết." #: builtin/push.c:212 @@ -4472,9 +7165,9 @@ msgstr "" "Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" "phận tương ứng của máy chủ. Nếu bạn không có ý định push nhánh đó, bạn có lẽ " "muốn\n" -"chỉ định các nhánh để push hoặt là đặt nội dung cho biến cấu hình 'push." -"default'\n" -"thành 'simple', 'current' hoặc 'upstream' để chỉ push nhánh hiện hành mà " +"chỉ định các nhánh để push hoặt là đặt nội dung cho biến cấu hình “push." +"default”\n" +"thành “simple”, “current” hoặc “upstream” để chỉ push nhánh hiện hành mà " "thôi." #: builtin/push.c:218 @@ -4487,26 +7180,58 @@ msgstr "" "Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" "phận tương ứng của máy chủ. Checkou nhánh này và hòa trộn với các thay đổi " "từ máy chủ\n" -"(v.d. 'git pull') trước khi lại push lần nữa.\n" -"Xem trong phần 'Note about fast-forwards' từ lệnh 'git push --help' để có " +"(v.d. “git pull”) trước khi lại push lần nữa.\n" +"Xem trong phần “Note about fast-forwards” từ lệnh “git push --help” để có " "thông tin chi tiết." -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Việc cập nhật bị từ chối bởi vì máy chủ có chứa công việc mà bạn không\n" +"có ở máy nội bộ của mình. Lỗi này thường có nguyên nhân bởi kho khác đẩy dữ " +"liệu lên\n" +"cùng một tham chiếu. Bạn có lẽ muốn hòa trộn với các thay đổi từ máy chủ\n" +"(v.d. “git pull”) trước khi lại push lần nữa.\n" +"Xem trong phần “Note about fast-forwards” từ lệnh “git push --help” để có " +"thông tin chi tiết." + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ." + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"Không thể cập nhật một tham chiếu trên máy chủ mà nó chỉ đến đối tượng " +"không\n" +"phải chuyển giao, hoặc cập nhật một tham chiếu máy chủ để nó chỉ đến đối " +"tượng\n" +"không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "Đang push (đẩy) lên %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" -msgstr "gặp lỗi khi push (đẩy lên) một số tham chiếu (ref) đến '%s'" +msgstr "gặp lỗi khi push (đẩy lên) một số tham chiếu (ref) đến “%s”" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" -msgstr "repository (kho) sai '%s'" +msgstr "repository (kho) sai “%s”" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4527,34 +7252,241 @@ msgstr "" "\n" " git push <tên>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "--all không thể được tổ hợp cùng với refspecs" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "--mirror không thể được tổ hợp cùng với refspecs" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:410 +#: builtin/push.c:419 +msgid "repository" +msgstr "kho" + +#: builtin/push.c:420 +msgid "push all refs" +msgstr "push tất cả refs" + +#: builtin/push.c:421 +msgid "mirror all refs" +msgstr "mirror tất cả refs" + +#: builtin/push.c:423 +msgid "delete refs" +msgstr "xóa refs" + +#: builtin/push.c:424 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "" +"các thẻ push (không thể sử dụng cùng với các tùy chọn --all hay --mirror)" + +#: builtin/push.c:427 +msgid "force updates" +msgstr "ép buộc cập nhật" + +#: builtin/push.c:428 +msgid "check" +msgstr "kiểm tra" + +#: builtin/push.c:429 +msgid "control recursive pushing of submodules" +msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" + +#: builtin/push.c:431 +msgid "use thin pack" +msgstr "tạo gói nhẹ" + +#: builtin/push.c:432 builtin/push.c:433 +msgid "receive pack program" +msgstr "nhận về chương trình pack" + +#: builtin/push.c:434 +msgid "set upstream for git pull/status" +msgstr "đặt thượng nguồn (upstream) cho git pull/status" + +#: builtin/push.c:437 +msgid "prune locally removed refs" +msgstr "prune (cắt cụt) những tham chiếu (refs) bị gỡ bỏ" + +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "vòng qua “pre-push hook”" + +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu (refs) nào" +#: builtin/read-tree.c:36 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<tiền-" +"tố>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] " +"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-" +"ish3>]])" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "ghi mục lục kết quả vào <tập-tin>" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "chỉ với bảng mục lục trống rỗng" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "Hòa trộn" + +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "thực hiện một hòa trộn thêm vào việc đọc" + +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "" +"hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu " + +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "hòa trộn 3-way trong sự hiện diện của “adds” và “removes”" + +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<thư-mục-con>/" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "cập nhật cây làm việc với kết quả hòa trộn" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "không kiểm tra cây làm việc sau hòa trộn" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "không cập nhật bảng mục lục hay cây làm việc" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "gỡ lỗi unpack-trees" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:12 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <tên> <url>" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <tên-cũ> <tên-mới>" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <tên>" + +#: builtin/remote.c:15 builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <tên> (-a | -d | <nhánh>)" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <tên>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <tên>" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<nhóm> | <máy-chủ>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <tên> <nhánh>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <tên> <url-mới>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <tên> <url>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<các-tùy-chọn>] <tên> <url>" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <tên> <nhánh>..." + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <tên> <nhánh>..." + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<các-tùy-chọn>] <tên>" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<các-tùy-chọn>] <tên>" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<các-tùy-chọn>] [<nhóm> | <máy-chủ>]..." + #: builtin/remote.c:98 #, c-format msgid "Updating %s" @@ -4573,13 +7505,42 @@ msgstr "" msgid "unknown mirror argument: %s" msgstr "không hiểu tham số máy bản sao (mirror): %s" +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "lấy về (fetch) các nhánh từ máy chủ" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "" +"nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy về (fetch)" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "hoặc không lấy về (fetch) bất kỳ thẻ nào (--no-tags)" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "các nhánh theo vết" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "nhánh master" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó" + #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "đang chỉ định một nhánh master không hợp lý với tùy chọn --mirror" #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "chỉ định những nhánh để theo vết chỉ hợp lý với các 'fetch mirror'" +msgstr "chỉ định những nhánh để theo vết chỉ hợp lý với các “fetch mirror”" #: builtin/remote.c:195 builtin/remote.c:646 #, c-format @@ -4589,12 +7550,12 @@ msgstr "máy chủ %s đã tồn tại rồi." #: builtin/remote.c:199 builtin/remote.c:650 #, c-format msgid "'%s' is not a valid remote name" -msgstr "'%s' không phải tên máy chủ hợp lệ" +msgstr "“%s” không phải tên máy chủ hợp lệ" #: builtin/remote.c:243 #, c-format msgid "Could not setup master '%s'" -msgstr "Không thể cài đặt nhánh master '%s'" +msgstr "Không thể cài đặt nhánh master “%s”" #: builtin/remote.c:299 #, c-format @@ -4608,16 +7569,16 @@ msgstr "Không thể lấy ánh xạ (map) fetch cho refspec %s" #: builtin/remote.c:440 builtin/remote.c:448 msgid "(matching)" -msgstr "(mẫu)" +msgstr "(khớp)" #: builtin/remote.c:452 msgid "(delete)" -msgstr "(xoá)" +msgstr "(xóa)" #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 #, c-format msgid "Could not append '%s' to '%s'" -msgstr "Không thể nối thêm '%s' vào '%s'" +msgstr "Không thể nối thêm “%s” vào “%s”" #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 #, c-format @@ -4627,12 +7588,12 @@ msgstr "Không có máy chủ nào như thế: %s" #: builtin/remote.c:656 #, c-format msgid "Could not rename config section '%s' to '%s'" -msgstr "Không thể đổi tên chương (section) cấu hình từ '%s' thành '%s'" +msgstr "Không thể đổi tên chương (section) cấu hình từ “%s” thành “%s”" #: builtin/remote.c:662 builtin/remote.c:799 #, c-format msgid "Could not remove config section '%s'" -msgstr "Không thể gỡ bỏ chương (section) cấu hình '%s'" +msgstr "Không thể gỡ bỏ chương (section) cấu hình “%s”" #: builtin/remote.c:677 #, c-format @@ -4641,19 +7602,19 @@ msgid "" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" -"Không cập nhật 'non-default fetch respec'\n" +"Không cập nhật “non-default fetch respec”\n" "\t%s\n" "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết." #: builtin/remote.c:683 #, c-format msgid "Could not append '%s'" -msgstr "Không thể nối thêm '%s'" +msgstr "Không thể nối thêm “%s”" #: builtin/remote.c:694 #, c-format msgid "Could not set '%s'" -msgstr "Không thể đặt '%s'" +msgstr "Không thể đặt “%s”" #: builtin/remote.c:716 #, c-format @@ -4692,11 +7653,11 @@ msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)" #: builtin/remote.c:946 msgid " tracked" -msgstr " bị theo vết" +msgstr " được theo vết" #: builtin/remote.c:948 msgid " stale (use 'git remote prune' to remove)" -msgstr " cũ (dùng 'git remote prune' để gỡ bỏ)" +msgstr " cũ (dùng “git remote prune” để gỡ bỏ)" #: builtin/remote.c:950 msgid " ???" @@ -4770,6 +7731,10 @@ msgstr " %-*s ép buộc thành %s" msgid " %-*s pushes to %s" msgstr " %-*s push tới %s" +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "không truy vấn các máy chủ" + #: builtin/remote.c:1118 #, c-format msgid "* remote %s" @@ -4814,19 +7779,27 @@ msgstr " (trạng thái không được yêu cầu)" #: builtin/remote.c:1163 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" -msgstr[0] " Nhánh nội bộ đã được cấu hình cho lệnh 'git pull':" -msgstr[1] " Những nhánh nội bộ đã được cấu hình cho lệnh 'git pull':" +msgstr[0] " Nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" +msgstr[1] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" #: builtin/remote.c:1171 msgid " Local refs will be mirrored by 'git push'" -msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh 'git push'" +msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”" #: builtin/remote.c:1178 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" -msgstr[0] " Tham chiếu nội bộ được cấu hình cho lệnh 'git push'%s:" -msgstr[1] " Những tham chiếu nội bộ được cấu hình cho lệnh 'git push'%s:" +msgstr[0] " Tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" +msgstr[1] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" + +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "xóa refs/remotes/<tên>/HEAD" #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" @@ -4881,15 +7854,35 @@ msgstr " * [nên xén bớt] %s" msgid " * [pruned] %s" msgstr " *[đã xén bớ] %s" +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "cắt máy chủ sau khi lấy về" + #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" -msgstr "Không có máy chủ nào có tên '%s'" +msgstr "Không có máy chủ nào có tên “%s”" + +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "thêm nhánh" #: builtin/remote.c:1414 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "đẩy các “URL” bằng tay" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "thêm URL" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "xóa URLs" + #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" @@ -4908,6 +7901,56 @@ msgstr "Không tìm thấy URL như vậy: %s" msgid "Will not delete all non-push URLs" msgstr "Sẽ không xóa những địa chỉ URL không-push" +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "chi tiết; phải được đặt trước một lệnh-con" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <đối-tượng> <thay-thế>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <đối tượng>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<mẫu>]" + +#: builtin/replace.c:121 +msgid "list replace refs" +msgstr "liệt kê các refs thay thế" + +#: builtin/replace.c:122 +msgid "delete replace refs" +msgstr "xóa tham chiếu (refs) thay thế" + +#: builtin/replace.c:123 +msgid "replace the ref if it exists" +msgstr "thay thế tham chiếu (ref) nếu nó đã sẵn có" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "sổ ghi dọn sạch các phân giải trong bản mục lục" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <tree-ish> [--] <đường-dẫn>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<tree-ish>] [--] [<các-đường-dẫn>...]" + #: builtin/reset.c:33 msgid "mixed" msgstr "pha trộn" @@ -4928,134 +7971,496 @@ msgstr "hòa trộn" msgid "keep" msgstr "giữ lại" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "Bạn không có HEAD nào hợp lệ." -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "Gặp lỗi khi tìm cây của HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "Gặp lỗi khi tìm cây của %s." -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "Không thể ghi tập tin lưu bảng mục lục mới." - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD hiện giờ tại %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "Không thể đọc bảng mục lục" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format 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:303 +#: builtin/reset.c:248 +msgid "be quiet, only report errors" +msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" + +#: builtin/reset.c:250 +msgid "reset HEAD and index" +msgstr "đặt lại (reset) HEAD và bảng mục lục" + +#: builtin/reset.c:251 +msgid "reset only HEAD" +msgstr "chỉ đặt lại (reset) HEAD" + +#: builtin/reset.c:253 builtin/reset.c:255 +msgid "reset HEAD, index and working tree" +msgstr "đặt lại HEAD, bảng mục lục và cây làm việc" + +#: builtin/reset.c:257 +msgid "reset HEAD but keep local changes" +msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ" + +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ." + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." -msgstr "không thể phân tích đối tượng '%s'." +msgstr "không thể phân tích đối tượng “%s”." + +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ." -#: builtin/reset.c:308 +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khắc với --{hard,mixed,soft}" -#: builtin/reset.c:317 +#: builtin/reset.c:301 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>'." +"--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:319 +#: builtin/reset.c:303 #, 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:331 +#: builtin/reset.c:313 #, 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:347 +#: builtin/reset.c:333 #, 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'." +msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét lại “%s”." + +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "Không thể ghi tập tin lưu bảng mục lục mới." + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [các-tùy-chọn] -- [<th.số>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "giữ “--“ chuyển qua làm tham số" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" + +#: builtin/rev-parse.c:464 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [options] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" +"git rev-parse --parseopt [các-tùy-chọn] -- [<đ.số>...]\n" +" or: git rev-parse --sq-quote [<đ.số>...]\n" +" or: git rev-parse [các-tùy-chọn] [<đ.số>...]\n" +"\n" +"Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng." + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "git revert [các-tùy-chọn] <commit-ish>" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <lệnh-con>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "git cherry-pick [các-tùy-chọn] <commit-ish>" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <lệnh-con>" #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s không thể được sử dụng với %s" -#: builtin/revert.c:131 +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "kết thúc cherry-pick hay revert liên tiếp nhau" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "phục hồi lại cherry-pick hay revert liên tiếp nhau" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "không cherry-pick hay revert liên tiếp nhau" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "không commit một cách tự động." + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "sửa lại chú thích cho commit" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "số của cha mẹ" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "chiến lược hòa trộn" + +#: builtin/revert.c:113 +msgid "option" +msgstr "tùy chọn" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "tùy chọn cho chiến lược hòa trộn" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "nối thêm tên lần chuyển giao (commit)" + +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "cho phép fast-forward" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "cấm khởi tạo lần chuyển giao trống rỗng" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "chấp nhận chuyển giao (commit) mà không ghi chú gì" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "giữ lại các lần chuyển giao dư thừa, rỗng" + +#: builtin/revert.c:133 msgid "program error" msgstr "lỗi chương trình" -#: builtin/revert.c:221 +#: builtin/revert.c:223 msgid "revert failed" msgstr "revert gặp lỗi" -#: builtin/revert.c:236 +#: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "cherry-pick gặp lỗi" -#: builtin/rm.c:109 +#: builtin/rm.c:15 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [các-tùy-chọn] [--] <tập-tin>..." + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"mô-đun-con “%s” (hoặc cái nằm trong các mô-đun-con) dùng thư mục .git\n" +"(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " +"chúng)" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" -"'%s' có nội dung được lưu trạng thái khác biệt từ cả tập tin và cả HEAD\n" +"“%s” có nội dung được lưu trạng thái khác biệt từ cả tập tin và cả HEAD\n" "(dùng tùy chọn -f để ép buộc gỡ bỏ)" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"'%s' có các thay đổi được lưu trạng thái trong bảng mục lục\n" +"“%s” có các thay đổi được lưu trạng thái trong bảng mục lục\n" "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"'%s' có các thay đổi nội bộ\n" +"“%s” có các thay đổi nội bộ\n" "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" -#: builtin/rm.c:194 +#: builtin/rm.c:207 +msgid "do not list removed files" +msgstr "không liệt kê các tập tin đã gỡ bỏ" + +#: builtin/rm.c:208 +msgid "only remove from the index" +msgstr "chỉ gỡ bỏ từ mục lục" + +#: builtin/rm.c:209 +msgid "override the up-to-date check" +msgstr "ghi đè lên kiểm tra cập nhật" + +#: builtin/rm.c:210 +msgid "allow recursive removal" +msgstr "cho phép gỡ bỏ đệ qui" + +#: builtin/rm.c:212 +msgid "exit with a zero status even if nothing matched" +msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" + +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "không thể gỡ bỏ '%s' một cách đệ qui mà không có tùy chọn -r" +msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" + +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "Thiếu tên tác giả: %s" +#: builtin/shortlog.c:229 +msgid "sort output according to the number of commits per author" +msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả" + +#: builtin/shortlog.c:231 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao" + +#: builtin/shortlog.c:233 +msgid "Show the email address of each author" +msgstr "Hiển thị thư điện tử cho từng tác giả" + +#: builtin/shortlog.c:234 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:235 +msgid "Linewrap output" +msgstr "Ngắt dòng khi quá dài" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" +msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<khi>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g|--reflog)[=<n>[,<nền>]] [--list] [<ref>]" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "hiển thị các nhánh remote-tracking và nội bộ" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "hiển thị các nhánh remote-tracking" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "màu “*!+-” tương ứng với nhánh" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "đồng nghĩa với more=-1" + +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "chặn các chuỗi đặt tên" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "bao gồm nhánh hiện hành" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "hiển thị các lần chuyển giao nơi mà cha mẹ đến trước con của nó" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "<n>[,<cơ sở>]" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mẫu*] " + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=mẫu] < ref-list" + +#: builtin/show-ref.c:165 +msgid "only show tags (can be combined with heads)" +msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)" + +#: builtin/show-ref.c:166 +msgid "only show heads (can be combined with tags)" +msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)" + +#: builtin/show-ref.c:167 +msgid "stricter reference checking, requires exact ref path" +msgstr "" +"việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu " +"(ref)" + +#: builtin/show-ref.c:170 builtin/show-ref.c:172 +msgid "show the HEAD reference" +msgstr "hiển thị tham chiếu của HEAD" + +#: builtin/show-ref.c:174 +msgid "dereference tags into object IDs" +msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng" + +#: builtin/show-ref.c:176 +msgid "only show SHA1 hash using <n> digits" +msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số" + +#: builtin/show-ref.c:180 +msgid "do not print results to stdout (useful with --verify)" +msgstr "" +"không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)" + +#: builtin/show-ref.c:182 +msgid "show refs from stdin that aren't in local repository" +msgstr "" +"hiển thị các tham chiếu (refs) từ đầu vào tiêu chuẩn (stdin) cái mà không ở " +"kho nội bộ" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "git symbolic-ref [các-tùy-chọn] tên [t.chiếu]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "git symbolic-ref -d [-q] tên" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" +"chặn các thông tin lỗi cho các tham chiếu (refs) “non-symbolic” (bị tách ra)" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "xóa tham chiếu (ref) tượng trưng" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "làm ngắn kết xuất ref (tham chiếu)" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason" +msgstr "lý do" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "lý do cập nhật" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <tập-tin>] <tên-thẻ> [<head>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <tên-thẻ>..." + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <đối-tượng>] \n" +"\t\t[<mẫu>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <tên-thẻ>..." + #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" -msgstr "đối tượng dị hình tại '%s'" +msgstr "đối tượng dị hình tại “%s”" #: builtin/tag.c:207 #, c-format @@ -5065,165 +8470,375 @@ msgstr "tên thẻ quá dài: %.*s..." #: builtin/tag.c:212 #, c-format msgid "tag '%s' not found." -msgstr "không tìm thấy tìm thấy thẻ '%s'." +msgstr "không tìm thấy tìm thấy thẻ “%s”." #: builtin/tag.c:227 #, c-format msgid "Deleted tag '%s' (was %s)\n" -msgstr "Thẻ đã bị xóa '%s' (trước là %s)\n" +msgstr "Thẻ đã bị xóa “%s” (trước là %s)\n" #: builtin/tag.c:239 #, c-format msgid "could not verify the tag '%s'" -msgstr "không thể thẩm tra thẻ '%s'" +msgstr "không thể thẩm tra thẻ “%s”" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# Viết các ghi chú cho (thẻ) tag\n" -"# Những dòng được bắt đầu bằng '#' sẽ được bỏ qua.\n" -"#\n" +"Viết các ghi chú cho (thẻ) tag\n" +"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# Viết các ghi chú cho (thẻ) tag\n" -"# Những dòng được bắt đầu bằng '#' sẽ được bỏ qua; bạn có thể xóa chúng đi " +"Viết các ghi chú cho (thẻ) tag\n" +"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi " "nếu muốn.\n" -"#\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "không thể ký thẻ" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "không thể ghi vào tập tin lưu thẻ" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "kiểu đối tượng sai." -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "đầu thẻ (tag) quá lớn." -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "không có thông điệp (message) cho thẻ (tag)?" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "Nội dung ghi chú còn lại %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" -msgstr "chuyển đến 'points-at' yêu cần một đối tượng" +msgstr "chuyển đến “points-at” yêu cần một đối tượng" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" -msgstr "tên đối tượng dị hình '%s'" +msgstr "tên đối tượng dị hình “%s”" + +#: builtin/tag.c:445 +msgid "list tag names" +msgstr "chỉ liệt kê tên các thẻ" + +#: builtin/tag.c:447 +msgid "print <n> lines of each tag message" +msgstr "hiển thị <n> dòng cho mỗi ghi chú" + +#: builtin/tag.c:449 +msgid "delete tags" +msgstr "xóa thẻ" + +#: builtin/tag.c:450 +msgid "verify tags" +msgstr "thẩm tra thẻ" + +#: builtin/tag.c:452 +msgid "Tag creation options" +msgstr "Tùy chọn tạo tag" + +#: builtin/tag.c:454 +msgid "annotated tag, needs a message" +msgstr "để chú giải cho thẻ, cần một lời ghi chú" + +#: builtin/tag.c:456 +msgid "tag message" +msgstr "tin nhắn cho thẻ (tag)" + +#: builtin/tag.c:458 +msgid "annotated and GPG-signed tag" +msgstr "thẻ chú giải và ký kiểu GPG" -#: builtin/tag.c:506 +#: builtin/tag.c:462 +msgid "use another key to sign the tag" +msgstr "dùng kháo khác để ký thẻ" + +#: builtin/tag.c:463 +msgid "replace the tag if exists" +msgstr "thay thế nếu tag đó đã có trước" + +#: builtin/tag.c:464 +msgid "show tag list in columns" +msgstr "hiển thị danh sách thẻ trong các cột" + +#: builtin/tag.c:466 +msgid "Tag listing options" +msgstr "Các tùy chọn liệt kê thẻ" + +#: builtin/tag.c:469 +msgid "print only tags that contain the commit" +msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" + +#: builtin/tag.c:475 +msgid "print only tags of the object" +msgstr "chỉ hiển thị các thẻ của đối tượng" + +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column và -n xung khắc nhau" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "tùy chọn -n chỉ cho phép dùng với -l." -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "tùy chọn --contains chỉ cho phép dùng với -l." -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "tùy chọn --points-at chỉ cho phép dùng với -l." -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "chỉ có một tùy chọn -F hoặc -m là được phép." -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "quá nhiều đối số" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." -msgstr "'%s' không phải thẻ hợp lệ." +msgstr "“%s” không phải thẻ hợp lệ." -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" -msgstr "Thẻ '%s' đã tồn tại rồi" +msgstr "Thẻ “%s” đã tồn tại rồi" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: không thể khóa ref (tham chiếu)" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s: không thể cập nhật ref (tham chiếu)" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" -msgstr "Thẻ đã cập nhật '%s' (cũ là %s)\n" +msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [các-tùy-chọn] [<tập-tin>...]" + +#: builtin/update-index.c:718 +msgid "continue refresh even when index needs update" +msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật" + +#: builtin/update-index.c:721 +msgid "refresh: ignore submodules" +msgstr "refresh: lờ đi mô-đun-con" + +#: builtin/update-index.c:724 +msgid "do not ignore new files" +msgstr "không bỏ qua các tập tin mới tạo" + +#: builtin/update-index.c:726 +msgid "let files replace directories and vice-versa" +msgstr "để các tập tin thay thế các thư mục và “vice-versa”" + +#: builtin/update-index.c:728 +msgid "notice files missing from worktree" +msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc" + +#: builtin/update-index.c:730 +msgid "refresh even if index contains unmerged entries" msgstr "" -"Chạy lệnh 'git help <tên-lệnh>' để có thêm thông tin về lệnh được chỉ ra." +"làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn" -#: parse-options.h:133 parse-options.h:235 -msgid "n" -msgstr "n" +#: builtin/update-index.c:733 +msgid "refresh stat information" +msgstr "lấy lại thông tin thống kê" -#: parse-options.h:141 -msgid "time" -msgstr "thời-gian" +#: builtin/update-index.c:737 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”" -#: parse-options.h:149 -msgid "file" -msgstr "tập-tin" +#: builtin/update-index.c:741 +msgid "<mode> <object> <path>" +msgstr "<mode> <đối tượng> <đường dẫn>" -#: parse-options.h:151 -msgid "when" -msgstr "khi" +#: builtin/update-index.c:742 +msgid "add the specified entry to the index" +msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục" + +#: builtin/update-index.c:746 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:747 +msgid "override the executable bit of the listed files" +msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê" + +#: builtin/update-index.c:751 +msgid "mark files as \"not changing\"" +msgstr "Đánh dấu các tập tin là \"không thay đổi\"" + +#: builtin/update-index.c:754 +msgid "clear assumed-unchanged bit" +msgstr "xóa bít assumed-unchanged" + +#: builtin/update-index.c:757 +msgid "mark files as \"index-only\"" +msgstr "đánh dấu các tập tin là “chỉ-đọc”" + +#: builtin/update-index.c:760 +msgid "clear skip-worktree bit" +msgstr "xóa bít skip-worktree" + +#: builtin/update-index.c:763 +msgid "add to index only; do not add content to object database" +msgstr "" +"chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng" + +#: builtin/update-index.c:765 +msgid "remove named paths even if present in worktree" +msgstr "" +"gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục " +"làm việc" + +#: builtin/update-index.c:767 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null" + +#: builtin/update-index.c:769 +msgid "read list of paths to be updated from standard input" +msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn" + +#: builtin/update-index.c:773 +msgid "add entries from standard input to the index" +msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục" + +#: builtin/update-index.c:777 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê" + +#: builtin/update-index.c:781 +msgid "only update entries that differ from HEAD" +msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD" + +#: builtin/update-index.c:785 +msgid "ignore files missing from worktree" +msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc" + +#: builtin/update-index.c:788 +msgid "report actions to standard output" +msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" + +#: builtin/update-index.c:790 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi" + +#: builtin/update-index.c:794 +msgid "write index in this format" +msgstr "ghi mục lục ở định dạng này" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [các-tùy-chọn] -d <refname> [<biến-cũ>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [các-tùy-chọn] <refname> <biến-mới> [<biến-cũ>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "xóa tham chiếu" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "cập nhật các tập tin thông tin từ điểm xuất phát" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <gói>..." + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "chi tiết" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "chỉ hiển thị thống kê" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <thẻ>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "hiển thị nội dung của thẻ" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<tiền-tố>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<iền tố>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "chỉ hữu ích khi cần gỡ lỗi" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Chạy lệnh “git help <tên-lệnh>” để có thêm thông tin về lệnh được chỉ ra." #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" @@ -5241,7 +8856,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 "Lấy ra (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" @@ -5266,13 +8881,13 @@ msgid "Print lines matching a pattern" msgstr "In ra những dòng khớp với một mẫu" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" "Tạo một kho git trống rỗng hay khởi tạo lại một kho đã tồn tại từ trước" #: common-cmds.h:18 msgid "Show commit logs" -msgstr "hiển thị nhật ký các lần commit (chuyển giao)" +msgstr "Hiển thị nhật ký các lần chuyển giao (commit)" #: common-cmds.h:19 msgid "Join two or more development histories together" @@ -5286,7 +8901,7 @@ msgstr "Di chuyển, đổi tên một tập tin, thư mục hay liên kết tư #: common-cmds.h:21 msgid "Fetch from and merge with another repository or a local branch" -msgstr "Fetch (lấy về) và hòa trộng với kho khác hay nhánh nội bộ" +msgstr "Lấy về (fetch) và hòa trộn với kho khác hay nhánh nội bộ" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" @@ -5296,7 +8911,7 @@ msgstr "" #: common-cmds.h:23 msgid "Forward-port local commits to the updated upstream head" msgstr "" -"Forward-port những lần chuyển giao nội bộ tới head dòng ngược đã cập nhật" +"Forward-port những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" @@ -5329,7 +8944,7 @@ msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần 'am' thất bại cuối cùng.\n" +"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n" "Không thể chuyển tới ORIG_HEAD" #: git-am.sh:105 @@ -5347,11 +8962,11 @@ msgstr "" #: git-am.sh:121 msgid "Cannot fall back to three-way merge." -msgstr "Đang trở lại để hòa trộn kiểu 'three-way'." +msgstr "Đang trở lại để hòa trộn kiểu “three-way”." #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên '3-way merge'." +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..." @@ -5368,7 +8983,7 @@ msgstr "" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." -msgstr "Đang trở lại để vá cơ sở và '3-way merge'..." +msgstr "Đang trở lại để vá cơ sở và “3-way merge”..." #: git-am.sh:179 msgid "Failed to merge in the changes." @@ -5406,8 +9021,7 @@ msgstr "Xin hãy rõ ràng. --skip hay --abort?" #: 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." +msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." #: git-am.sh:575 #, sh-format @@ -5460,7 +9074,7 @@ msgid "" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -"Không có thay đổi nào - bạn đã quên sử dụng lệnh 'git add' à?\n" +"Không có thay đổi nào - bạn đã quên sử dụng lệnh “git add” à?\n" "Nếu ở đây không có gì còn lại stage, tình cờ là có một số thứ khác\n" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " "vá này." @@ -5471,7 +9085,7 @@ msgid "" "did you forget to use 'git add'?" msgstr "" "Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình\n" -"bạn đã quên sử dụng lệnh 'git add' à?" +"bạn đã quên sử dụng lệnh “git add” à?" #: git-am.sh:845 msgid "No changes -- Patch already applied." @@ -5482,6 +9096,15 @@ msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồ msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Vá gặp lỗi tại $msgnum $FIRSTLINE" +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong:\n" +" $dotest/patch" + #: 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" @@ -5500,12 +9123,12 @@ msgstr "Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? #: git-bisect.sh:95 #, sh-format msgid "unrecognised option: '$arg'" -msgstr "không công nhận tùy chọn: '$arg'" +msgstr "không công nhận tùy chọn: “$arg”" #: git-bisect.sh:99 #, sh-format msgid "'$arg' does not appear to be a valid revision" -msgstr "'$arg' không có vẻ như là một sự xét lại hợp lệ" +msgstr "”$arg” không có vẻ như là một sự xét lại hợp lệ" #: git-bisect.sh:117 msgid "Bad HEAD - I need a HEAD" @@ -5516,8 +9139,8 @@ msgstr "HEAD sai - Tôi cần một HEAD" msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." msgstr "" -"Việc checkout '$start_head' gặp lỗi. Hãy thử 'git bisect reset " -"<nhánh_hợp_lệ>'." +"Việc checkout “$start_head” gặp lỗi. Hãy thử “git bisect reset " +"<nhánh_hợp_lệ>”." #: git-bisect.sh:140 msgid "won't bisect on seeked tree" @@ -5539,7 +9162,7 @@ msgstr "Đầu vào rev sai: $arg" #: git-bisect.sh:232 msgid "Please call 'bisect_state' with at least one argument." -msgstr "Hãy gọi lệnhl 'bisect_state' với ít nhất một đối số." +msgstr "Hãy gọi lệnhl “bisect_state” với ít nhất một đối số." #: git-bisect.sh:244 #, sh-format @@ -5548,7 +9171,7 @@ msgstr "Đầu vào rev sai: $rev" #: git-bisect.sh:250 msgid "'git bisect bad' can take only one argument." -msgstr "'git bisect bad' có thể lấy chỉ một đối số." +msgstr "“git bisect bad” có thể lấy chỉ một đối số." #. have bad but not good. we could bisect although #. this is less optimum. @@ -5590,7 +9213,7 @@ msgstr "Chúng tôi không bisect." #: git-bisect.sh:354 #, sh-format msgid "'$invalid' is not a valid commit" -msgstr "'$invalid' không phải là lần chuyển giao (commit) hợp lệ" +msgstr "”$invalid” không phải là lần chuyển giao (commit) hợp lệ" #: git-bisect.sh:363 #, sh-format @@ -5598,8 +9221,8 @@ msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -"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>'." +"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" @@ -5626,7 +9249,7 @@ msgid "" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "chạy bisect gặp lỗi:\n" -"mã trả về $res từ lệnh '$command' là < 0 hoặc >= 128" +"mã trả về $res từ lệnh “$command” là < 0 hoặc >= 128" #: git-bisect.sh:453 msgid "bisect run cannot continue any more" @@ -5639,7 +9262,7 @@ msgid "" "'bisect_state $state' exited with error code $res" msgstr "" "chạy bisect gặp lỗi:\n" -"'bisect_state $state' đã thoát ra với mã lỗi $res" +"”bisect_state $state” đã thoát ra với mã lỗi $res" #: git-bisect.sh:466 msgid "bisect run success" @@ -5652,9 +9275,9 @@ msgid "" "as appropriate to mark resolution, or use 'git commit -a'." msgstr "" "Pull là không thể được bởi vì bạn có những tập tin chưa được hòa trộn.\n" -"Xin hãy sửa chữa chúng trước, và sau đó sử dụng lệnh 'git add/rm <tập-tin>'\n" -"để phê chuẩn việc đánh dấu đây cần được giải quyết, hoặc là sử dụng 'git " -"commit -a'." +"Xin hãy sửa chữa chúng trước, và sau đó sử dụng lệnh “git add/rm <tập-tin>”\n" +"để phê chuẩn việc đánh dấu đây cần được giải quyết, hoặc là sử dụng “git " +"commit -a”." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." @@ -5671,7 +9294,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -5682,15 +9305,15 @@ msgstr "" "Cảnh báo: đang fast-forward cây làm việc của bạn từ\n" "Cảnh báo: commit $orig_head." -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống rỗng" -#: git-pull.sh:257 +#: git-pull.sh:258 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 +#: git-rebase.sh:53 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" @@ -5703,29 +9326,35 @@ msgstr "" "Để 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 +#: git-rebase.sh:160 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." +msgstr "Móc (hook) pre-rebase từ chối rebase." -#: git-rebase.sh:164 +#: git-rebase.sh:165 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 +#: git-rebase.sh:296 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 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "Không có tiến trình rebase nào phải không?" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "" +"Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch " +"sử) tương tác." + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: git-rebase.sh:316 +#: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -5733,12 +9362,12 @@ 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 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "Không thể quay trở lại $head_name" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -5761,57 +9390,57 @@ msgstr "" "\n" "TÔI: là lệnh bạn vừa gọi!" -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" -msgstr "dòng ngược không hợp lệ $upstream_name" +msgstr "thượng nguồn không hợp lệ $upstream_name" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, sh-format msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: ở đây có nhiều hơn một" +msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn" -#: git-rebase.sh:422 git-rebase.sh:426 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" -msgstr "$onto_name: ở đây không có gì để hòa trộn" +msgstr "$onto_name: ở đây không có nền móng hòa trộn nào" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, 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 +#: git-rebase.sh:463 #, 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 +#: git-rebase.sh:483 msgid "Please commit or stash them." -msgstr "Xin hãy commit hoặc stash chúng." +msgstr "Xin hãy commit hoặc tạm cất (stash) chúng." -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, 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 +#: git-rebase.sh:504 #, 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 +#: git-rebase.sh:515 #, 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 +#: git-rebase.sh:524 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 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Fast-forward $branch_name thành $onto_name." @@ -5861,8 +9490,8 @@ msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" -"lỗi: không hiểu tùy chọn cho 'stash save': $option\n" -" Để cung cấp một thông điệp, sử dụng git stash save -- '$option'" +"lỗi: không hiểu tùy chọn cho “stash save”: $option\n" +" Để cung cấp một thông điệp, sử dụng git stash save -- “$option”" #: git-stash.sh:223 msgid "No local changes to save" @@ -5897,12 +9526,12 @@ msgstr "$reference không phải là tham chiếu hợp lệ" #: git-stash.sh:393 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "'$args' không phải là lần chuyển giao (commit) giống-stash" +msgstr "”$args” không phải là lần chuyển giao (commit) giống-stash" #: git-stash.sh:404 #, sh-format msgid "'$args' is not a stash reference" -msgstr "'$args' không phải tham chiếu đến stash" +msgstr "”$args” không phải tham chiếu đến stash" #: git-stash.sh:412 msgid "unable to refresh index" @@ -5924,63 +9553,63 @@ msgstr "Không thể ghi lại cây chỉ mục" msgid "Cannot unstage modified files" msgstr "Không thể bỏ trạng thía của các tập tin đã được sửa chữa" -#: git-stash.sh:474 +#: git-stash.sh:475 msgid "Index was not unstashed." msgstr "Bảng mục lục đã không được bỏ stash." -#: git-stash.sh:491 +#: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Đã hạ xuống ${REV} ($s)" -#: git-stash.sh:492 +#: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Không thể xóa bỏ mục stash" -#: git-stash.sh:499 +#: git-stash.sh:500 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: git-stash.sh:570 +#: git-stash.sh:571 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:88 +#: git-submodule.sh:90 #, 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'" +msgstr "không thể tháo bỏ một thành phần ra khỏi “$remoteurl” url" -#: git-submodule.sh:167 +#: git-submodule.sh:195 #, 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'" +"“$sm_path”" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, 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" +msgstr "Nhân bản “$url” vào đường dẫn mô-đun-con “$sm_path” gặp lỗi" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, 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\"" +"Gitdir “$a” là bộ phận của đường dẫn mô-đun-con “$b” hoặc \"vice versa\"" -#: git-submodule.sh:312 +#: git-submodule.sh:343 #, 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 ./|../" +"repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" -#: git-submodule.sh:329 +#: git-submodule.sh:360 #, 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" +msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi" -#: git-submodule.sh:333 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5992,162 +9621,271 @@ 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:344 +#: git-submodule.sh:382 #, 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" +msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục" -#: git-submodule.sh:346 +#: git-submodule.sh:384 #, 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ệ" +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:360 +#: git-submodule.sh:392 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "" +"Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:" + +#: git-submodule.sh:394 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó" + +#: git-submodule.sh:396 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" +"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là repo (kho) đúng" + +#: git-submodule.sh:397 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" +"hay bạn không chắc chắn điều đó có nghĩa gì chọn tên khác với tùy chọn “--" +"name”." + +#: git-submodule.sh:399 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "" +"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”." + +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" -msgstr "Không thể checkout mô-đun con '$sm_path'" +msgstr "Không thể checkout mô-đun con “$sm_path”" -#: git-submodule.sh:365 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" -msgstr "Gặp lỗi khi thêm mô-đun con '$sm_path'" +msgstr "Gặp lỗi khi thêm mô-đun con “$sm_path”" -#: git-submodule.sh:370 +#: git-submodule.sh:425 #, 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'" +msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun con “$sm_path”" -#: git-submodule.sh:413 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" -msgstr "Đang nhập '$prefix$sm_path'" +msgstr "Đang nhập “$prefix$sm_path”" -#: git-submodule.sh:427 +#: git-submodule.sh:482 #, 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." +msgstr "Dừng lại tại “$sm_path”; script trả về trạng thái khác không." -#: git-submodule.sh:471 +#: git-submodule.sh:526 #, 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" +"Không tìm thấy url cho đường dẫn mô-đun-con “$sm_path” trong .gitmodules" -#: git-submodule.sh:480 +#: git-submodule.sh:535 #, 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'" +msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:482 +#: git-submodule.sh:537 #, 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'" +msgstr "Mô-đun-con “$name” ($url) được đăng ký cho đường dẫn “$sm_path”" -#: git-submodule.sh:490 +#: git-submodule.sh:545 #, 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'" +"Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:590 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" 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'?" +"Đườ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:603 +#: git-submodule.sh:662 #, 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'" +"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:622 +#: git-submodule.sh:671 git-submodule.sh:695 #, 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'" +msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:636 +#: git-submodule.sh:709 #, 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'" +msgstr "Không thể rebase “$sha1” trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:637 +#: git-submodule.sh:710 #, 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'" +msgstr "Đường dẫn mô-đun-con “$sm_path”: được rebase vào trong “$sha1”" -#: git-submodule.sh:642 +#: git-submodule.sh:715 #, 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'" +"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:643 +#: git-submodule.sh:716 #, 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'" +msgstr "Đường dẫn mô-đun-con “$sm_path”: được hòa trộn vào “$sha1”" -#: git-submodule.sh:648 +#: git-submodule.sh:721 #, 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'" +msgstr "Không thể checkout “$sha1” trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:649 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" -msgstr "Đường dẫn mô-đun-con '$sm_path': được checkout '$sha1'" +msgstr "Đường dẫn mô-đun-con “$sm_path”: được checkout “$sha1”" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:744 git-submodule.sh:1066 #, 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'" +msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:779 +#: git-submodule.sh:852 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:819 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:837 +#: git-submodule.sh:910 #, 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:840 +#: git-submodule.sh:913 #, 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:843 +#: git-submodule.sh:916 #, 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:868 +#: git-submodule.sh:941 msgid "blob" msgstr "blob" -#: git-submodule.sh:906 -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:979 +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:908 -msgid "# Submodule changes to be committed:" -msgstr "# Những thay đổi mô-đun-con được chuyển giao (commit):" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" +msgstr "Những mô-đun-con thay đổi đã được chuyển giao (commit):" -#: git-submodule.sh:1054 +#: git-submodule.sh:1129 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "Url Mô-đun-con đồng bộ hóa cho “$prefix$sm_path”" + +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "không thể fdopen “show” (lệnh hiển thị) mô tả tập tin (fd) kết xuất" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "gặp lỗi khi đóng đường ống cho lệnh “show” cho đối tượng “%s”" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "Bạn không có HEAD nào hợp lệ" + +#~ msgid "oops" +#~ msgstr "ôi?" + +#~ msgid "Would not remove %s\n" +#~ msgstr "Không thể gỡ bỏ %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "Không xóa %s\n" + +#~ msgid "Could not read index" +#~ msgstr "Không thể đọc bảng mục lục" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <tên> (-a | -d | <nhánh>])" + +#~ msgid " 0 files changed" +#~ msgstr " 0 có tập tin nào thay đổi cả" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d tập tin thay đổi" +#~ msgstr[1] " %d tập tin thay đổi" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] ", %d thêm(+)" +#~ msgstr[1] ", %d thêm(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] ", %d xóa(-)" +#~ msgstr[1] ", %d xóa(-)" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" + +#~ msgid " (use \"git add\" to track)" +#~ msgstr " (dùng \"git add\" để theo dõi dấu vết)" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "tùy chọn -B không thể dùng -b" + +#~ 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" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detach không thể được sử dụng với tùy chọn -b/-B/--orphan" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach không thể được sử dụng với tùy chọn -t" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "Tùy chọn --orphan và -b|-B loại từ lẫn nhau" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan không thể được sử dụng với tùy chọn -t" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout: hai tùy chọn -f và -m xung khắc nhau" + +#~ 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." #~ msgid "diff setup failed" #~ msgstr "cài đặt diff gặp lỗi" @@ -6165,7 +9903,7 @@ msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'" #~ 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." +#~ msgstr "”%s”: không phải là một thư mục tài liệu." #~ msgid "--" #~ msgstr "--" @@ -6174,14 +9912,5 @@ msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'" #~ msgstr "" #~ "Không thể rút trích địa chỉ thư điện tử từ định danh người chuyển giao" -#, fuzzy #~ msgid "could not parse commit %s\n" -#~ msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" - -#, fuzzy -#~ msgid "cherry-pick" -#~ msgstr "< Chọn D-Mod" - -#, fuzzy -#~ msgid "Too many options specified" -#~ msgstr "đã ghi rõ quá nhiều kích cỡ" +#~ msgstr "không thể phân tích commit (lần chuyển giao) %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index c9331e9555..583ed3385d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,6 +1,6 @@ # Chinese translations for Git package # Git 软件包的简体中文翻译. -# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com> +# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributers: # - Jiang Xin <worldhello.net AT gmail.com> @@ -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-09-05 06:20+0800\n" -"PO-Revision-Date: 2012-09-07 17:56+0800\n" +"POT-Creation-Date: 2013-02-19 13:32+0800\n" +"PO-Revision-Date: 2013-02-19 14:44+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "提示：%.*s\n" @@ -31,7 +31,7 @@ msgstr "提示：%.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -42,6 +42,100 @@ msgstr "" "'git add/rm <file>' 标记解决方案，\n" "或使用 'git commit -a'。" +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [选项] <树或提交> [<路径>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" + +#: archive.c:13 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <版本库> [--exec <命令>] --list" + +#: archive.c:323 +msgid "fmt" +msgstr "格式" + +#: archive.c:323 +msgid "archive format" +msgstr "归档格式" + +#: archive.c:324 builtin/log.c:1115 +msgid "prefix" +msgstr "前缀" + +#: archive.c:325 +msgid "prepend prefix to each pathname in the archive" +msgstr "为归档中每个路径名加上前缀" + +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "文件" + +#: archive.c:327 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "归档写入此文件" + +#: archive.c:329 +msgid "read .gitattributes in working directory" +msgstr "读取工作区中的 .gitattributes" + +#: archive.c:330 +msgid "report archived files on stderr" +msgstr "在标准错误上报告归档文件" + +#: archive.c:331 +msgid "store only" +msgstr "只存储" + +#: archive.c:332 +msgid "compress faster" +msgstr "压缩速度更快" + +#: archive.c:340 +msgid "compress better" +msgstr "压缩效果更好" + +#: archive.c:343 +msgid "list supported archive formats" +msgstr "列出支持的归档格式" + +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "版本库" + +#: archive.c:346 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "从远程版本库（<版本库>）提取归档文件" + +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 +msgid "command" +msgstr "命令" + +#: archive.c:348 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "远程 git-upload-archive 命令的路径" + +#: attr.c:259 +msgid "" +"Negative patterns are forbidden in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"在 git attributes 中不允许使用负值模版\n" +"当字符串确实要以感叹号开始时，使用 '\\!'。" + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -52,7 +146,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:89 builtin/commit.c:699 +#: bundle.c:89 builtin/commit.c:674 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -61,9 +155,9 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -89,7 +183,7 @@ msgstr[1] "这个包需要 %d 个这些引用" msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -120,12 +214,12 @@ msgstr "不能创建 '%s'" msgid "index-pack died" msgstr "index-pack 终止" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" @@ -216,19 +310,24 @@ msgstr[0] "%lu 年前" msgstr[1] "%lu 年前" # 译者：注意保持前导空格 -#: diff.c:105 +#: diff.c:112 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr " 无法解析 dirstat 阈值 '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:110 +#: diff.c:117 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " 未知 dirstat 参数 '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " 未知的 dirstat 参数 '%s'\n" #: diff.c:210 #, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" + +#: diff.c:260 +#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -236,32 +335,7 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:1401 -msgid " 0 files changed" -msgstr " 0 个文件被修改" - -#: diff.c:1405 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d 个文件被修改" -msgstr[1] " %d 个文件被修改" - -#: diff.c:1422 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] "，插入 %d 行(+)" -msgstr[1] "，插入 %d 行(+)" - -#: diff.c:1433 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] "，删除 %d 行(-)" -msgstr[1] "，删除 %d 行(-)" - -#: diff.c:3460 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -270,7 +344,12 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: gpg-interface.c:59 +#: diff.c:3482 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "无法解析 --submodule 选项的参数：'%s'" + +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "不能执行 gpg。" @@ -282,17 +361,27 @@ msgstr "gpg 没有接受数据" msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: grep.c:1320 +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "不能创建临时文件 '%s'：%s" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "无法将分离式签名写入 '%s'：%s" + +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" msgstr "'%s'：%s" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" @@ -306,7 +395,11 @@ msgstr "在 '%s' 下可用的 git 命令" msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "最常用的 git 命令有：" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -315,11 +408,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -328,17 +421,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -350,7 +443,16 @@ msgstr[0] "" "您指的是这个么？" msgstr[1] "" "\n" -"您指的是这些其中一个么？" +"您指的是这其中的某一个么？" + +#: merge.c:56 +msgid "failed to read the cache" +msgstr "无法读取缓存" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +msgid "unable to write new index file" +msgstr "无法写新的索引文件" #: merge-recursive.c:190 #, c-format @@ -395,7 +497,7 @@ msgstr "不能读取对象 %s '%s'" #: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" -msgstr "%s '%s' 应为二进制对象（blob）" +msgstr "%s '%s' 应为数据（blob）对象" #: merge-recursive.c:773 builtin/clone.c:302 #, c-format @@ -412,20 +514,20 @@ msgstr "无法创建符号链接 '%s'" msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:921 +#: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:925 +#: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:941 +#: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "在树中有不支持的对象类型" -#: merge-recursive.c:1020 merge-recursive.c:1034 +#: merge-recursive.c:1021 merge-recursive.c:1035 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -434,7 +536,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" -#: merge-recursive.c:1026 merge-recursive.c:1039 +#: merge-recursive.c:1027 merge-recursive.c:1040 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -443,20 +545,20 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" -#: merge-recursive.c:1080 +#: merge-recursive.c:1081 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1080 +#: merge-recursive.c:1081 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1136 +#: merge-recursive.c:1137 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1158 +#: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -465,177 +567,195 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1163 +#: merge-recursive.c:1164 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1217 +#: merge-recursive.c:1218 #, 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:1247 +#: merge-recursive.c:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" -msgstr "而是重命名 %s 至 %s 以及 %s 至 %s" +msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" -#: merge-recursive.c:1446 +#: merge-recursive.c:1447 #, 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:1456 +#: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" -#: merge-recursive.c:1461 merge-recursive.c:1659 +#: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:1512 +#: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:1515 +#: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" -msgstr "对象 %s 不是一个二进制对象（blob）" +msgstr "对象 %s 不是一个数据（blob）对象" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modify" msgstr "修改" -#: merge-recursive.c:1563 +#: merge-recursive.c:1564 msgid "modified" msgstr "修改" -#: merge-recursive.c:1573 +#: merge-recursive.c:1574 msgid "content" msgstr "内容" -#: merge-recursive.c:1580 +#: merge-recursive.c:1581 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:1614 +#: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:1628 +#: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1632 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:1633 +#: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:1723 +#: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:1748 +#: merge-recursive.c:1749 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1754 +#: merge-recursive.c:1755 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1759 +#: merge-recursive.c:1760 #, 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:1769 +#: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:1786 +#: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误，不应发生。" -#: merge-recursive.c:1805 +#: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "已经是最新的！" -#: merge-recursive.c:1814 +#: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:1844 +#: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" -#: merge-recursive.c:1889 +#: merge-recursive.c:1890 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:1902 +#: merge-recursive.c:1903 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:1939 +#: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:1996 +#: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2008 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "不能写入索引。" -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-数字" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "路径 '%s' 属于模组 '%.*s'" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' 位于符号链接中" + +#: remote.c:1653 #, 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:1638 +#: remote.c:1659 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " （使用 \"git push\" 来发布您的本地提交）\n" + +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -643,7 +763,12 @@ msgid_plural "" msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" -#: remote.c:1646 +# 译者：注意保持前导空格 +#: remote.c:1670 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" + +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -653,24 +778,29 @@ 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" + +# 译者：注意保持前导空格 +#: remote.c:1683 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 +#: builtin/merge.c:994 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 +#: builtin/merge.c:999 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -678,7 +808,7 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "命令标记修正后的文件" -#: sequencer.c:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -687,214 +817,210 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:261 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:282 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:324 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:329 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:395 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:398 -msgid "You do not have a valid HEAD" -msgstr "您没有一个有效的 HEAD" - -#: sequencer.c:413 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:421 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:425 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:436 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:440 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:524 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:525 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:553 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:561 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:566 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:624 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:646 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:651 +#: sequencer.c:667 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:664 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:668 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:675 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:703 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:706 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:718 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:739 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:740 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:744 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" -msgstr "没有拣选或还原操作在进行" +msgstr "拣选或还原操作并未进行" -#: sequencer.c:781 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:783 +#: sequencer.c:799 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:805 builtin/apply.c:3987 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:808 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:809 +#: sequencer.c:825 msgid "unexpected end of file" -msgstr "未预期的文件结束" +msgstr "意外的文件结束" -#: sequencer.c:815 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:838 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1000 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1001 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" @@ -917,12 +1043,22 @@ msgstr "尚未给分支 '%s' 设置上游" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: wrapper.c:413 +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "不能访问 '%s'：%s" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "不能访问 '%s'" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" -msgstr "无法在 passwd 文件中查询到当前用户：%s" +msgstr "无法在口令文件中查询到当前用户：%s" -#: wrapper.c:414 +#: wrapper.c:435 msgid "no such user" msgstr "无此用户" @@ -985,11 +1121,6 @@ msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" -#: wt-status.c:224 -#, c-format -msgid "%s files:" -msgstr "%s文件：" - # 译者：注意保持前导空格 #: wt-status.c:227 #, c-format @@ -1096,208 +1227,235 @@ msgstr "未合并： %s" msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" -#: wt-status.c:785 +#: wt-status.c:789 msgid "You have unmerged paths." -msgstr "您有路径尚未合并。" +msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:791 +#: wt-status.c:795 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:794 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." msgstr "您正处于一个 am 过程中。" -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " （解决冲突，然后运行 \"git am --resolved\"）" # 译者：注意保持前导空格 -#: wt-status.c:813 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s'。" + +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "您正在变基。" # 译者：注意保持前导空格 -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:878 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:886 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。" + +#: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." msgstr "您正在变基过程中拆分一个提交。" # 译者：注意保持前导空格 -#: wt-status.c:891 +#: wt-status.c:916 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:893 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。" + +#: wt-status.c:925 msgid "You are currently editing a commit during a rebase." msgstr "您正在变基过程中编辑一个提交。" # 译者：注意保持前导空格 -#: wt-status.c:896 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr " （执行 \"git rebase --continue\" 一旦您满意您的修改）" +msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:908 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "您正在做拣选操作。" # 译者：注意保持前导空格 -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr " （解决所有冲突后，执行 \"git commit\"）" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "您正在分支 '%s' 中做二分查找。" + +#: wt-status.c:962 msgid "You are currently bisecting." msgstr "您正在做二分查找。" # 译者：注意保持前导空格 -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1011 -msgid "Untracked" -msgstr "未跟踪的" +#: wt-status.c:1097 +msgid "Untracked files" +msgstr "未跟踪的文件" -#: wt-status.c:1013 -msgid "Ignored" -msgstr "忽略的" +#: wt-status.c:1099 +msgid "Ignored files" +msgstr "忽略的文件" -#: wt-status.c:1015 +#: wt-status.c:1101 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1027 -#, c-format -msgid "no changes added to commit%s\n" -msgstr "修改尚未加入提交%s\n" - # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1029 -msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）" +#: wt-status.c:1114 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1031 +#: wt-status.c:1117 #, c-format -msgid "nothing added to commit but untracked files present%s\n" -msgstr "空提交但存在未跟踪文件%s\n" +msgid "no changes added to commit\n" +msgstr "修改尚未加入提交\n" -# 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1033 -msgid " (use \"git add\" to track)" -msgstr "（使用 \"git add\" 建立跟踪）" +#: wt-status.c:1120 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 +#: wt-status.c:1123 #, c-format -msgid "nothing to commit%s\n" -msgstr "无须提交%s\n" +msgid "nothing added to commit but untracked files present\n" +msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1036 -msgid " (create/copy files and use \"git add\" to track)" -msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）" +#: wt-status.c:1126 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" + +#: wt-status.c:1129 wt-status.c:1134 +#, c-format +msgid "nothing to commit\n" +msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1039 -msgid " (use -u to show untracked files)" -msgstr "（使用 -u 显示未跟踪文件）" +#: wt-status.c:1132 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1042 -msgid " (working directory clean)" -msgstr "（干净的工作区）" +#: wt-status.c:1136 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1150 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1156 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "初始提交于 " # 译者：注意保持句尾空格 -#: wt-status.c:1171 +#: wt-status.c:1265 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:1174 wt-status.c:1177 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:1179 +#: wt-status.c:1273 msgid ", behind " msgstr "，落后 " @@ -1306,107 +1464,197 @@ msgstr "，落后 " msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" -#: builtin/add.c:62 +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [选项] [--] <路径匹配>..." + +#: builtin/add.c:63 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:67 builtin/commit.c:229 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "路径 '%s' 属于模组 '%.*s'" - -#: builtin/add.c:192 +#: builtin/add.c:148 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径 '%s' 未匹配任何文件" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "'%s' 位于符号链接中" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." -msgstr "不能为写入打开 '%s'。" +msgstr "不能打开 '%s' 以写入。" -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" -msgstr "不能写补丁" +msgstr "不能生成补丁" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:312 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n" +msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:352 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 +#: builtin/rm.c:206 +msgid "dry run" +msgstr "演习" + +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "冗长输出" + +#: builtin/add.c:280 +msgid "interactive picking" +msgstr "交互式拣选" + +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 +msgid "select hunks interactively" +msgstr "交互式挑选数据块" + +#: builtin/add.c:282 +msgid "edit current diff and apply" +msgstr "编辑当前差异并应用" + +#: builtin/add.c:283 +msgid "allow adding otherwise ignored files" +msgstr "允许添加忽略的文件" + +#: builtin/add.c:284 +msgid "update tracked files" +msgstr "更新已跟踪的文件" + +#: builtin/add.c:285 +msgid "record only the fact that the path will be added later" +msgstr "只记录，该路径稍后再添加" + +#: builtin/add.c:286 +msgid "add changes from all tracked and untracked files" +msgstr "添加所有改变的已跟踪文件和未跟踪文件" + +#: builtin/add.c:287 +msgid "don't add, only refresh the index" +msgstr "不添加，只刷新索引" + +#: builtin/add.c:288 +msgid "just skip files which cannot be added because of errors" +msgstr "跳过因出错不能添加的文件" + +#: builtin/add.c:289 +msgid "check if - even missing - files are ignored in dry run" +msgstr "检查在演习模式下文件（即使不存在）是否被忽略" + +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:353 +#: builtin/add.c:312 msgid "no files added" msgstr "没有文件被添加" -#: builtin/add.c:359 +#: builtin/add.c:318 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:391 +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" +"在 Git 2.0 版本，将不再允许在一个子目录下不带任何路径参数地执行\n" +"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n" +"如果要添加整个目录树的内容，执行：\n" +"\n" +" git add %s :/\n" +" (或 git add %s :/)\n" +"\n" +"如果要限制该命令只作用于当前目录，执行：\n" +"\n" +" git add %s .\n" +" (或 git add %s .)\n" +"\n" +"对于当前版本的 Git，这条命令只作用于当前目录。" + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:393 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:413 +#: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:414 +#: builtin/add.c:415 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -1442,7 +1690,7 @@ msgstr "不能在补丁的第 %d 行找到文件名" #: builtin/apply.c:945 #, 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:949 #, c-format @@ -1457,19 +1705,19 @@ msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" #: builtin/apply.c:957 #, 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:1402 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1459 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1476 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1480,82 +1728,78 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1636 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1638 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1664 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" -msgstr "补丁损坏位于第 %d 行" +msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1700 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1702 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1705 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1851 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1880 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:1966 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2056 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2060 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2131 -msgid "oops" -msgstr "哎哟" - -#: builtin/apply.c:2653 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2771 +#: builtin/apply.c:2802 #, 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 行）" +msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" +msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" -#: builtin/apply.c:2783 +#: builtin/apply.c:2814 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2789 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" @@ -1564,321 +1808,318 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2808 +#: builtin/apply.c:2839 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:2911 +#: builtin/apply.c:2942 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:2917 +#: builtin/apply.c:2948 #, 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:2938 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3060 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3138 builtin/apply.c:3360 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3219 builtin/apply.c:3374 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3228 builtin/apply.c:3382 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3330 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3399 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3401 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" -msgstr "%s 的类型是 %o，预期是 %o" +msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3502 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3505 +#: builtin/apply.c:3536 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3525 +#: builtin/apply.c:3556 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3530 +#: builtin/apply.c:3561 #, 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:3538 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3551 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3749 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3777 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "子项目 %s 损坏的补丁" -#: builtin/apply.c:3781 +#: builtin/apply.c:3850 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3786 +#: builtin/apply.c:3855 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3789 builtin/apply.c:3897 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3822 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3871 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:3958 +#: builtin/apply.c:4027 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:3966 +#: builtin/apply.c:4035 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose -#: builtin/apply.c:3969 +#: builtin/apply.c:4038 #, 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:3979 +#: builtin/apply.c:4048 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4000 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:4003 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4153 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4164 +#: builtin/apply.c:4233 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4283 builtin/apply.c:4286 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 +#: builtin/fetch.c:63 msgid "path" msgstr "路径" -#: builtin/apply.c:4284 +#: builtin/apply.c:4353 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4287 +#: builtin/apply.c:4356 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4289 +#: builtin/apply.c:4358 msgid "num" msgstr "数字" -#: builtin/apply.c:4290 +#: builtin/apply.c:4359 msgid "remove <num> leading slashes from traditional diff paths" -msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" +msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4293 +#: builtin/apply.c:4362 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4295 +#: builtin/apply.c:4364 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4299 -msgid "shows number of added and deleted lines in decimal notation" -msgstr "以数字方式显示添加或删除行的数量" +#: builtin/apply.c:4368 +msgid "show number of added and deleted lines in decimal notation" +msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4301 +#: builtin/apply.c:4370 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4303 +#: builtin/apply.c:4372 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4305 +#: builtin/apply.c:4374 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4307 +#: builtin/apply.c:4376 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4309 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "还应用此补丁（使用 --stat/--summary/--check 参数）" +msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4311 +#: builtin/apply.c:4380 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" -#: builtin/apply.c:4313 +#: builtin/apply.c:4382 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4315 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4318 +#: builtin/apply.c:4387 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4319 +#: builtin/apply.c:4388 msgid "action" msgstr "动作" -#: builtin/apply.c:4320 +#: builtin/apply.c:4389 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4323 builtin/apply.c:4326 +#: builtin/apply.c:4392 builtin/apply.c:4395 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4329 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4331 +#: builtin/apply.c:4400 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4333 +#: builtin/apply.c:4402 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4335 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4336 -msgid "be verbose" -msgstr "冗长输出" - -#: builtin/apply.c:4338 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "宽容不正确的文件末尾换行符" +msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4341 +#: builtin/apply.c:4410 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4343 +#: builtin/apply.c:4412 msgid "root" msgstr "根目录" -#: builtin/apply.c:4344 +#: builtin/apply.c:4413 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4366 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4374 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4377 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4393 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4407 +#: builtin/apply.c:4476 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4413 builtin/apply.c:4423 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1892,7 +2133,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" @@ -1900,7 +2141,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 @@ -1918,10 +2159,138 @@ msgstr "git archive：协议错误" #: builtin/archive.c:71 msgid "git archive: expected a flush" -msgstr "git archive：预期一个刷新" +msgstr "git archive：应为刷新" + +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "执行 'git bisect next'" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "更新 BISECT_HEAD 而非检出当前提交" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [选项] [版本选项] [版本] [--] 文件" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" + +#: builtin/blame.c:2350 +msgid "Show blame entries as we find them, incrementally" +msgstr "增量式地显示发现的 blame 条目" + +#: builtin/blame.c:2351 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "边界提交显示空的 SHA-1（默认：关闭）" + +#: builtin/blame.c:2352 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "不把根提交作为边界（默认：关闭）" + +#: builtin/blame.c:2353 +msgid "Show work cost statistics" +msgstr "显示命令消耗统计" + +#: builtin/blame.c:2354 +msgid "Show output score for blame entries" +msgstr "显示判断 blame 条目位移的得分诊断信息" + +#: builtin/blame.c:2355 +msgid "Show original filename (Default: auto)" +msgstr "显示原始文件名（默认：自动）" + +#: builtin/blame.c:2356 +msgid "Show original linenumber (Default: off)" +msgstr "显示原始的行号（默认：关闭）" + +#: builtin/blame.c:2357 +msgid "Show in a format designed for machine consumption" +msgstr "显示为一个适合机器读取的格式" + +#: builtin/blame.c:2358 +msgid "Show porcelain format with per-line commit information" +msgstr "为每一行显示机器适用的提交信息" + +#: builtin/blame.c:2359 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" + +#: builtin/blame.c:2360 +msgid "Show raw timestamp (Default: off)" +msgstr "显示原始时间戳（默认：关闭）" + +#: builtin/blame.c:2361 +msgid "Show long commit SHA1 (Default: off)" +msgstr "显示长的SHA1提交号（默认：关闭）" + +#: builtin/blame.c:2362 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "隐藏作者名字和时间戳（默认：关闭）" + +#: builtin/blame.c:2363 +msgid "Show author email instead of name (Default: off)" +msgstr "显示作者的邮箱而不是名字（默认：关闭）" + +#: builtin/blame.c:2364 +msgid "Ignore whitespace differences" +msgstr "忽略空白差异" + +#: builtin/blame.c:2365 +msgid "Spend extra cycles to find better match" +msgstr "花费额外的循环来找到更好的匹配" + +#: builtin/blame.c:2366 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" + +#: builtin/blame.c:2367 +msgid "Use <file>'s contents as the final image" +msgstr "使用 <file> 的内容作为最终的图片" + +#: builtin/blame.c:2368 builtin/blame.c:2369 +msgid "score" +msgstr "得分" + +#: builtin/blame.c:2368 +msgid "Find line copies within and across files" +msgstr "找到文件内及跨文件的行拷贝" + +#: builtin/blame.c:2369 +msgid "Find line movements within and across files" +msgstr "找到文件内及跨文件的行移动" + +#: builtin/blame.c:2370 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:2370 +msgid "Process only line range n,m, counting from 1" +msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git branch [选项] [-r] (-d | -D) <分支名>..." + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:144 +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -1931,7 +2300,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -1940,163 +2309,327 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" +#: builtin/branch.c:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "无法查询 '%s' 指向的提交对象" + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"分支 '%s' 没有完全合并。\n" +"如果您确认要删除它，执行 'git branch -D %s'。" + #: builtin/branch.c:180 +msgid "Update of config-file failed" +msgstr "无法更新 config 文件" + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:186 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:191 +#: builtin/branch.c:222 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" -#: builtin/branch.c:202 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未发现。" -#: builtin/branch.c:203 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:210 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "无法查询 '%s' 指向的提交对象" - -#: builtin/branch.c:216 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"分支 '%s' 没有完全合并。\n" -"如果您确认要删除它，执行 'git branch -D %s'。" - -#: builtin/branch.c:225 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" msgstr "删除远程分支 '%s' 时出错" -#: builtin/branch.c:226 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" msgstr "删除分支 '%s' 时出错" -#: builtin/branch.c:233 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "已删除远程分支 %s（曾为 %s）。\n" -#: builtin/branch.c:234 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:239 -msgid "Update of config-file failed" -msgstr "无法更新 config 文件" - -#: builtin/branch.c:337 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" -#: builtin/branch.c:409 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:411 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:415 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:417 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:420 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:423 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:535 +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr " **** 无效引用 ****" + +#: builtin/branch.c:560 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:600 +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "对象 '%s' 没有指向一个提交" + +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:613 +#: builtin/branch.c:638 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:623 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:638 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:642 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:646 +#: builtin/branch.c:671 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:653 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:668 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:692 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:783 +#: builtin/branch.c:747 +msgid "Generic options" +msgstr "通用选项" + +#: builtin/branch.c:749 +msgid "show hash and subject, give twice for upstream branch" +msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" + +#: builtin/branch.c:750 +msgid "suppress informational messages" +msgstr "不显示信息" + +#: builtin/branch.c:751 +msgid "set up tracking mode (see git-pull(1))" +msgstr "设置跟踪模式（参见 git-pull(1)）" + +#: builtin/branch.c:753 +msgid "change upstream info" +msgstr "改变上游信息" + +#: builtin/branch.c:757 +msgid "use colored output" +msgstr "使用彩色输出" + +#: builtin/branch.c:758 +msgid "act on remote-tracking branches" +msgstr "作用于远程跟踪分支" + +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 +msgid "commit" +msgstr "提交" + +#: builtin/branch.c:762 builtin/branch.c:768 +msgid "print only branches that contain the commit" +msgstr "只打印包含该提交的分支" + +#: builtin/branch.c:774 +msgid "Specific git-branch actions:" +msgstr "具体的 git-branch 动作：" + +#: builtin/branch.c:775 +msgid "list both remote-tracking and local branches" +msgstr "列出远程跟踪及本地分支" + +#: builtin/branch.c:777 +msgid "delete fully merged branch" +msgstr "删除完全合并的分支" + +#: builtin/branch.c:778 +msgid "delete branch (even if not merged)" +msgstr "删除分支（即使没有合并）" + +#: builtin/branch.c:779 +msgid "move/rename a branch and its reflog" +msgstr "移动/重命名一个分支，以及它的引用日志" + +#: builtin/branch.c:780 +msgid "move/rename a branch, even if target exists" +msgstr "移动/重命名一个分支，即使目标已存在" + +#: builtin/branch.c:781 +msgid "list branch names" +msgstr "列出分支名" + +#: builtin/branch.c:782 +msgid "create the branch's reflog" +msgstr "创建分支的引用日志" + +#: builtin/branch.c:784 +msgid "edit the description for the branch" +msgstr "标记分支的描述" + +#: builtin/branch.c:785 +msgid "force creation (when already exists)" +msgstr "强制创建（当已经存在）" + +#: builtin/branch.c:788 +msgid "print only not merged branches" +msgstr "只打印没有合并的分支" + +#: builtin/branch.c:794 +msgid "print only merged branches" +msgstr "只打印合并的分支" + +#: builtin/branch.c:798 +msgid "list branches in columns" +msgstr "以列的方式显示分支" + +#: builtin/branch.c:811 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:788 builtin/clone.c:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:808 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:857 +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "必须提供分支名" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "不能向分离头指针提供描述" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "不能为一个以上的分支编辑描述" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "分支 '%s' 尚无提交。" + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "没有分支 '%s'。" + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "为重命名操作提供了太多的分支名" + +#: builtin/branch.c:893 +#, c-format +msgid "branch '%s' does not exist" +msgstr "分支 '%s' 不存在" + +#: builtin/branch.c:905 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "分支 '%s' 没有上游信息" + +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" +#: builtin/branch.c:923 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" + +#: builtin/branch.c:940 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"如果你想用 '%s' 跟踪 '%s', 这么做：\n" +"\n" + +#: builtin/branch.c:941 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" + +#: builtin/branch.c:942 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" @@ -2110,96 +2643,247 @@ msgstr "需要一个版本库来创建包。" msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" -#: builtin/checkout.c:114 builtin/checkout.c:147 +#: builtin/cat-file.c:247 +msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" +msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" + +#: builtin/cat-file.c:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <对象列表>" + +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" + +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "显示对象类型" + +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "显示对象大小" + +#: builtin/cat-file.c:270 +msgid "exit with zero when there's no error" +msgstr "当没有错误时退出并返回零" + +#: builtin/cat-file.c:271 +msgid "pretty-print object's content" +msgstr "美观地打印对象的内容" + +#: builtin/cat-file.c:273 +msgid "for blob objects, run textconv on object's content" +msgstr "对于数据（blob）对象，对其内容执行 textconv" + +#: builtin/cat-file.c:275 +msgid "show info and content of objects fed from the standard input" +msgstr "显示从标准输入提供的对象的信息和内容" + +#: builtin/cat-file.c:278 +msgid "show info about objects fed from the standard input" +msgstr "显示从标准输入提供的对象的信息" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | attr...] [--] 路径名..." + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "报告设置在文件上的所有属性" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "只使用索引中的 .gitattributes" + +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "从标准输入读出文件名" + +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +msgid "input paths are terminated by a null character" +msgstr "输入路径以null字符终止" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "不显示进度报告" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "不能同时提供路径及 --stdin 参数" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "-z 需要和 --stdin 参数共用才有意义" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "未指定路径" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "参数 --quiet 只在提供一个路径名时有效" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "不能同时提供 --quiet 和 --verbose 参数" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [选项] [--] [<文件>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "检出索引区的所有文件" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "强制覆盖现有的文件" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "存在或不在索引中的文件都没有警告" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "不检出新文件" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "更新索引中文件的状态信息" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "从标准输入读取路径列表" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "将内容写入临时文件" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "字符串" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "在创建文件时，在前面加上<字符串>" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "从指定暂存区中拷出文件" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [选项] <分支>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [选项] [<分支>] -- <文件>..." + +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:118 builtin/checkout.c:151 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:132 +#: builtin/checkout.c:134 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:176 +#: builtin/checkout.c:178 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:193 +#: builtin/checkout.c:195 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:210 +#: builtin/checkout.c:212 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:235 builtin/checkout.c:392 +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' 不能在更新路径时使用" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "'%s' 不能和 %s 同时使用" + +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "不能同时更新路径并切换到分支'%s'。" + +#: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" msgstr "损坏的索引文件" -#: builtin/checkout.c:265 builtin/checkout.c:272 +#: builtin/checkout.c:295 builtin/checkout.c:302 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" -msgstr "无法写新的索引文件" - -#: builtin/checkout.c:414 +#: builtin/checkout.c:448 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:533 +#: builtin/checkout.c:569 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" -#: builtin/checkout.c:566 +#: builtin/checkout.c:602 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:573 +#: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:576 +#: builtin/checkout.c:612 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:580 +#: builtin/checkout.c:616 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:582 +#: builtin/checkout.c:618 builtin/checkout.c:955 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:584 +#: builtin/checkout.c:620 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:640 +#: builtin/checkout.c:676 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #. The singular version -#: builtin/checkout.c:646 +#: builtin/checkout.c:682 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2220,7 +2904,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:664 +#: builtin/checkout.c:700 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2235,143 +2919,319 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:694 +#: builtin/checkout.c:730 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:698 +#: builtin/checkout.c:734 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:724 builtin/checkout.c:919 +#: builtin/checkout.c:761 builtin/checkout.c:950 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) -#: builtin/checkout.c:855 +#: builtin/checkout.c:886 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #. case (1): want a tree -#: builtin/checkout.c:894 +#: builtin/checkout.c:925 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:976 -msgid "-B cannot be used with -b" -msgstr "-B 不能和 -b 同时使用" +#: builtin/checkout.c:964 +msgid "paths cannot be used with switching branches" +msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:985 -msgid "--patch is incompatible with all other options" -msgstr "--patch 选项和其他选项不兼容" +#: builtin/checkout.c:967 builtin/checkout.c:971 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' 不能和切换分支同时使用" + +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:988 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detach 不能和 -b/-B/--orphan 同时使用" +#: builtin/checkout.c:991 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:990 -msgid "--detach cannot be used with -t" -msgstr "--detach 不能和 -t 同时使用" +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "分支" -#: builtin/checkout.c:996 -msgid "--track needs a branch name" -msgstr "--track 需要一个分支名" +#: builtin/checkout.c:1014 +msgid "create and checkout a new branch" +msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1003 -msgid "Missing branch name; try -b" -msgstr "缺少分支名；尝试 -b" +#: builtin/checkout.c:1016 +msgid "create/reset and checkout a branch" +msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1009 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan 和 -b|-B 互斥" +#: builtin/checkout.c:1017 +msgid "create reflog for new branch" +msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1011 -msgid "--orphan cannot be used with -t" -msgstr "--orphan 不能和 -t 同时使用" +#: builtin/checkout.c:1018 +msgid "detach the HEAD at named commit" +msgstr "成为指向该提交的分离头指针" + +#: builtin/checkout.c:1019 +msgid "set upstream info for new branch" +msgstr "为新的分支设置上游信息" + +#: builtin/checkout.c:1021 +msgid "new branch" +msgstr "新分支" #: builtin/checkout.c:1021 -msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout：-f 和 -m 不兼容" +msgid "new unparented branch" +msgstr "新的没有父提交的分支" + +#: builtin/checkout.c:1022 +msgid "checkout our version for unmerged files" +msgstr "对尚未合并的文件检出我们的版本" + +#: builtin/checkout.c:1024 +msgid "checkout their version for unmerged files" +msgstr "对尚未合并的文件检出他们的版本" + +#: builtin/checkout.c:1026 +msgid "force checkout (throw away local modifications)" +msgstr "强制检出（丢弃本地修改）" + +#: builtin/checkout.c:1027 +msgid "perform a 3-way merge with the new branch" +msgstr "和新的分支执行三路合并" + +#: builtin/checkout.c:1028 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "更新忽略的文件（默认）" + +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 +msgid "style" +msgstr "风格" + +#: builtin/checkout.c:1030 +msgid "conflict style (merge or diff3)" +msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1033 +msgid "second guess 'git checkout no-such-branch'" +msgstr "再者猜测'git checkout no-such-branch'" + +#: builtin/checkout.c:1057 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b、-B 和 --orphan 是互斥的" + +#: builtin/checkout.c:1074 +msgid "--track needs a branch name" +msgstr "--track 需要一个分支名" + +#: builtin/checkout.c:1081 +msgid "Missing branch name; try -b" +msgstr "缺少分支名；尝试 -b" + +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1123 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" +"Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkout：更新路径和切换分支不兼容。\n" -"您是想要检出 '%s' 但未能将其解析为提交么？" - -#: builtin/checkout.c:1065 -msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "git checkout：更新路径和切换分支不兼容。" +"不能同时更新路径并切换到分支'%s'。\n" +"您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1070 -msgid "git checkout: --detach does not take a path argument" -msgstr "git checkout：--detach 不跟路径参数" +#: builtin/checkout.c:1128 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1073 +#: builtin/checkout.c:1132 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:1092 -msgid "Cannot switch branch to a non-commit." -msgstr "无法切换分支到一个非提交。" +#: builtin/clean.c:20 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." + +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "正删除 %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "将删除 %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "忽略版本库 %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "将忽略版本库 %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "无法删除 %s" + +#: builtin/clean.c:160 +msgid "do not print names of files removed" +msgstr "不打印删除文件的名称" + +#: builtin/clean.c:162 +msgid "force" +msgstr "强制" -#: builtin/checkout.c:1095 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs 和切换分支不兼容。" +#: builtin/clean.c:164 +msgid "remove whole directories" +msgstr "删除整个目录" -#: builtin/clean.c:78 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 +msgid "pattern" +msgstr "模式" + +#: builtin/clean.c:166 +msgid "add <pattern> to ignore rules" +msgstr "添加<模式>到忽略规则" + +#: builtin/clean.c:167 +msgid "remove ignored files, too" +msgstr "也删除忽略的文件" + +#: builtin/clean.c:169 +msgid "remove only ignored files" +msgstr "只删除忽略的文件" + +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "将删除 %s\n" +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [选项] [--] <版本库> [<路径>]" -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "正删除 %s\n" +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:436 +msgid "force progress reporting" +msgstr "强制显示进度报告" -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "无法删除 %s" +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "不创建一个检出" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "不会删除 %s\n" +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "创建一个裸版本库" -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "未删除 %s\n" +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "创建一个镜像版本库（也是裸版本库）" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "从本地版本库克隆" + +#: builtin/clone.c:76 +msgid "don't use local hardlinks, always copy" +msgstr "不使用本地硬链接，始终复制" + +#: builtin/clone.c:78 +msgid "setup as shared repository" +msgstr "设置为共享版本库" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "在克隆时初始化子模组" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "模板目录" + +#: builtin/clone.c:84 builtin/init-db.c:486 +msgid "directory from which templates will be used" +msgstr "模板目录将被使用" + +#: builtin/clone.c:86 +msgid "reference repository" +msgstr "引用版本库" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "名称" + +#: builtin/clone.c:88 +msgid "use <name> instead of 'origin' to track upstream" +msgstr "使用<名称>而不是 'origin' 去跟踪上游" + +#: builtin/clone.c:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "检出<分支>而不是远程HEAD" + +#: builtin/clone.c:92 +msgid "path to git-upload-pack on the remote" +msgstr "远程 git-upload-pack 路径" + +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 +msgid "depth" +msgstr "深度" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "创建一个指定深度的浅克隆" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "只克隆一个分支、HEAD 或 --branch" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr "git目录" + +#: builtin/clone.c:98 builtin/init-db.c:495 +msgid "separate git dir from working tree" +msgstr "git目录和工作区分离" + +#: builtin/clone.c:99 +msgid "key=value" +msgstr "key=value" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" +msgstr "在新版本库中设置配置信息" #: builtin/clone.c:243 #, c-format @@ -2422,77 +3282,117 @@ msgstr "不能发现要克隆的远程分支 %s。" msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:646 +#: builtin/clone.c:694 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:657 +#: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:671 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare 和 --separate-git-dir 选项不兼容。" + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:676 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:686 +#: builtin/clone.c:736 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:696 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:759 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:712 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:731 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" -#: builtin/clone.c:733 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:789 +#: builtin/clone.c:818 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:838 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:845 +#: builtin/clone.c:874 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [选项]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "查找配置变量" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "要使用的布局" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "最大宽度" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "左边框的填充空间" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "右边框的填充空间" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "两列之间的填充空间" + #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:43 +#: builtin/commit.c:34 +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [选项] [--] <路径匹配>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [选项] [--] <路径匹配>..." + +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2515,7 +3415,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -2524,7 +3424,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -2540,93 +3440,93 @@ msgstr "" "\n" "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:256 +#: builtin/commit.c:258 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:298 +#: builtin/commit.c:300 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:389 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:391 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:421 +#: builtin/commit.c:423 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:496 builtin/commit.c:502 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:525 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:585 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:635 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:637 +#: builtin/commit.c:612 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:641 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:647 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "提交说明为空" -#: builtin/commit.c:663 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:667 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:671 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:723 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:734 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -2640,7 +3540,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:739 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -2654,178 +3554,375 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:751 +#: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n" +"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:756 +#: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们\n" -"如果您想这样做的话。而一个空的提交说明将会终止提交。\n" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n" +"也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:769 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:776 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:796 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:833 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:848 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" +msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:945 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:960 builtin/commit.c:1160 +#: builtin/commit.c:944 builtin/commit.c:1138 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1000 +#: builtin/commit.c:974 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1011 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1014 +#: builtin/commit.c:988 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1016 +#: builtin/commit.c:990 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1019 +#: builtin/commit.c:993 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1029 +#: builtin/commit.c:1003 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1031 +#: builtin/commit.c:1005 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1039 +#: builtin/commit.c:1013 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1056 +#: builtin/commit.c:1030 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1058 +#: builtin/commit.c:1032 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1060 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1062 +#: builtin/commit.c:1036 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." -#: builtin/commit.c:1072 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1077 +#: builtin/commit.c:1051 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1260 +#: builtin/commit.c:1057 builtin/commit.c:1192 +msgid "--long and -z are incompatible" +msgstr "--long 和 -z 选项不兼容" + +#: builtin/commit.c:1152 builtin/commit.c:1388 +msgid "show status concisely" +msgstr "以简洁的格式显示状态" + +#: builtin/commit.c:1154 builtin/commit.c:1390 +msgid "show branch information" +msgstr "显示分支信息" + +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 +msgid "machine-readable output" +msgstr "机器可读的输出" + +#: builtin/commit.c:1159 builtin/commit.c:1394 +msgid "show status in long format (default)" +msgstr "以长格式显示状态（默认）" + +#: builtin/commit.c:1162 builtin/commit.c:1397 +msgid "terminate entries with NUL" +msgstr "条目以NUL字符结尾" + +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 +msgid "mode" +msgstr "模式" + +#: builtin/commit.c:1165 builtin/commit.c:1400 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" + +#: builtin/commit.c:1168 +msgid "show ignored files" +msgstr "显示忽略的文件" + +#: builtin/commit.c:1169 parse-options.h:151 +msgid "when" +msgstr "何时" + +#: builtin/commit.c:1170 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" + +#: builtin/commit.c:1172 +msgid "list untracked files in columns" +msgstr "以列的方式显示未跟踪的文件" + +#: builtin/commit.c:1246 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1262 +#: builtin/commit.c:1248 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1303 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1305 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1449 +#: builtin/commit.c:1358 +msgid "suppress summary after successful commit" +msgstr "提交成功后不显示概述信息" + +#: builtin/commit.c:1359 +msgid "show diff in commit message template" +msgstr "在提交说明模板里显示差异" + +#: builtin/commit.c:1361 +msgid "Commit message options" +msgstr "提交说明选项" + +#: builtin/commit.c:1362 builtin/tag.c:457 +msgid "read message from file" +msgstr "从文件中读取提交说明" + +#: builtin/commit.c:1363 +msgid "author" +msgstr "作者" + +#: builtin/commit.c:1363 +msgid "override author for commit" +msgstr "提交时覆盖作者" + +#: builtin/commit.c:1364 builtin/gc.c:178 +msgid "date" +msgstr "日期" + +#: builtin/commit.c:1364 +msgid "override date for commit" +msgstr "提交时覆盖日期" + +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 +msgid "message" +msgstr "说明" + +#: builtin/commit.c:1365 +msgid "commit message" +msgstr "提交说明" + +#: builtin/commit.c:1366 +msgid "reuse and edit message from specified commit" +msgstr "重用并编辑指定提交的提交说明" + +#: builtin/commit.c:1367 +msgid "reuse message from specified commit" +msgstr "重用指定提交的提交说明" + +#: builtin/commit.c:1368 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" + +#: builtin/commit.c:1369 +msgid "use autosquash formatted message to squash specified commit" +msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" + +#: builtin/commit.c:1370 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" + +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "添加 Signed-off-by: 签名" + +#: builtin/commit.c:1372 +msgid "use specified template file" +msgstr "使用指定的模板文件" + +#: builtin/commit.c:1373 +msgid "force edit of commit" +msgstr "强制编辑提交" + +# 译者：可选值，不能翻译（或是原文中笔误，应为 mode） +#: builtin/commit.c:1374 +msgid "default" +msgstr "default" + +#: builtin/commit.c:1374 builtin/tag.c:460 +msgid "how to strip spaces and #comments from message" +msgstr "设置如何删除提交说明里的空格和#注释" + +#: builtin/commit.c:1375 +msgid "include status in commit message template" +msgstr "在提交说明模板里包含状态信息" + +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 +msgid "key id" +msgstr "key id" + +#: builtin/commit.c:1377 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "GPG 提交签名" + +#. end commit message options +#: builtin/commit.c:1380 +msgid "Commit contents options" +msgstr "提交内容选项" + +#: builtin/commit.c:1381 +msgid "commit all changed files" +msgstr "提交所有改动的文件" + +#: builtin/commit.c:1382 +msgid "add specified files to index for commit" +msgstr "添加指定的文件到索引区等待提交" + +#: builtin/commit.c:1383 +msgid "interactively add files" +msgstr "交互式添加文件" + +#: builtin/commit.c:1384 +msgid "interactively add changes" +msgstr "交互式添加变更" + +#: builtin/commit.c:1385 +msgid "commit only specified files" +msgstr "只提交指定的文件" + +#: builtin/commit.c:1386 +msgid "bypass pre-commit hook" +msgstr "绕过 pre-commit 钩子" + +#: builtin/commit.c:1387 +msgid "show what would be committed" +msgstr "显示将要提交的内容" + +#: builtin/commit.c:1398 +msgid "amend previous commit" +msgstr "修改先前的提交" + +#: builtin/commit.c:1399 +msgid "bypass post-rewrite hook" +msgstr "绕过 post-rewrite 钩子" + +#: builtin/commit.c:1404 +msgid "ok to record an empty change" +msgstr "允许一个空提交" + +#: builtin/commit.c:1407 +msgid "ok to record a change with an empty message" +msgstr "允许空的提交说明" + +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1524 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1529 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2834,6 +3931,134 @@ msgstr "" "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [选项]" + +#: builtin/config.c:51 +msgid "Config file location" +msgstr "配置文件位置" + +#: builtin/config.c:52 +msgid "use global config file" +msgstr "使用全局配置文件" + +#: builtin/config.c:53 +msgid "use system config file" +msgstr "使用系统级配置文件" + +#: builtin/config.c:54 +msgid "use repository config file" +msgstr "使用版本库级配置文件" + +#: builtin/config.c:55 +msgid "use given config file" +msgstr "使用指定的配置文件" + +#: builtin/config.c:56 +msgid "Action" +msgstr "操作" + +#: builtin/config.c:57 +msgid "get value: name [value-regex]" +msgstr "获取值：name [value-regex]" + +#: builtin/config.c:58 +msgid "get all values: key [value-regex]" +msgstr "获得所有的值：key [value-regex]" + +#: builtin/config.c:59 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "根据正则表达式获得值：name-regex [value-regex]" + +#: builtin/config.c:60 +msgid "replace all matching variables: name value [value_regex]" +msgstr "替换所有匹配的变量：name value [value_regex]" + +#: builtin/config.c:61 +msgid "add a new variable: name value" +msgstr "添加一个新的变量：name value" + +#: builtin/config.c:62 +msgid "remove a variable: name [value-regex]" +msgstr "删除一个变量：name [value-regex]" + +#: builtin/config.c:63 +msgid "remove all matches: name [value-regex]" +msgstr "删除所有匹配项：name [value-regex]" + +#: builtin/config.c:64 +msgid "rename section: old-name new-name" +msgstr "重命名小节：old-name new-name" + +#: builtin/config.c:65 +msgid "remove a section: name" +msgstr "删除一个小节：name" + +#: builtin/config.c:66 +msgid "list all" +msgstr "列出所有" + +#: builtin/config.c:67 +msgid "open an editor" +msgstr "打开一个编辑器" + +#: builtin/config.c:68 builtin/config.c:69 +msgid "slot" +msgstr "slot" + +#: builtin/config.c:68 +msgid "find the color configured: [default]" +msgstr "找到配置的颜色：[默认]" + +#: builtin/config.c:69 +msgid "find the color setting: [stdout-is-tty]" +msgstr "找到颜色设置：[stdout-is-tty]" + +#: builtin/config.c:70 +msgid "Type" +msgstr "类型" + +#: builtin/config.c:71 +msgid "value is \"true\" or \"false\"" +msgstr "值是 \"true\" 或 \"false\"" + +#: builtin/config.c:72 +msgid "value is decimal number" +msgstr "值是十进制数" + +#: builtin/config.c:73 +msgid "value is --bool or --int" +msgstr "值是 --bool or --int" + +#: builtin/config.c:74 +msgid "value is a path (file or directory name)" +msgstr "值是一个路径（文件或目录名）" + +#: builtin/config.c:75 +msgid "Other" +msgstr "其它" + +#: builtin/config.c:76 +msgid "terminate values with NUL byte" +msgstr "终止值是NUL字节" + +#: builtin/config.c:77 +msgid "respect include directives on lookup" +msgstr "查询时参照 include 指令递归查找" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "git count-objects [-v]" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [选项] <提交号>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [选项] --dirty" + #: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" @@ -2906,6 +4131,50 @@ msgstr "" "发现多于 %i 个 tag，列出最近的 %i 个\n" "在 %s 放弃搜索\n" +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "寻找提交之后的 tag（用于描述提交）" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "在标准错误上调试搜索策略" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "使用 .git/refs 里的任意引用" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "使用 .git/refs/tags 里的任意 tag" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "始终使用长提交号格式" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "只输出精确匹配" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "考虑最近 <n> 个 tags（默认：10）" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "只考虑匹配 <模式> 的 tags" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "显示简写的提交号作为后备" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "标记" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）" + #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" @@ -2923,106 +4192,231 @@ msgstr "--dirty 不能与提交同时使用" msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "不是一个 git 版本库" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "提供了超过 %d 个树对象：'%s'" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" -msgstr "提供了超过两个二进制对象（blob）：'%s'" +msgstr "提供了超过两个数据（blob）对象：'%s'" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" -#: builtin/fetch.c:200 +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-opts]" + +#: builtin/fast-export.c:646 +msgid "show progress after <n> objects" +msgstr "在 <n> 个对象之后显示进度" + +#: builtin/fast-export.c:648 +msgid "select handling of signed tags" +msgstr "选择如何处理签名 tags" + +#: builtin/fast-export.c:651 +msgid "select handling of tags that tag filtered objects" +msgstr "选择当 tag 指向被过滤时 tags 的处理方式" + +#: builtin/fast-export.c:654 +msgid "Dump marks to this file" +msgstr "把标记存储到这个文件" + +#: builtin/fast-export.c:656 +msgid "Import marks from this file" +msgstr "从这个文件导入标记" + +#: builtin/fast-export.c:658 +msgid "Fake a tagger when tags lack one" +msgstr "当 tags 缺少标记者字段时，假装提供一个" + +#: builtin/fast-export.c:660 +msgid "Output full tree for each commit" +msgstr "每次提交都输出整个树" + +#: builtin/fast-export.c:662 +msgid "Use the done feature to terminate the stream" +msgstr "使用 done 功能来终止流" + +#: builtin/fast-export.c:663 +msgid "Skip output of blob data" +msgstr "跳过数据对象的输出" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<选项>] <组>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<选项>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "从所有的远程抓取" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "上传包到远程的路径" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "强制覆盖本地分支" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "从多个远程抓取" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "抓取所有的 tags 和关联对象" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "不抓取任何 tags (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "清除远程已经不存在的分支的跟踪分支" + +# 译者：可选值，不能翻译 +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "控制子模组的递归抓取" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "保持下载包" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "允许更新 HEAD 引用" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "深化浅克隆的历史" + +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "转换为一个完整的版本库" + +#: builtin/fetch.c:88 builtin/log.c:1119 +msgid "dir" +msgstr "目录" + +#: builtin/fetch.c:89 +msgid "prepend this to submodule path output" +msgstr "在子模组路径输出的前面加上此目录" + +#: builtin/fetch.c:92 +msgid "default mode for recursion" +msgstr "递归的默认模式" + +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:253 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -3032,82 +4426,209 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" -msgstr " （%s 将成为悬空状态）" +msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" -msgstr " （%s 已成为悬空状态）" +msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非裸版本库的当前分支 %s" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:890 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:907 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" -#: builtin/fetch.c:927 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:979 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth 和 --unshallow 不能同时使用" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:981 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用表达式没有任何意义" -#: builtin/fetch.c:992 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用表达式没有意义" +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" + +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:660 +msgid "populate log with at most <n> entries from shortlog" +msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" + +#: builtin/fmt-merge-msg.c:663 +msgid "alias for --log (deprecated)" +msgstr "参数 --log 的别名（已弃用）" + +#: builtin/fmt-merge-msg.c:666 +msgid "text" +msgstr "文本" + +#: builtin/fmt-merge-msg.c:667 +msgid "use <text> as start of message" +msgstr "使用 <文本> 作为提交说明的开始" + +#: builtin/fmt-merge-msg.c:668 +msgid "file to read from" +msgstr "从文件中读取" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [选项] [<模式>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "引用占位符适用于 shells" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "引用占位符适用于 perl" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "引用占位符适用于 python" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "引用占位符适用于 tcl" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "只显示 <n> 个匹配的引用" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "格式" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "输出格式" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "key" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "排序的字段名" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [选项] [<对象>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "显示不可达的对象" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "显示摇摆的对象" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "报告 tags" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "报告根节点" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "将索引亦作为检查的头节点" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "将引用日志作为检查的头节点（默认）" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "也考虑包和备用对象" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "启用更严格的检查" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "将摇摆对象写入 .git/lost-found 中" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "显示进度" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [选项]" + #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" @@ -3118,12 +4639,19 @@ msgstr "无效的 %s：'%s'" msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "自动打包版本库以求最佳性能。\n" +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "清除未引用的对象" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:224 +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "启用自动垃圾回收模式" + +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -3132,94 +4660,323 @@ msgstr "" "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" "参见 \"git help gc\" 以获取更多信息。\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" -#: builtin/grep.c:216 +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]" + +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c:454 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "无法切换目录：%s" -#: builtin/grep.c:530 builtin/grep.c:564 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:578 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:636 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:653 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:917 +#: builtin/grep.c:643 +msgid "search in index instead of in the work tree" +msgstr "在索引区搜索而不是在工作区" + +#: builtin/grep.c:645 +msgid "find in contents not managed by git" +msgstr "在未被 git 管理的内容中查找" + +# 译者：中文字符串拼接，可删除前导空格 +#: builtin/grep.c:647 +msgid "search in both tracked and untracked files" +msgstr "在跟踪和未跟踪的文件中搜索" + +#: builtin/grep.c:649 +msgid "search also in ignored files" +msgstr "也在忽略的文件中搜索" + +#: builtin/grep.c:652 +msgid "show non-matching lines" +msgstr "显示未匹配的行" + +#: builtin/grep.c:654 +msgid "case insensitive matching" +msgstr "不区分大小写匹配" + +#: builtin/grep.c:656 +msgid "match patterns only at word boundaries" +msgstr "只在单词边界匹配模式" + +#: builtin/grep.c:658 +msgid "process binary files as text" +msgstr "把二进制文件当做文本处理" + +#: builtin/grep.c:660 +msgid "don't match patterns in binary files" +msgstr "不在二进制文件中匹配模式" + +#: builtin/grep.c:663 +msgid "descend at most <depth> levels" +msgstr "最多以指定的深度向下寻找" + +#: builtin/grep.c:667 +msgid "use extended POSIX regular expressions" +msgstr "使用扩展的 POSIX 正则表达式" + +#: builtin/grep.c:670 +msgid "use basic POSIX regular expressions (default)" +msgstr "使用基本的 POSIX 正则表达式（默认）" + +#: builtin/grep.c:673 +msgid "interpret patterns as fixed strings" +msgstr "把模式解析为固定的字符串" + +#: builtin/grep.c:676 +msgid "use Perl-compatible regular expressions" +msgstr "使用 Perl 兼容的正则表达式" + +#: builtin/grep.c:679 +msgid "show line numbers" +msgstr "显示行号" + +#: builtin/grep.c:680 +msgid "don't show filenames" +msgstr "不显示文件名" + +#: builtin/grep.c:681 +msgid "show filenames" +msgstr "显示文件名" + +#: builtin/grep.c:683 +msgid "show filenames relative to top directory" +msgstr "显示相对于顶级目录的文件名" + +#: builtin/grep.c:685 +msgid "show only filenames instead of matching lines" +msgstr "只显示文件名而不显示匹配的行" + +#: builtin/grep.c:687 +msgid "synonym for --files-with-matches" +msgstr "和 --files-with-matches 同义" + +#: builtin/grep.c:690 +msgid "show only the names of files without match" +msgstr "只显示未匹配的文件名" + +#: builtin/grep.c:692 +msgid "print NUL after filenames" +msgstr "在文件名后输出 NUL 字符" + +#: builtin/grep.c:694 +msgid "show the number of matches instead of matching lines" +msgstr "显示总匹配行数，而不显示匹配的行" + +#: builtin/grep.c:695 +msgid "highlight matches" +msgstr "高亮显示匹配项" + +#: builtin/grep.c:697 +msgid "print empty line between matches from different files" +msgstr "在不同文件的匹配项之间打印空行" + +#: builtin/grep.c:699 +msgid "show filename only once above matches from same file" +msgstr "只在同一文件的匹配项的上面显示一次文件名" + +#: builtin/grep.c:702 +msgid "show <n> context lines before and after matches" +msgstr "显示匹配项前后的 <n> 行上下文" + +#: builtin/grep.c:705 +msgid "show <n> context lines before matches" +msgstr "显示匹配项前 <n> 行上下文" + +#: builtin/grep.c:707 +msgid "show <n> context lines after matches" +msgstr "显示匹配项后 <n> 行上下文" + +#: builtin/grep.c:708 +msgid "shortcut for -C NUM" +msgstr "快捷键 -C 数字" + +#: builtin/grep.c:711 +msgid "show a line with the function name before matches" +msgstr "在匹配的前面显示一行函数名" + +#: builtin/grep.c:713 +msgid "show the surrounding function" +msgstr "显示所在函数的前后内容" + +#: builtin/grep.c:716 +msgid "read patterns from file" +msgstr "从文件读取模式" + +#: builtin/grep.c:718 +msgid "match <pattern>" +msgstr "匹配 <模式>" + +#: builtin/grep.c:720 +msgid "combine patterns specified with -e" +msgstr "组合用 -e 参数设定的模式" + +#: builtin/grep.c:732 +msgid "indicate hit with exit status without output" +msgstr "不输出，而用退出码标识命中状态" + +#: builtin/grep.c:734 +msgid "show only matches from files that match all patterns" +msgstr "只显示匹配所有模式的文件中的匹配" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "显示 grep 表达式的解析树" + +#: builtin/grep.c:740 +msgid "pager" +msgstr "分页" + +#: builtin/grep.c:740 +msgid "show matching files in the pager" +msgstr "分页显示匹配的文件" + +#: builtin/grep.c:743 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "允许调用 grep(1)（本次构建忽略）" + +#: builtin/grep.c:744 builtin/show-ref.c:184 +msgid "show usage" +msgstr "显示用法" + +#: builtin/grep.c:811 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:931 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "坏对象 %s" -#: builtin/grep.c:972 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:995 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:1000 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:1003 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:1011 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" -#: builtin/help.c:65 +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" +"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " +"<文件>..." + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <路径列表>" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "类型" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "对象类型" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "将对象写入对象数据库" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "从标准输入读取对象" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "原样存储文件不使用过滤器" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "处理文件并假设其来自于此路径" + +#: builtin/help.c:42 +msgid "print all available commands" +msgstr "打印所有可用的命令" + +#: builtin/help.c:43 +msgid "show man page" +msgstr "显示 man 手册" + +#: builtin/help.c:44 +msgid "show manual in web browser" +msgstr "在 web 浏览器中显示手册" + +#: builtin/help.c:46 +msgid "show info page" +msgstr "显示 info 手册" + +#: builtin/help.c:52 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "git help [--all] [--man|--web|--info] [命令]" + +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "emacsclient 版本 '%d' 太老 (< 22)。" +msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s'：%s" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -3228,7 +4985,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" -#: builtin/help.c:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -3237,29 +4994,25 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "最常用的 git 命令有：" - -#: builtin/help.c:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:384 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:392 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" @@ -3310,6 +5063,11 @@ msgstr "无法打开包文件 '%s'" msgid "pack signature mismatch" msgstr "包签名不匹配" +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "不支持包版本 %<PRIu32>" + #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" @@ -3368,7 +5126,7 @@ msgstr "不能读取现存对象 %s" #: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" -msgstr "无效的二进制对象（blob）%s" +msgstr "无效的数据（blob）对象 %s" #: builtin/index-pack.c:747 #, c-format @@ -3416,93 +5174,123 @@ msgstr "parse_pack_objects() 中遇到不可理喻的问题" msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1105 +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "不能创建线程：%s" + +#: builtin/index-pack.c:1106 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "完成 %d 个本地对象" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" + +#: builtin/index-pack.c:1125 #, 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:1149 +#: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" -msgstr "不能缩小附加对象（%d）" +msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1228 +#: builtin/index-pack.c:1229 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1253 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1274 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" -#: builtin/index-pack.c:1286 +#: builtin/index-pack.c:1287 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1297 +#: builtin/index-pack.c:1298 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "坏的 pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "指定的线程数无效（%d）" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "没有线程支持，忽略 %s" + +#: builtin/index-pack.c:1399 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1401 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1448 #, 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:1454 +#: builtin/index-pack.c:1455 #, 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:1481 +#: builtin/index-pack.c:1482 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1558 +#: builtin/index-pack.c:1559 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" @@ -3623,6 +5411,26 @@ msgstr "共享" msgid "cannot tell cwd" msgstr "无法获知当前路径" +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " +"[目录]" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "权限" + +#: builtin/init-db.c:491 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "指定 git 版本库是多个用户之间共享的" + +#: builtin/init-db.c:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "保持安静" + #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" @@ -3651,104 +5459,396 @@ msgstr "不能访问当前工作目录" msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/log.c:189 +#: builtin/log.c:39 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n" + +#: builtin/log.c:40 +msgid " or: git show [options] <object>..." +msgstr " 或者：git show [选项] <对象>..." + +#: builtin/log.c:102 +msgid "suppress diff output" +msgstr "不显示差异输出" + +#: builtin/log.c:103 +msgid "show source" +msgstr "显示源" + +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "使用邮件映射文件" + +#: builtin/log.c:105 +msgid "decorate options" +msgstr "修饰选项" + +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:518 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:608 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:682 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:693 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:707 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:715 +#: builtin/log.c:739 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:789 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:862 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:935 +#: builtin/log.c:913 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [选项] [<从> | <修订集范围>]" + +#: builtin/log.c:958 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1157 +#: builtin/log.c:1097 +msgid "use [PATCH n/m] even with a single patch" +msgstr "使用 [PATCH n/m]，即使只有一个补丁" + +#: builtin/log.c:1100 +msgid "use [PATCH] even with multiple patches" +msgstr "使用 [PATCH]，即使有多个补丁" + +#: builtin/log.c:1104 +msgid "print patches to standard out" +msgstr "打印补丁到标准输出" + +#: builtin/log.c:1106 +msgid "generate a cover letter" +msgstr "生成一封附信" + +#: builtin/log.c:1108 +msgid "use simple number sequence for output file names" +msgstr "使用简单的数字序列作为输出文件名" + +#: builtin/log.c:1109 +msgid "sfx" +msgstr "后缀" + +#: builtin/log.c:1110 +msgid "use <sfx> instead of '.patch'" +msgstr "使用 <后缀> 代替 '.patch'" + +#: builtin/log.c:1112 +msgid "start numbering patches at <n> instead of 1" +msgstr "补丁以 <n> 开始编号，而不是1" + +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "标记补丁系列是第几次重制" + +#: builtin/log.c:1116 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "使用 [<前缀>] 代替 [PATCH]" + +#: builtin/log.c:1119 +msgid "store resulting files in <dir>" +msgstr "把结果文件存储在 <dir>" + +#: builtin/log.c:1122 +msgid "don't strip/add [PATCH]" +msgstr "不删除/添加 [PATCH]" + +#: builtin/log.c:1125 +msgid "don't output binary diffs" +msgstr "不输出二进制差异" + +#: builtin/log.c:1127 +msgid "don't include a patch matching a commit upstream" +msgstr "不包含已在上游提交中的补丁" + +#: builtin/log.c:1129 +msgid "show patch format instead of default (patch + stat)" +msgstr "显示纯补丁格式而非默认的（补丁+状态）" + +#: builtin/log.c:1131 +msgid "Messaging" +msgstr "邮件发送" + +#: builtin/log.c:1132 +msgid "header" +msgstr "header" + +#: builtin/log.c:1133 +msgid "add email header" +msgstr "添加邮件头" + +#: builtin/log.c:1134 builtin/log.c:1136 +msgid "email" +msgstr "邮件地址" + +#: builtin/log.c:1134 +msgid "add To: header" +msgstr "添加收件人" + +#: builtin/log.c:1136 +msgid "add Cc: header" +msgstr "添加抄送" + +#: builtin/log.c:1138 +msgid "message-id" +msgstr "message-id" + +#: builtin/log.c:1139 +msgid "make first mail a reply to <message-id>" +msgstr "使第一封邮件作为对 <message-id> 的回复" + +#: builtin/log.c:1140 builtin/log.c:1143 +msgid "boundary" +msgstr "边界" + +#: builtin/log.c:1141 +msgid "attach the patch" +msgstr "附件方式添加补丁" + +#: builtin/log.c:1144 +msgid "inline the patch" +msgstr "内联显示补丁" + +#: builtin/log.c:1148 +msgid "enable message threading, styles: shallow, deep" +msgstr "启用邮件线索，风格：浅，深" + +#: builtin/log.c:1150 +msgid "signature" +msgstr "签名" + +#: builtin/log.c:1151 +msgid "add a signature" +msgstr "添加一个签名" + +#: builtin/log.c:1153 +msgid "don't print the patch filenames" +msgstr "不要打印补丁文件名" + +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "虚假的提交者信息 %s" -#: builtin/log.c:1202 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1204 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1212 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1214 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1216 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1239 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1241 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1394 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1498 +#: builtin/log.c:1488 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" + +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" +#: builtin/ls-files.c:409 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [选项] [<文件>...]" + +#: builtin/ls-files.c:466 +msgid "identify the file status with tags" +msgstr "用标签标识文件的状态" + +#: builtin/ls-files.c:468 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "使用小写字母表示 '假设未改变的' 文件" + +#: builtin/ls-files.c:470 +msgid "show cached files in the output (default)" +msgstr "显示缓存的文件（默认）" + +#: builtin/ls-files.c:472 +msgid "show deleted files in the output" +msgstr "显示已删除的文件" + +#: builtin/ls-files.c:474 +msgid "show modified files in the output" +msgstr "显示已修改的文件" + +#: builtin/ls-files.c:476 +msgid "show other files in the output" +msgstr "显示其它文件" + +#: builtin/ls-files.c:478 +msgid "show ignored files in the output" +msgstr "显示忽略的文件" + +#: builtin/ls-files.c:481 +msgid "show staged contents' object name in the output" +msgstr "显示暂存区内容的对象名称" + +#: builtin/ls-files.c:483 +msgid "show files on the filesystem that need to be removed" +msgstr "显示文件系统需要删除的文件" + +#: builtin/ls-files.c:485 +msgid "show 'other' directories' name only" +msgstr "只显示“其他”目录的名称" + +#: builtin/ls-files.c:488 +msgid "don't show empty directories" +msgstr "不显示空目录" + +#: builtin/ls-files.c:491 +msgid "show unmerged files in the output" +msgstr "显示未合并的文件" + +#: builtin/ls-files.c:493 +msgid "show resolve-undo information" +msgstr "显示 resolve-undo 信息" + +#: builtin/ls-files.c:495 +msgid "skip files matching pattern" +msgstr "匹配排除文件的模式" + +#: builtin/ls-files.c:498 +msgid "exclude patterns are read from <file>" +msgstr "从 <文件> 中读取排除模式" + +#: builtin/ls-files.c:501 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "从 <文件> 读取额外的每个目录的排除模式" + +#: builtin/ls-files.c:503 +msgid "add the standard git exclusions" +msgstr "添加标准的 git 排除" + +#: builtin/ls-files.c:506 +msgid "make the output relative to the project top directory" +msgstr "显示相对于顶级目录的文件名" + +#: builtin/ls-files.c:509 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "如果任何 <文件> 都不在索引区，视为错误" + +#: builtin/ls-files.c:510 +msgid "tree-ish" +msgstr "树或提交" + +#: builtin/ls-files.c:511 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" + +#: builtin/ls-files.c:513 +msgid "show debugging data" +msgstr "显示调试数据" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "只显示树" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "递归到子树" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "当递归时显示树" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "条目以NUL字符终止" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "包括对象大小" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "只列出文件名" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "使用文件的全路径" + +#: builtin/ls-tree.c:142 +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" + +#: builtin/merge.c:43 +msgid "git merge [options] [<commit>...]" +msgstr "git merge [选项] [<提交>...]" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [选项] <说明> HEAD <提交>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" @@ -3768,6 +5868,66 @@ msgstr "可用的策略有：" msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" +#: builtin/merge.c:183 +msgid "do not show a diffstat at the end of the merge" +msgstr "在合并的最后不显示差异统计" + +#: builtin/merge.c:186 +msgid "show a diffstat at the end of the merge" +msgstr "在合并的最后显示差异统计" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "（和 --stat 同义）" + +#: builtin/merge.c:189 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" + +#: builtin/merge.c:192 +msgid "create a single commit instead of doing a merge" +msgstr "创建一个单独的提交而不是做一次合并" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "如果合并成功，执行一次提交（默认）" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "在提交前编辑提交说明" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "允许快进（默认）" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "如果不能快进就放弃合并" + +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 +msgid "strategy" +msgstr "策略" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "要使用的合并策略" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "option=value" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "所选的合并策略的选项" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "合并的提交说明（针对非快进式合并）" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "放弃当前正在进行的合并" + #: builtin/merge.c:240 msgid "could not run stash." msgstr "不能进行进度保存。" @@ -3822,93 +5982,90 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s" msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "无法读取缓存" - -#: builtin/merge.c:709 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:723 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:876 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:885 +#: builtin/merge.c:782 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:891 +#: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" -"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n" +"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:915 +#: builtin/merge.c:812 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:927 +#: builtin/merge.c:824 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:992 +#: builtin/merge.c:889 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:1008 +#: builtin/merge.c:905 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:1049 +#: builtin/merge.c:946 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:1051 +#: builtin/merge.c:948 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:1053 +#: builtin/merge.c:950 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:1058 +#: builtin/merge.c:955 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1042 builtin/merge.c:1199 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1213 +#: builtin/merge.c:1110 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1126 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3916,11 +6073,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1129 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1236 +#: builtin/merge.c:1133 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3928,83 +6085,182 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1239 +#: builtin/merge.c:1136 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1248 +#: builtin/merge.c:1145 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1253 +#: builtin/merge.c:1150 msgid "You cannot combine --no-ff with --ff-only." msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" -#: builtin/merge.c:1260 +#: builtin/merge.c:1157 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1292 +#: builtin/merge.c:1189 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1295 +#: builtin/merge.c:1192 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1297 +#: builtin/merge.c:1194 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1412 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1457 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1516 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1584 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1492 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <提交> <提交>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <提交>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <提交>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <提交> <提交>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "输出所有共同的祖先" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "查找一个多路合并的祖先提交" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "显示不能被其他访问到的版本" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "第一个是其他的祖先提交么？" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" +"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "将结果发送到标准输出" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "使用基于 diff3 的合并" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "如果冲突，使用我们的版本" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "如果冲突，使用他们的版本" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "如果冲突，使用联合版本" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "如果冲突，使用指定长度的标记" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "不要警告冲突" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "为 file1/orig_file/file2 设置标签" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "输入以 NUL 字符终止" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "允许丢失的对象" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "允许创建一个以上的树" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [选项] <源>... <目标>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "强制移动/重命令，即使目标存在" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "跳过移动/重命名错误" + #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" @@ -4067,142 +6323,315 @@ msgstr "重命名 %s 至 %s\n" msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [选项] <提交>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [选项] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [选项] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "只打印名称（无 SHA-1）" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "只使用 tags 来命名提交" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "只使用和 <模式> 相匹配的引用" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "列出可以从所有引用访问的提交" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "从标准输入读取" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "允许打印 `未定义` 的名称" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <注解引用>] [list [<对象>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对" +"象>] [<对象>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象" +">] [<对象>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <注解引用>] edit [<对象>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <注解引用>] show [<对象>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <注解引用>] remove [<对象>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <注解引用>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <注解引用>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<对象>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<选项>] [<对象>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<选项>] <源对象> <目标对象>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<源对象> <目标对象>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<选项>] [<对象>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<对象>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<对象>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<选项>] <注解引用>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<选项>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<选项>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<对象>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<选项>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" -msgstr "不能打开 'show' 输出文件句柄" +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:155 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" -msgstr "无法为对象 '%s' 的 'show' 关闭管道" - -#: builtin/notes.c:158 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: builtin/notes.c:189 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:215 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c:217 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s 中" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c:275 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:299 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" -#: builtin/notes.c:340 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" -#: builtin/notes.c:350 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: builtin/notes.c:441 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:456 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "无法从 '%s' 到 '%s' 拷贝注解" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:580 +#: builtin/notes.c:534 builtin/notes.c:691 +msgid "note contents as a string" +msgstr "注解内容作为一个字符串" + +#: builtin/notes.c:537 builtin/notes.c:694 +msgid "note contents in a file" +msgstr "注解内容到一个文件中" + +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 +msgid "object" +msgstr "对象" + +#: builtin/notes.c:540 builtin/notes.c:697 +msgid "reuse and edit specified note object" +msgstr "重用和编辑指定的注解对象" + +#: builtin/notes.c:543 builtin/notes.c:700 +msgid "reuse specified note object" +msgstr "重用指定的注解对象" + +#: builtin/notes.c:545 builtin/notes.c:613 +msgid "replace existing notes" +msgstr "替换已存在的注解" + +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:635 +#: builtin/notes.c:614 +msgid "read objects from stdin" +msgstr "从标准输入读取对象" + +#: builtin/notes.c:616 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "重新加载 <命令> 的配置（隐含 --stdin）" + +#: builtin/notes.c:634 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:656 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:668 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:717 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -4211,41 +6640,251 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:971 +#: builtin/notes.c:863 +msgid "General options" +msgstr "通用选项" + +#: builtin/notes.c:865 +msgid "Merge options" +msgstr "合并选项" + +#: builtin/notes.c:867 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" + +#: builtin/notes.c:869 +msgid "Committing unmerged notes" +msgstr "提交未合并的注解" + +#: builtin/notes.c:871 +msgid "finalize notes merge by committing unmerged notes" +msgstr "通过提交未合并的注解来完成注解合并" + +#: builtin/notes.c:873 +msgid "Aborting notes merge resolution" +msgstr "中止注解合并的方案" + +#: builtin/notes.c:875 +msgid "abort notes merge" +msgstr "中止注解合并" + +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:982 +msgid "attempt to remove non-existent note is not an error" +msgstr "尝试删除不存在的注解不是一个错误" + +#: builtin/notes.c:985 +msgid "read object names from the standard input" +msgstr "从标准输入读取对象名称" + +#: builtin/notes.c:1066 +msgid "notes_ref" +msgstr "注解引用" + +#: builtin/notes.c:1067 +msgid "use notes from <notes_ref>" +msgstr "从 <注解引用> 使用注解" + +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" + #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" +#: builtin/pack-objects.c:2447 +msgid "do not show progress meter" +msgstr "不显示进度表" + +#: builtin/pack-objects.c:2449 +msgid "show progress meter" +msgstr "显示进度表" + +#: builtin/pack-objects.c:2451 +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" + +#: builtin/pack-objects.c:2454 +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" + +#: builtin/pack-objects.c:2455 +msgid "version[,offset]" +msgstr "版本[,偏移]" + +#: builtin/pack-objects.c:2456 +msgid "write the pack index file in the specified idx format version" +msgstr "用指定的 idx 格式版本来写包索引文件" + +#: builtin/pack-objects.c:2459 +msgid "maximum size of each output pack file" +msgstr "每个输出包的最大尺寸" + +#: builtin/pack-objects.c:2461 +msgid "ignore borrowed objects from alternate object store" +msgstr "忽略从替代对象存储里借用对象" + +#: builtin/pack-objects.c:2463 +msgid "ignore packed objects" +msgstr "忽略包对象" + +#: builtin/pack-objects.c:2465 +msgid "limit pack window by objects" +msgstr "限制打包窗口的对象数" + +#: builtin/pack-objects.c:2467 +msgid "limit pack window by memory in addition to object limit" +msgstr "除对象数量限制外设置打包窗口的内存限制" + +#: builtin/pack-objects.c:2469 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "打包允许的 delta 链的最大长度" + +#: builtin/pack-objects.c:2471 +msgid "reuse existing deltas" +msgstr "重用已存在的 deltas" + +#: builtin/pack-objects.c:2473 +msgid "reuse existing objects" +msgstr "重用已存在的对象" + +#: builtin/pack-objects.c:2475 +msgid "use OFS_DELTA objects" +msgstr "使用 OFS_DELTA 对象" + +#: builtin/pack-objects.c:2477 +msgid "use threads when searching for best delta matches" +msgstr "使用线程查询最佳 delta 匹配" + +#: builtin/pack-objects.c:2479 +msgid "do not create an empty pack output" +msgstr "不创建空的包输出" + +#: builtin/pack-objects.c:2481 +msgid "read revision arguments from standard input" +msgstr "从标准输入读取修订号参数" + +#: builtin/pack-objects.c:2483 +msgid "limit the objects to those that are not yet packed" +msgstr "限制那些尚未打包的对象" + +#: builtin/pack-objects.c:2486 +msgid "include objects reachable from any reference" +msgstr "包括可以从任何引用访问到的对象" + +#: builtin/pack-objects.c:2489 +msgid "include objects referred by reflog entries" +msgstr "包括被引用日志引用到的对象" + +#: builtin/pack-objects.c:2492 +msgid "output pack to stdout" +msgstr "输出包到标准输出" + +#: builtin/pack-objects.c:2494 +msgid "include tag objects that refer to objects to be packed" +msgstr "包括引用了打包对象的 tag" + +#: builtin/pack-objects.c:2496 +msgid "keep unreachable objects" +msgstr "维持不可达的对象" + +#: builtin/pack-objects.c:2497 parse-options.h:141 +msgid "time" +msgstr "时间" + +#: builtin/pack-objects.c:2498 +msgid "unpack unreachable objects newer than <time>" +msgstr "将比给定 <时间> 新的无法访问的对象解包" + +#: builtin/pack-objects.c:2501 +msgid "create thin packs" +msgstr "创建精简包" + +#: builtin/pack-objects.c:2503 +msgid "ignore packs that have companion .keep file" +msgstr "忽略配有 .keep 文件的包" + +#: builtin/pack-objects.c:2505 +msgid "pack compression level" +msgstr "打包压缩级别" + +#: builtin/pack-objects.c:2507 +msgid "do not hide commits by grafts" +msgstr "不隐藏移植覆盖的提交" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [选项]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "打包一切" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "清除松散的引用（默认）" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "不删除，只显示" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "报告清除的对象" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "使早于给定时间的对象过期" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]" + #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "tag 简写没有跟 <tag> 参数" @@ -4399,22 +7038,48 @@ msgstr "" "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" +"一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更\n" +"（如 'git pull'）。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "更新被拒绝因为 tag 在远程已经存在。" + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" +"也不能更新远程引用让其指向一个非提交对象。\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4427,7 +7092,7 @@ msgid "" " git push <name>\n" msgstr "" "没有配置推送目标。\n" -"或者通过命令行指定URL，或者用下面命令配置一个远程版本库\n" +"或通过命令行指定URL，或用下面命令配置一个远程版本库\n" "\n" " git remote add <name> <url>\n" "\n" @@ -4435,34 +7100,237 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用表达式同时使用" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用表达式同时使用" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:410 +#: builtin/push.c:419 +msgid "repository" +msgstr "版本库" + +#: builtin/push.c:420 +msgid "push all refs" +msgstr "推送所有引用" + +#: builtin/push.c:421 +msgid "mirror all refs" +msgstr "镜像所有引用" + +#: builtin/push.c:423 +msgid "delete refs" +msgstr "删除引用" + +#: builtin/push.c:424 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "推送 tags（不能使用 --all or --mirror）" + +#: builtin/push.c:427 +msgid "force updates" +msgstr "强制更新" + +#: builtin/push.c:428 +msgid "check" +msgstr "检查" + +#: builtin/push.c:429 +msgid "control recursive pushing of submodules" +msgstr "控制子模组的递归推送" + +#: builtin/push.c:431 +msgid "use thin pack" +msgstr "使用精简打包" + +#: builtin/push.c:432 builtin/push.c:433 +msgid "receive pack program" +msgstr "接收包程序" + +#: builtin/push.c:434 +msgid "set upstream for git pull/status" +msgstr "设置 git pull/status 的上游" + +#: builtin/push.c:437 +msgid "prune locally removed refs" +msgstr "清除本地删除的引用" + +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "绕过 pre-push 钩子" + +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" +#: builtin/read-tree.c:36 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-" +"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" + +#: builtin/read-tree.c:108 +msgid "write resulting index to <file>" +msgstr "将索引结果写入 <file>" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "只是清空索引" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "合并" + +#: builtin/read-tree.c:115 +msgid "perform a merge in addition to a read" +msgstr "读取之余再执行一个合并" + +#: builtin/read-tree.c:117 +msgid "3-way merge if no file level merging required" +msgstr "如果没有文件级合并需要，执行三路合并" + +#: builtin/read-tree.c:119 +msgid "3-way merge in presence of adds and removes" +msgstr "存在添加和删除时，也执行三路合并" + +#: builtin/read-tree.c:121 +msgid "same as -m, but discard unmerged entries" +msgstr "类似于 -m，但丢弃未合并的条目" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<子目录>/" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "读取树对象到索引的 <子目录>/ 下" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "用合并的结果更新工作区" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "允许忽略文件中设定的文件可以被覆盖" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "合并后不检查工作区" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "不更新索引区和工作区" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "跳过应用稀疏检出过滤器" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "调试 unpack-trees" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:12 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <名称> <url>" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <旧名称> <新名称>" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <名称>" + +#: builtin/remote.c:15 builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <名称> (-a | -d | <分支>)" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <名称>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <名称>" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <名称> <分支>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <名称> <新的地址>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <名称> <地址>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<选项>] <名称> <地址>" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <名称> <分支>..." + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <名称> <分支>..." + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<选项>] <名称>" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<选项>] <名称>" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<选项>] [<组> | <远程>]..." + #: builtin/remote.c:98 #, c-format msgid "Updating %s" @@ -4481,6 +7349,34 @@ msgstr "" msgid "unknown mirror argument: %s" msgstr "未知的镜像参数：%s" +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "抓取远程的分支" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "抓取时导入所有的 tags 和关联对象" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "或不抓取任何 tag（--no-tags）" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "跟踪的分支" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "主线分支" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "把远程设置为用以推送或抓取的镜像" + #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" @@ -4673,6 +7569,10 @@ msgstr " %-*s 强制推送至 %s" msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "不查询远程" + #: builtin/remote.c:1118 #, c-format msgid "* remote %s" @@ -4732,6 +7632,14 @@ msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" +#: builtin/remote.c:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "根据远程设置 refs/remotes/<名称>/HEAD" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "删除 refs/remotes/<名称>/HEAD" + #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" @@ -4759,13 +7667,13 @@ msgstr "不能设置 %s" #: builtin/remote.c:1274 #, c-format msgid " %s will become dangling!" -msgstr " %s 将成为悬空状态！" +msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 #: builtin/remote.c:1275 #, c-format msgid " %s has become dangling!" -msgstr " %s 已成为悬空状态！" +msgstr " %s 已成为摇摆状态！" #: builtin/remote.c:1281 #, c-format @@ -4787,15 +7695,35 @@ msgstr " * [将删除] %s" msgid " * [pruned] %s" msgstr " * [已删除] %s" +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "抓取后清除远程" + #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "添加分支" + #: builtin/remote.c:1414 msgid "no remote specified" msgstr "未指定远程" +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "操作推送 URLS" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "添加 URL" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "删除 URLS" + #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" @@ -4814,6 +7742,55 @@ msgstr "未找到此URL：%s" msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送URL地址" +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "冗长输出；必须置于子命令之前" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <对象> <替换物>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <对象>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<模式>]" + +#: builtin/replace.c:121 +msgid "list replace refs" +msgstr "列出替换的引用" + +#: builtin/replace.c:122 +msgid "delete replace refs" +msgstr "删除替换的引用" + +#: builtin/replace.c:123 +msgid "replace the ref if it exists" +msgstr "如果存在则替换引用" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "在索引中注册干净的解决方案" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <树或提交> [--] <路径>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" + #: builtin/reset.c:33 msgid "mixed" msgstr "混杂" @@ -4834,90 +7811,227 @@ msgstr "合并" msgid "keep" msgstr "保持" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "不能写入新的索引文件。" - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "不能读取索引" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "重置后撤出暂存区的变更：" - # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:303 +#: builtin/reset.c:248 +msgid "be quiet, only report errors" +msgstr "安静模式，只报告错误" + +#: builtin/reset.c:250 +msgid "reset HEAD and index" +msgstr "重置 HEAD 和索引" + +#: builtin/reset.c:251 +msgid "reset only HEAD" +msgstr "只重置 HEAD" + +#: builtin/reset.c:253 builtin/reset.c:255 +msgid "reset HEAD, index and working tree" +msgstr "重置 HEAD、索引和工作区" + +#: builtin/reset.c:257 +msgid "reset HEAD but keep local changes" +msgstr "重置 HEAD 但保存本地变更" + +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "无法将 '%s' 解析为一个有效的版本。" + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "无法将 '%s' 解析为一个有效的树对象。" + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch 与 --{hard,mixed,soft} 不兼容" +msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "重置后撤出暂存区的变更：" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "不能写入新的索引文件。" + +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "保持 `--` 作为一个参数传递" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "遇到第一个非选项参数后停止解析" + +#: builtin/rev-parse.c:464 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [options] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" +"git rev-parse --parseopt [选项] -- [<参数>...]\n" +" 或者：git rev-parse --sq-quote [<选项>...]\n" +" 或者：git rev-parse [options] [<选项>...]\n" +"\n" +"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "git revert [选项] <提交号>" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <子命令>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "git cherry-pick [选项] <提交号>" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <子命令>" + #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s：%s 不能和 %s 同时使用" -#: builtin/revert.c:131 +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "终止反转或拣选操作" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "继续反转或拣选操作" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "取消反转或拣选操作" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "不要自动提交" + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "编辑提交说明" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "父编号" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "合并策略" + +#: builtin/revert.c:113 +msgid "option" +msgstr "选项" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "合并策略的选项" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "追加提交名称" + +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "允许快进式" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "保留初始化的空提交" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "允许提交说明为空" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "保持多余的、空的提交" + +#: builtin/revert.c:133 msgid "program error" msgstr "程序错误" -#: builtin/revert.c:221 +#: builtin/revert.c:223 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:236 +#: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "拣选失败" -#: builtin/rm.c:109 +#: builtin/rm.c:15 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [选项] [--] <文件>..." + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n" +"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -4926,7 +8040,7 @@ msgstr "" "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" "（使用 -f 强制删除）" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -4935,7 +8049,7 @@ msgstr "" "'%s' 有变更已暂存至索引中\n" "（使用 --cached 保存文件，或用 -f 强制删除）" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" @@ -4944,21 +8058,238 @@ msgstr "" "'%s' 有本地修改\n" "（使用 --cached 保存文件，或用 -f 强制删除）" -#: builtin/rm.c:194 +#: builtin/rm.c:207 +msgid "do not list removed files" +msgstr "不列出删除的文件" + +#: builtin/rm.c:208 +msgid "only remove from the index" +msgstr "只从索引区删除" + +#: builtin/rm.c:209 +msgid "override the up-to-date check" +msgstr "忽略文件更新状态检查" + +#: builtin/rm.c:210 +msgid "allow recursive removal" +msgstr "允许递归删除" + +#: builtin/rm.c:212 +msgid "exit with a zero status even if nothing matched" +msgstr "即使没有匹配，也以零状态退出" + +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]" + +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "缺少作者：%s" +#: builtin/shortlog.c:229 +msgid "sort output according to the number of commits per author" +msgstr "根据每个作者的提交数量排序" + +#: builtin/shortlog.c:231 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "隐藏提交说明，只提供提交数量" + +#: builtin/shortlog.c:233 +msgid "Show the email address of each author" +msgstr "显示每个作者的电子邮件地址" + +#: builtin/shortlog.c:234 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:235 +msgid "Linewrap output" +msgstr "折行输出" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" +msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "显示远程跟踪的和本地的分支" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "显示远程跟踪的分支" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "着色 '*!+-' 到相应的分支" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "显示共同祖先后的 <n> 个提交" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "和 more=-1 同义" + +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "不显示字符串命名" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "包括当前分支" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "以对象名字命名提交" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "显示可能合并的基线" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "显示没有任何引用的的引用" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "以拓扑顺序显示提交" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "只显示不在第一个分支上的提交" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "显示仅一个分支可访问的合并提交" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "显示提交时以时间为序且父提交不能领先子提交" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "<n>[,<base>]" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" + +#: builtin/show-ref.c:10 +msgid "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " + +#: builtin/show-ref.c:11 +msgid "git show-ref --exclude-existing[=pattern] < ref-list" +msgstr "git show-ref --exclude-existing[=模式] < 引用列表" + +#: builtin/show-ref.c:165 +msgid "only show tags (can be combined with heads)" +msgstr "只显示 tags（可以和头共用）" + +#: builtin/show-ref.c:166 +msgid "only show heads (can be combined with tags)" +msgstr "只显示头（可以和 tags 共用）" + +#: builtin/show-ref.c:167 +msgid "stricter reference checking, requires exact ref path" +msgstr "更严格的引用检测，需要精确的引用路径" + +#: builtin/show-ref.c:170 builtin/show-ref.c:172 +msgid "show the HEAD reference" +msgstr "显示 HEAD 引用" + +#: builtin/show-ref.c:174 +msgid "dereference tags into object IDs" +msgstr "转换 tags 到对象ID" + +#: builtin/show-ref.c:176 +msgid "only show SHA1 hash using <n> digits" +msgstr "只显示使用 <n> 个数字的 SHA1 哈希" + +#: builtin/show-ref.c:180 +msgid "do not print results to stdout (useful with --verify)" +msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" + +#: builtin/show-ref.c:182 +msgid "show refs from stdin that aren't in local repository" +msgstr "显示从标准输入中读入的不在本地版本库中的引用" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "git symbolic-ref [选项] 名称 [引用]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "git symbolic-ref -d [-q] 名称" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "不显示非符号（分离的）引用的错误信息" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "删除符号引用" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "简短的引用输出" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason" +msgstr "原因" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "更新的原因" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <标签名>..." + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" +"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n" +"\t\t[<模式>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <标签名>..." + #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" @@ -4985,150 +8316,356 @@ msgid "could not verify the tag '%s'" msgstr "不能校验 tag '%s'" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# 输入一个 tag 说明\n" -"# 以 '#' 开头的行将被忽略。\n" -"#\n" +"输入一个 tag 说明\n" +"以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# 输入一个 tag 说明\n" -"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n" -"#\n" +"输入一个 tag 说明\n" +"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "无法签署 tag" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "无法写 tag 文件" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "tag 头信息太大。" -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "无 tag 说明？" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被保留在 %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需要一个对象" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: builtin/tag.c:506 +#: builtin/tag.c:445 +msgid "list tag names" +msgstr "列出tag名称" + +#: builtin/tag.c:447 +msgid "print <n> lines of each tag message" +msgstr "每个 tag 信息打印 <n> 行" + +#: builtin/tag.c:449 +msgid "delete tags" +msgstr "删除 tags" + +#: builtin/tag.c:450 +msgid "verify tags" +msgstr "验证 tags" + +#: builtin/tag.c:452 +msgid "Tag creation options" +msgstr "Tag 创建选项" + +#: builtin/tag.c:454 +msgid "annotated tag, needs a message" +msgstr "注解 tag，需要一个说明" + +#: builtin/tag.c:456 +msgid "tag message" +msgstr "tag 说明" + +#: builtin/tag.c:458 +msgid "annotated and GPG-signed tag" +msgstr "注解并 GPG 签名的 tag" + +#: builtin/tag.c:462 +msgid "use another key to sign the tag" +msgstr "使用另外的私钥签名 tag" + +#: builtin/tag.c:463 +msgid "replace the tag if exists" +msgstr "如果存在，替换现有的 tag" + +#: builtin/tag.c:464 +msgid "show tag list in columns" +msgstr "以列的方式显示 tag" + +#: builtin/tag.c:466 +msgid "Tag listing options" +msgstr "Tag 列表选项" + +#: builtin/tag.c:469 +msgid "print only tags that contain the commit" +msgstr "只打印包含提交的tags" + +#: builtin/tag.c:475 +msgid "print only tags of the object" +msgstr "只打印tags对象" + +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "-n 选项只允许和 -l 同时使用。" -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "--contains 选项只允许和 -l 同时使用。" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项只允许和 -l 同时使用。" -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的tag名称。" -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' 已存在" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s：不能锁定引用" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s：不能更新引用" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'（曾为 %s）\n" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." -msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [选项] [--] [<文件>...]" -#: parse-options.h:133 parse-options.h:235 -msgid "n" -msgstr "数字" +#: builtin/update-index.c:718 +msgid "continue refresh even when index needs update" +msgstr "当索引需要更新时继续刷新" -#: parse-options.h:141 -msgid "time" -msgstr "时间" +#: builtin/update-index.c:721 +msgid "refresh: ignore submodules" +msgstr "刷新：忽略子模组" -#: parse-options.h:149 -msgid "file" -msgstr "文件" +#: builtin/update-index.c:724 +msgid "do not ignore new files" +msgstr "不忽略新的文件" -#: parse-options.h:151 -msgid "when" -msgstr "何时" +#: builtin/update-index.c:726 +msgid "let files replace directories and vice-versa" +msgstr "让文件替换目录（反之亦然）" + +#: builtin/update-index.c:728 +msgid "notice files missing from worktree" +msgstr "通知文件从工作区丢失" + +#: builtin/update-index.c:730 +msgid "refresh even if index contains unmerged entries" +msgstr "即使索引区包含未合并的条目也执行刷新" + +#: builtin/update-index.c:733 +msgid "refresh stat information" +msgstr "刷新统计信息" + +#: builtin/update-index.c:737 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" + +#: builtin/update-index.c:741 +msgid "<mode> <object> <path>" +msgstr "<mode> <object> <path>" + +#: builtin/update-index.c:742 +msgid "add the specified entry to the index" +msgstr "添加指定的条目到索引区" + +#: builtin/update-index.c:746 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:747 +msgid "override the executable bit of the listed files" +msgstr "覆盖列表里文件的可执行位" + +#: builtin/update-index.c:751 +msgid "mark files as \"not changing\"" +msgstr "把文件标记为 \"没有变更\"" + +#: builtin/update-index.c:754 +msgid "clear assumed-unchanged bit" +msgstr "清除 assumed-unchanged 位" + +#: builtin/update-index.c:757 +msgid "mark files as \"index-only\"" +msgstr "把文件标记为 \"仅索引\"" + +#: builtin/update-index.c:760 +msgid "clear skip-worktree bit" +msgstr "清除 skip-worktree 位" + +#: builtin/update-index.c:763 +msgid "add to index only; do not add content to object database" +msgstr "只添加到索引区；不添加对象到对象库" + +#: builtin/update-index.c:765 +msgid "remove named paths even if present in worktree" +msgstr "即使存在工作区里，也删除路径" + +#: builtin/update-index.c:767 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "携带 --stdin：输入的行以 null 字符终止" + +#: builtin/update-index.c:769 +msgid "read list of paths to be updated from standard input" +msgstr "从标准输入中读取需要更新的路径列表" + +#: builtin/update-index.c:773 +msgid "add entries from standard input to the index" +msgstr "从标准输入添加条目到索引区" + +#: builtin/update-index.c:777 +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "为指定文件重新生成第2和第3暂存区" + +#: builtin/update-index.c:781 +msgid "only update entries that differ from HEAD" +msgstr "只更新与 HEAD 不同的条目" + +#: builtin/update-index.c:785 +msgid "ignore files missing from worktree" +msgstr "忽略工作区丢失的文件" + +#: builtin/update-index.c:788 +msgid "report actions to standard output" +msgstr "在标准输出显示操作" + +#: builtin/update-index.c:790 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(for porcelains) 忘记保存的未解决的冲突" + +#: builtin/update-index.c:794 +msgid "write index in this format" +msgstr "以这种格式写入索引区" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [options] -d <引用名> [<旧值>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [options] <引用名> <新值> [<旧值>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "删除引用" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "更新 <引用名> 本身而不是它指向的引用" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "从头开始更新文件信息" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "冗长输出" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "只显示统计" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <tag>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "打印 tag 内容" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<前缀>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "将 <前缀> 子目录内容写到一个树对象" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "只对调试有用" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" @@ -5169,8 +8706,8 @@ msgid "Print lines matching a pattern" msgstr "输出和模式匹配的行" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" -msgstr "创建一个空的 git 版本库或者重新初始化一个" +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" #: common-cmds.h:18 msgid "Show commit logs" @@ -5243,11 +8780,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 "更新索引信息以重建基树..." +msgstr "使用索引来重建一个（三路合并的）基础目录树..." #: git-am.sh:154 msgid "" @@ -5255,7 +8792,7 @@ msgid "" "It does not apply to blobs recorded in its index." msgstr "" "您是否曾手动编辑过您的补丁？\n" -"无法应用补丁到索引中的二进制对象（blob）上。" +"无法应用补丁到索引中的数据（blob）对象上。" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." @@ -5358,13 +8895,22 @@ msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add #: git-am.sh:845 msgid "No changes -- Patch already applied." -msgstr "没有变更 -- 补丁已经应用过。" +msgstr "没有变更 —— 补丁已经应用过。" #: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"失败的补丁文件副本位于：\n" +" $dotest/patch" + #: git-am.sh:876 msgid "applying to an empty history" msgstr "正应用到一个空历史上" @@ -5480,7 +9026,7 @@ msgid "" "Try 'git bisect reset <commit>'." msgstr "" "不能检出原始 HEAD '$branch'。\n" -"尝试 'git bisect reset <commit>'。" +"尝试 'git bisect reset <提交>'。" #: git-bisect.sh:390 msgid "No logfile given" @@ -5507,7 +9053,7 @@ msgid "" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "二分查找运行失败：\n" -"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128" +"命令 '$command' 的退出码 $res 小于 0 或大于等于 128" #: git-bisect.sh:453 msgid "bisect run cannot continue any more" @@ -5548,7 +9094,7 @@ msgstr "更新尚未诞生的分支，变更添加至索引" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -5558,15 +9104,15 @@ msgstr "" "警告：fetch 更新了当前的分支。您的工作区\n" "警告：从原提交 $orig_head 快进。" -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" -#: git-pull.sh:257 +#: git-pull.sh:258 msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" -#: git-rebase.sh:52 +#: git-rebase.sh:53 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" @@ -5577,27 +9123,31 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:159 +#: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基。" -#: git-rebase.sh:164 +#: git-rebase.sh:165 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:295 +#: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive 同时使用" -#: git-rebase.sh:300 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "动作 --edit-todo 只能用在交互式变基过程中。" + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:316 +#: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -5605,12 +9155,12 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:334 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -5629,56 +9179,56 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:422 git-rebase.sh:426 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:454 +#: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:474 +#: git-rebase.sh:483 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:495 +#: git-rebase.sh:504 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:506 +#: git-rebase.sh:515 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" #. Detach HEAD and reset the tree -#: git-rebase.sh:515 +#: git-rebase.sh:524 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，重置头指针以便在上面重放您的工作..." -#: git-rebase.sh:523 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" @@ -5790,59 +9340,59 @@ msgstr "不能保存索引树" msgid "Cannot unstage modified files" msgstr "无法还原修改的文件" -#: git-stash.sh:474 +#: git-stash.sh:475 msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" -#: git-stash.sh:491 +#: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:492 +#: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：不能丢弃进度条目" -#: git-stash.sh:499 +#: git-stash.sh:500 msgid "No branch name specified" msgstr "未指定分支名" -#: git-stash.sh:570 +#: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:88 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "无法从 url '$remoteurl' 剥离一个组件" -#: git-submodule.sh:167 +#: git-submodule.sh:195 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" +msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" -#: git-submodule.sh:312 +#: git-submodule.sh:343 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:329 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:333 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5853,62 +9403,91 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:344 +#: git-submodule.sh:382 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" -#: git-submodule.sh:346 +#: git-submodule.sh:384 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" -#: git-submodule.sh:360 +#: git-submodule.sh:392 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库：" + +#: git-submodule.sh:394 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "如果您想重用此本地 git 目录而不是重新克隆自" + +#: git-submodule.sh:396 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" + +#: git-submodule.sh:397 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" + +#: git-submodule.sh:399 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "激活本地 git 目录到子模组 '$sm_name'。" + +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:365 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:370 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:413 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "正在进入 '$prefix$sm_path'" -#: git-submodule.sh:427 +#: git-submodule.sh:482 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "停止于 '$sm_path'，脚本返回非零值。" -#: git-submodule.sh:471 +#: git-submodule.sh:526 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" -#: git-submodule.sh:480 +#: git-submodule.sh:535 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册 url" -#: git-submodule.sh:482 +#: git-submodule.sh:537 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" -#: git-submodule.sh:490 +#: git-submodule.sh:545 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册更新模式" -#: git-submodule.sh:590 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5917,95 +9496,169 @@ msgstr "" "子模组路径 '$sm_path' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:603 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" -#: git-submodule.sh:622 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:636 +#: git-submodule.sh:709 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "子模组路径 '$sm_path'：变基至 '$sha1'" -#: git-submodule.sh:642 +#: git-submodule.sh:715 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" -#: git-submodule.sh:643 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'" -#: git-submodule.sh:648 +#: git-submodule.sh:721 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" -#: git-submodule.sh:649 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "子模组路径 '$sm_path'：检出 '$sha1'" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:779 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" #. unexpected type -#: git-submodule.sh:819 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:837 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " 警告：$name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:840 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:843 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:868 +#: git-submodule.sh:941 msgid "blob" -msgstr "二进制对象" +msgstr "数据对象" -#: git-submodule.sh:906 -msgid "# Submodules changed but not updated:" -msgstr "# 子模组已修改但尚未更新：" +#: git-submodule.sh:979 +msgid "Submodules changed but not updated:" +msgstr "子模组已修改但尚未更新：" -#: git-submodule.sh:908 -msgid "# Submodule changes to be committed:" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: git-submodule.sh:1054 +#: git-submodule.sh:1129 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "为 '$name' 同步子模组 url" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "为 '$prefix$sm_path' 同步子模组 url" + +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "不能打开 'show' 输出文件句柄" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道" + +#~ msgid " 0 files changed" +#~ msgstr " 0 个文件被修改" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d 个文件被修改" +#~ msgstr[1] " %d 个文件被修改" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] "，插入 %d 行(+)" +#~ msgstr[1] "，插入 %d 行(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] "，删除 %d 行(-)" +#~ msgstr[1] "，删除 %d 行(-)" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "您没有一个有效的 HEAD" + +#~ msgid "oops" +#~ msgstr "哎哟" + +#~ msgid "Would not remove %s\n" +#~ msgstr "不会删除 %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "未删除 %s\n" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "自动打包版本库以求最佳性能。\n" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])" + +#~ msgid "Could not read index" +#~ msgstr "不能读取索引" + +# 译者：中文字符串拼接，可删除前导空格 +#~ msgid " (use \"git add\" to track)" +#~ msgstr "（使用 \"git add\" 建立跟踪）" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "-B 不能和 -b 同时使用" + +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch 选项和其他选项不兼容" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach 不能和 -t 同时使用" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "--orphan 和 -b|-B 互斥" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan 不能和 -t 同时使用" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout：-f 和 -m 不兼容" + +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "git checkout：更新路径和切换分支不兼容。" #~ msgid "diff setup failed" #~ msgstr "diff 设置失败" |