diff --git a/po/TEAMS b/po/TEAMS index 4515f578c..cd3440ef5 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -8,6 +8,9 @@ Leader: Byrial Jensen Language: de (German) Repository: https://github.com/ralfth/git-po-de Leader: Ralf Thielow +Members: Thomas Rast + Jan Krüger + Christian Stimming Language: is (Icelandic) Leader: Ævar Arnfjörð Bjarmason diff --git a/po/de.po b/po/de.po index a43f64645..3f62c1ae8 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git 1.7.10\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2012-04-28 20:17+0800\n" +"POT-Creation-Date: 2012-05-08 15:45+0800\n" "PO-Revision-Date: 2012-03-28 18:46+0200\n" "Last-Translator: Ralf Thielow \n" "Language-Team: German\n" @@ -34,8 +34,8 @@ msgid "" "or use 'git commit -a'." msgstr "" "Korrigiere dies im Arbeitsbaum,\n" -"und benutze dann 'git add/rm ' wie\n" -"vorgesehen, um die Auflösung zu markieren und dann einzutragen,\n" +"und benutze dann 'git add/rm '\n" +"um die Auflösung entsprechend zu markieren und einzutragen,\n" "oder benutze 'git commit -a'." #: commit.c:48 @@ -54,7 +54,7 @@ msgstr "Speicher verbraucht" #: connected.c:39 msgid "Could not run 'git rev-list'" -msgstr "'git rev-list' konnte nicht ausgeführt werden" +msgstr "Konnte 'git rev-list' nicht ausführen" #: connected.c:48 #, c-format @@ -122,7 +122,7 @@ msgstr "" #: gpg-interface.c:59 msgid "could not run gpg." -msgstr "gpg konnte nicht ausgeführt werden" +msgstr "konnte gpg nicht ausführen" #: gpg-interface.c:71 msgid "gpg did not accept the data" @@ -145,7 +145,7 @@ msgstr "'%s': %s" #: grep.c:1308 #, c-format msgid "'%s': short read %s" -msgstr "'%s': kurz gelesen %s" +msgstr "'%s': read() zu kurz %s" #: help.c:287 #, c-format @@ -169,9 +169,10 @@ 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 hinter '%s' um %d Version, und kann vorgespult werden.\n" +"Dein Zweig ist zu '%s' um %d Version hinterher, und kann vorgespult werden.\n" msgstr[1] "" -"Dein Zweig ist hinter '%s' um %d Versionen, und kann vorgespult werden.\n" +"Dein Zweig ist zu '%s' um %d Versionen hinterher, und kann vorgespult " +"werden.\n" #: remote.c:1621 #, c-format @@ -259,7 +260,8 @@ msgstr "Du hast keine gültige Zweigspitze (HEAD)" #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -"Version %s ist eine Zusammenführung, aber es wurde keine Option -m angegeben." +"Version %s ist eine Zusammenführung, aber die Option -m wurde nicht " +"angegeben." #: sequencer.c:324 #, c-format @@ -294,8 +296,8 @@ msgstr "Konnte %s nicht zurücksetzen... %s" msgid "could not apply %s... %s" msgstr "Konnte %s nicht anwenden... %s" -#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719 -#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -331,12 +333,12 @@ msgstr "Keine Versionen geparst." #: sequencer.c:591 #, c-format msgid "Could not open %s" -msgstr "%s konnte nicht geöffnet werden." +msgstr "Konnte %s nicht öffnen" #: sequencer.c:595 #, c-format msgid "Could not read %s." -msgstr "%s konnte nicht gelesen werden." +msgstr "Konnte %s nicht lesen." #: sequencer.c:602 #, c-format @@ -360,7 +362,7 @@ msgstr "Fehlerhaftes Optionsblatt: %s" #: sequencer.c:666 msgid "a cherry-pick or revert is already in progress" -msgstr "\"cherry-pick\" oder \"revert\" wird bereits ausgeführt" +msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" #: sequencer.c:667 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" @@ -378,7 +380,7 @@ msgstr "Fehler beim Einpacken von %s." #: sequencer.c:706 sequencer.c:840 msgid "no cherry-pick or revert in progress" -msgstr "kein \"cherry-pick\" oder \"revert\" in Ausführung" +msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" #: sequencer.c:708 msgid "cannot resolve HEAD" @@ -386,7 +388,7 @@ msgstr "kann Zweigspitze (HEAD) nicht auflösen" #: sequencer.c:710 msgid "cannot abort from a branch yet to be born" -msgstr "kann nicht von einem Zweig abbrechen, der noch geboren wird" +msgstr "kann nicht abbrechen: bin auf einem Zweig, der noch geboren wird" #: sequencer.c:732 #, c-format @@ -462,7 +464,7 @@ msgstr "" #: wt-status.c:143 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -" (benutze \"git add/rm ...\" wie vorgesehen, um die Auflösung zu " +" (benutze \"git add/rm ...\" um die Auflösung entsprechend zu " "markieren)" #: wt-status.c:151 @@ -475,12 +477,11 @@ msgstr "Änderungen, die nicht zum Eintragen bereitgestellt sind:" #: wt-status.c:173 msgid " (use \"git add ...\" to update what will be committed)" -msgstr " (benutze \"git add ...\" zur Aktualisierung der Eintragung)" +msgstr " (benutze \"git add ...\" zum Bereitstellen)" #: wt-status.c:175 msgid " (use \"git add/rm ...\" to update what will be committed)" -msgstr "" -" (benutze \"git add/rm ...\" zur Aktualisierung der Eintragung)" +msgstr " (benutze \"git add/rm ...\" zum Bereitstellen)" #: wt-status.c:176 msgid "" @@ -492,7 +493,7 @@ msgstr "" #: wt-status.c:178 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -" (trage ein oder verwerfe den ungefolgten oder geänderten Inhalt in den " +" (trage ein oder verwerfe den unbeobachteten oder geänderten Inhalt in den " "Unterprojekten)" #: wt-status.c:187 @@ -547,7 +548,7 @@ msgstr "geänderter Inhalt, " #: wt-status.c:252 msgid "untracked content, " -msgstr "unverfolgter Inhalt, " +msgstr "unbeobachteter Inhalt, " #: wt-status.c:266 #, c-format @@ -608,7 +609,7 @@ msgstr "Initiale Version" #: wt-status.c:745 msgid "Untracked" -msgstr "Unverfolgte" +msgstr "Unbeobachtete" #: wt-status.c:747 msgid "Ignored" @@ -617,11 +618,11 @@ msgstr "Ignorierte" #: wt-status.c:749 #, c-format msgid "Untracked files not listed%s" -msgstr "Unverfolgte Dateien nicht aufgelistet%s" +msgstr "Unbeobachtete Dateien nicht aufgelistet%s" #: wt-status.c:751 msgid " (use -u option to show untracked files)" -msgstr " (benutze die Option -u um unverfolgte Dateien anzuzeigen)" +msgstr " (benutze die Option -u um unbeobachteten Dateien anzuzeigen)" #: wt-status.c:757 msgid "No changes" @@ -639,11 +640,12 @@ msgstr " (benutze \"git add\" und/oder \"git commit -a\")" #: wt-status.c:765 #, c-format msgid "nothing added to commit but untracked files present%s\n" -msgstr "nichts zum Eintragen hinzugefügt, aber es gibt unverfolgte Dateien%s\n" +msgstr "" +"nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien%s\n" #: wt-status.c:767 msgid " (use \"git add\" to track)" -msgstr " (benutze \"git add\" zum Verfolgen)" +msgstr " (benutze \"git add\" zum Beobachten)" #: wt-status.c:769 wt-status.c:772 wt-status.c:775 #, c-format @@ -652,11 +654,11 @@ msgstr "nichts zum Eintragen%s\n" #: wt-status.c:770 msgid " (create/copy files and use \"git add\" to track)" -msgstr " (Erstelle/Kopiere Dateien und benutze \"git add\" zum Verfolgen)" +msgstr " (Erstelle/Kopiere Dateien und benutze \"git add\" zum Beobachten)" #: wt-status.c:773 msgid " (use -u to show untracked files)" -msgstr " (benutze -u um unverfolgte Dateien anzuzeigen)" +msgstr " (benutze die Option -u um unbeobachtete Dateien anzuzeigen)" #: wt-status.c:776 msgid " (working directory clean)" @@ -672,15 +674,15 @@ msgstr "Initiale Version auf " #: wt-status.c:905 msgid "behind " -msgstr "hinter " +msgstr "hinterher " #: wt-status.c:908 wt-status.c:911 msgid "ahead " -msgstr "über " +msgstr "voraus " #: wt-status.c:913 msgid ", behind " -msgstr ", hinter " +msgstr ", hinterher " #: builtin/add.c:62 #, c-format @@ -689,7 +691,7 @@ msgstr "unerwarteter Differenz-Status %c" #: builtin/add.c:67 builtin/commit.c:298 msgid "updating files failed" -msgstr "Aktualisierung von Dateien fehlgeschlagen" +msgstr "Aktualisierung der Dateien fehlgeschlagen" #: builtin/add.c:77 #, c-format @@ -732,7 +734,7 @@ msgstr "Konnte Patch nicht schreiben" #: builtin/add.c:295 #, c-format msgid "Could not stat '%s'" -msgstr "Verzeichnis '%s' konnte nicht gelesen werden" +msgstr "Konnte Verzeichnis '%s' nicht lesen" #: builtin/add.c:297 msgid "Empty patch. Aborted." @@ -779,7 +781,7 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" #: builtin/add.c:414 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Wolltest du vieleicht 'git add .' sagen?\n" +msgstr "Wolltest du vielleicht 'git add .' sagen?\n" #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 #: builtin/rm.c:162 @@ -801,7 +803,7 @@ msgstr "Konnte Ausgabe nicht umleiten." #: builtin/archive.c:37 msgid "git archive: Remote with no URL" -msgstr "git archive: Anderes Archiv ohne URL" +msgstr "git archive: Externes Archiv ohne URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" @@ -815,7 +817,7 @@ msgstr "git archive: NACK %s" #: builtin/archive.c:65 #, c-format msgid "remote error: %s" -msgstr "Versandfehler: %s" +msgstr "Fehler am anderen Ende: %s" #: builtin/archive.c:66 msgid "git archive: protocol error" @@ -831,7 +833,7 @@ msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"entferne Zweig '%s' der zusammengeführt wurde mit\n" +"entferne Zweig '%s', der zusammengeführt wurde mit\n" " '%s', aber noch nicht mit der Zweigspitze (HEAD) zusammengeführt " "wurde." @@ -841,13 +843,13 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"entferne nicht Zweig '%s' der noch nicht zusammengeführt wurde mit\n" +"entferne Zweig '%s' nicht, der noch nicht zusammengeführt wurde mit\n" " '%s', obwohl er mit der Zweigspitze (HEAD) zusammengeführt wurde." #. TRANSLATORS: This is "remote " in "remote branch '%s' not found" #: builtin/branch.c:164 msgid "remote " -msgstr "entfernter " +msgstr "externer " #: builtin/branch.c:172 msgid "cannot use -a with -d" @@ -860,7 +862,8 @@ msgstr "Konnte Versionsobjekt für Zweigspitze (HEAD) nicht nachschlagen." #: builtin/branch.c:183 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Kann Zweig '%s' nicht entfernen auf dem du dich gerade befindest." +msgstr "" +"Kann Zweig '%s' nicht entfernen, da du dich gerade auf diesem befindest." #: builtin/branch.c:193 #, c-format @@ -903,17 +906,17 @@ msgstr "Zweig '%s' zeigt auf keine Version" #: builtin/branch.c:396 #, c-format msgid "behind %d] " -msgstr "hinter %d] " +msgstr "%d hinterher] " #: builtin/branch.c:398 #, c-format msgid "ahead %d] " -msgstr "vor %d] " +msgstr "%d voraus] " #: builtin/branch.c:400 #, c-format msgid "ahead %d, behind %d] " -msgstr "vor %d, hinter %d] " +msgstr "%d voraus, %d hinterher] " #: builtin/branch.c:503 msgid "(no branch)" @@ -921,7 +924,7 @@ msgstr "(kein Zweig)" #: builtin/branch.c:568 msgid "some refs could not be read" -msgstr "einige Referenzen konnten nicht gelesen werden" +msgstr "Konnte einige Referenzen nicht lesen" #: builtin/branch.c:581 msgid "cannot rename the current branch while not on any." @@ -965,7 +968,7 @@ msgstr "Konnte Beschreibungsvorlage für Zweig nicht schreiben: %s\n" #: builtin/branch.c:750 msgid "Failed to resolve HEAD as a valid ref." -msgstr "Zweigspitze (HEAD) konnte nicht als gültige Referenz aufgelöst werden." +msgstr "Konnte Zweigspitze (HEAD) nicht als gültige Referenz auflösen." #: builtin/branch.c:755 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" @@ -988,7 +991,7 @@ msgstr "Um ein Paket zu erstellen wird ein Projektarchiv benötigt." #: builtin/bundle.c:60 msgid "Need a repository to unbundle." -msgstr "Zum Zerlegen wird ein Projektarchiv benötigt." +msgstr "Zum Entpacken wird ein Projektarchiv benötigt." #: builtin/checkout.c:113 builtin/checkout.c:146 #, c-format @@ -1100,12 +1103,12 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Warnung: Du verlässt %d Version zurückliegend, nicht verbunden zu\n" +"Warnung: Du bist um %d Version hinterher, nicht verbunden zu\n" "einem deiner Zweige:\n" "\n" "%s\n" msgstr[1] "" -"Warnung: Du verlässt %d Versionen zurückliegend, nicht verbunden zu\n" +"Warnung: Du bist um %d Versionen hinterher, nicht verbunden zu\n" "einem deiner Zweige:\n" "\n" "%s\n" @@ -1135,7 +1138,7 @@ msgstr "Vorherige Position der Zweigspitze (HEAD) war" #: builtin/checkout.c:723 msgid "You are on a branch yet to be born" -msgstr "Du bist auf einem Zweig, der noch nicht geboren wurde." +msgstr "du bist auf einem Zweig, der noch geboren wird" #. case (1) #: builtin/checkout.c:854 @@ -1195,16 +1198,16 @@ msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkout: Aktualisierung der Pfade ist inkompatibel mit dem Wechsel von " -"Zweigen.\n" +"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:1062 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -"git checkout: Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel von " -"Zweigen." +"git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " +"von Zweigen." #: builtin/checkout.c:1067 msgid "git checkout: --detach does not take a path argument" @@ -1216,7 +1219,7 @@ msgid "" "checking out of the index." msgstr "" "git checkout: --ours/--theirs, --force and --merge sind inkompatibel wenn\n" -"du außerhalb der Bereitstellung auscheckst." +"du aus der Bereitstellung auscheckst." #: builtin/checkout.c:1089 msgid "Cannot switch branch to a non-commit." @@ -1235,7 +1238,7 @@ 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; " -"Ablehnung der Reinigung" +"Säuberung verweigert" #: builtin/clean.c:85 msgid "" @@ -1243,12 +1246,12 @@ msgid "" "clean" msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -n noch -f " -"gegeben; Ablehnung der Reinigung" +"gegeben; Säuberung verweigert" #: builtin/clean.c:155 builtin/clean.c:176 #, c-format msgid "Would remove %s\n" -msgstr "Würde entfernen %s\n" +msgstr "Würde %s entfernen\n" #: builtin/clean.c:159 builtin/clean.c:179 #, c-format @@ -1288,7 +1291,7 @@ msgstr "Fehler beim Erstellen von Verzeichnis '%s'" #: builtin/clone.c:308 builtin/diff.c:75 #, c-format msgid "failed to stat '%s'" -msgstr "'%s' konnte nicht gelesen werden" +msgstr "Konnte '%s' nicht lesen" #: builtin/clone.c:310 #, c-format @@ -1298,22 +1301,22 @@ msgstr "%s existiert und ist kein Verzeichnis" #: builtin/clone.c:324 #, c-format msgid "failed to stat %s\n" -msgstr "%s konnte nicht gelesen werden\n" +msgstr "Konnte %s nicht lesen\n" #: builtin/clone.c:341 #, c-format msgid "failed to unlink '%s'" -msgstr "Verknüpfung von '%s' konnte nicht aufgehoben werden." +msgstr "Konnte '%s' nicht entfernen" #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" -msgstr "Verknüpfung '%s' konnte nicht erstellt werden." +msgstr "Konnte Verknüpfung '%s' nicht erstellen" #: builtin/clone.c:350 #, c-format msgid "failed to copy file to '%s'" -msgstr "Datei konnte nicht nach '%s' kopiert werden." +msgstr "Konnte Datei nicht nach '%s' kopieren" #: builtin/clone.c:373 #, c-format @@ -1323,13 +1326,13 @@ msgstr "Fertig.\n" #: builtin/clone.c:440 #, c-format msgid "Could not find remote branch %s to clone." -msgstr "Entfernter Zweig %s konnte nicht zum Klonen gefunden werden." +msgstr "Konnte zu klonenden externer Zweig %s nicht finden." #: builtin/clone.c:549 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -"Entfernte Zweigspitze (HEAD) bezieht sich auf eine nicht existierende " -"Referenz und kann nicht ausgecheckt werden.\n" +"Externe Zweigspitze (HEAD) bezieht sich auf eine nicht existierende Referenz " +"und kann nicht ausgecheckt werden.\n" #: builtin/clone.c:639 msgid "Too many arguments." @@ -1337,7 +1340,7 @@ msgstr "Zu viele Argumente." #: builtin/clone.c:643 msgid "You must specify a repository to clone." -msgstr "Du musst ein Projektarchiv zum Klonen spezifizieren." +msgstr "Du musst ein Projektarchiv zum Klonen angeben." #: builtin/clone.c:654 #, c-format @@ -1376,7 +1379,7 @@ msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." #: builtin/clone.c:728 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "Klone in leeres Projektarchiv '%s'...\n" +msgstr "Klone in bloßes Projektarchiv '%s'...\n" #: builtin/clone.c:730 #, c-format @@ -1391,7 +1394,7 @@ msgstr "Weiß nicht wie %s zu klonen ist." #: builtin/clone.c:835 #, c-format msgid "Remote branch %s not found in upstream %s" -msgstr "entfernter Zweig %s nicht im anderen Projektarchiv gefunden %s" +msgstr "externer Zweig %s nicht im anderen Projektarchiv %s gefunden" #: builtin/clone.c:842 msgid "You appear to have cloned an empty repository." @@ -1477,7 +1480,7 @@ msgstr "Konnte new_index Datei nicht schreiben" #: builtin/commit.c:457 #, c-format msgid "cannot do a partial commit during a %s." -msgstr "Kann keine partielle Eintragung während eines %s durchführen." +msgstr "Kann keine partielle Eintragung durchführen, während %s im Gange ist." #: builtin/commit.c:466 msgid "cannot read the index" @@ -1570,8 +1573,8 @@ msgid "" " Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -" Zeilen beginnend\n" -"mit '#' werden ignoriert, und eine leere Versionsbeschreibung bricht die " +" Zeilen, die mit '#'\n" +"beginnen, werden ignoriert, und eine leere Versionsbeschreibung bricht die " "Eintragung ab.\n" #: builtin/commit.c:820 @@ -1580,8 +1583,8 @@ msgid "" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -" Zeilen beginnend\n" -"mit '#' werden beibehalten; wenn du möchtest, kannst du diese entfernen.\n" +" Zeilen, die mit '#'\n" +"beginnen, werden beibehalten; wenn du möchtest, kannst du diese entfernen.\n" "Eine leere Versionsbeschreibung bricht die Eintragung ab.\n" #: builtin/commit.c:832 @@ -1600,7 +1603,7 @@ msgstr "Kann Bereitstellung nicht lesen" #: builtin/commit.c:896 msgid "Error building trees" -msgstr "Fehler beim Erzeugen der Bäume" +msgstr "Fehler beim Erzeugen der Zweige" #: builtin/commit.c:911 builtin/tag.c:357 #, c-format @@ -1615,7 +1618,7 @@ msgstr "Kein existierender Autor mit '%s' gefunden." #: builtin/commit.c:1023 builtin/commit.c:1217 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "Ungültiger Modus '%s' für unverfolgte Dateien" +msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien" #: builtin/commit.c:1063 msgid "Using both --reset-author and --author does not make sense" @@ -1628,7 +1631,7 @@ msgstr "Du hast nichts zum nachbessern." #: builtin/commit.c:1076 #, c-format msgid "You are in the middle of a %s -- cannot amend." -msgstr "Du bist in der Mitte eines %s -- kann nicht nachbessern." +msgstr "%s ist im Gange -- kann nicht nachbessern." #: builtin/commit.c:1078 msgid "Options --squash and --fixup cannot be used together" @@ -1660,12 +1663,12 @@ msgstr "--include/--only machen ohne Pfade keinen Sinn." #: builtin/commit.c:1119 msgid "Clever... amending the last one with dirty index." msgstr "" -"Klug... nachbessern der letzten Version mit einem unsauberen Bereitstellung." +"Klug... die letzte Version mit einer unsauberen Bereitstellung nachbessern." #: builtin/commit.c:1121 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -"Explizite Pfade ohne -i oder -o spezifiziert; unter der Annahme von --only " +"Explizite Pfade ohne -i oder -o angegeben; unter der Annahme von --only " "Pfaden..." #: builtin/commit.c:1131 builtin/tag.c:556 @@ -1762,12 +1765,12 @@ msgstr "annotierte Markierung %s hat keinen eingebetteten Namen" #: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" -msgstr "Markierung '%s' ist wirklich '%s' hier" +msgstr "Markierung '%s' ist eigentlich '%s' hier" #: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" -msgstr "kein gültiger Objekt-Name %s" +msgstr "%s ist kein gültiger Objekt-Name" #: builtin/describe.c:270 #, c-format @@ -1782,7 +1785,7 @@ msgstr "kein Markierung entspricht exakt '%s'" #: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" -msgstr "suche um zu beschreiben %s\n" +msgstr "suche zur Beschreibung von %s\n" #: builtin/describe.c:329 #, c-format @@ -1810,7 +1813,7 @@ msgstr "" #: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" -msgstr "verarbeitete %lu Versionen\n" +msgstr "%lu Versionen durchlaufen\n" #: builtin/describe.c:381 #, c-format @@ -1818,7 +1821,7 @@ msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -"mehr als %i Markierungen gefunden; Führe die %i jüngsten auf\n" +"mehr als %i Markierungen gefunden; Führe die ersten %i auf\n" "Suche bei %s aufgegeben\n" #: builtin/describe.c:436 @@ -1831,7 +1834,7 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben." #: builtin/describe.c:482 msgid "--dirty is incompatible with committishes" -msgstr "--dirty ist inkompatibel mit \"committish\"-Werten" +msgstr "--dirty ist inkompatibel mit Versionen" #: builtin/diff.c:77 #, c-format @@ -1850,26 +1853,26 @@ msgstr "Kein Git-Projektarchiv" #: builtin/diff.c:347 #, c-format msgid "invalid object '%s' given." -msgstr "Ungültiges Objekt '%s' gegeben." +msgstr "Objekt '%s' ist ungültig." #: builtin/diff.c:352 #, c-format msgid "more than %d trees given: '%s'" -msgstr "Mehr als %d Bäume gegeben: '%s'" +msgstr "Mehr als %d Zweige angegeben: '%s'" #: builtin/diff.c:362 #, c-format msgid "more than two blobs given: '%s'" -msgstr "Mehr als zwei Blobs gegeben: '%s'" +msgstr "Mehr als zwei Blobs angegeben: '%s'" #: builtin/diff.c:370 #, c-format msgid "unhandled object '%s' given." -msgstr "unbehandeltes Objekt '%s' gegeben" +msgstr "unbehandeltes Objekt '%s' angegeben" #: builtin/fetch.c:200 msgid "Couldn't find remote ref HEAD" -msgstr "Konnte entfernte Referenz der Zweigspitze (HEAD) nicht finden." +msgstr "Konnte externe Referenz der Zweigspitze (HEAD) nicht finden." #: builtin/fetch.c:253 #, c-format @@ -1948,7 +1951,7 @@ msgstr "" #: builtin/fetch.c:549 #, c-format msgid " (%s will become dangling)\n" -msgstr " (%s wird unreferenziert werden)\n" +msgstr " (%s wird unreferenziert)\n" #: builtin/fetch.c:550 #, c-format @@ -1961,14 +1964,14 @@ msgstr "[gelöscht]" #: builtin/fetch.c:558 msgid "(none)" -msgstr "(keine)" +msgstr "(nichts)" #: builtin/fetch.c:675 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -"Ablehnung des Anforderns in aktuellen Zweig %s von einem nicht-leeren " -"Projektarchiv" +"Das Anfordern in den aktuellen Zweig %s von einem nicht-bloßen" +"\"Projektarchiv wurde verweigert." #: builtin/fetch.c:709 #, c-format @@ -1988,29 +1991,29 @@ msgstr "Option \"%s\" wird ignoriert für %s\n" #: builtin/fetch.c:888 #, c-format msgid "Fetching %s\n" -msgstr "Hole %s ab\n" +msgstr "Fordere an von %s\n" #: builtin/fetch.c:890 #, c-format msgid "Could not fetch %s" -msgstr "Konnte %s nicht anfordern" +msgstr "Konnte nicht von %s anfordern" #: builtin/fetch.c:907 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Kein entferntes Projektarchiv spezifiziert. Bitte spezifiziere entweder\n" -"eine URL oder einen Entfernungsname, von welchem neue Revisionen angefordert " -"werden sollen." +"Kein externes Projektarchiv angegeben. Bitte gebe entweder eine URL\n" +"oder den Namen des externen Archivs an, von welchem neue\n" +"Versionen angefordert werden sollen." #: builtin/fetch.c:927 msgid "You need to specify a tag name." -msgstr "Du musst den Namen der Markierung spezifizieren." +msgstr "Du musst den Namen der Markierung angeben." #: builtin/fetch.c:979 msgid "fetch --all does not take a repository argument" -msgstr "fetch -all nimmt kein Projektarchiv als Argument" +msgstr "fetch --all akzeptiert kein Projektarchiv als Argument" #: builtin/fetch.c:981 msgid "fetch --all does not make sense with refspecs" @@ -2019,7 +2022,7 @@ msgstr "fetch --all macht keinen Sinn mit Referenzspezifikationen" #: builtin/fetch.c:992 #, c-format msgid "No such remote or remote group: %s" -msgstr "Keine solche Entfernung oder Entfernungsgruppe: %s" +msgstr "Kein externes Archiv (einzeln oder Gruppe): %s" #: builtin/fetch.c:1000 msgid "Fetching a group and specifying refspecs does not make sense" @@ -2034,17 +2037,19 @@ msgstr "Ungültiger %s: '%s'" #: builtin/gc.c:78 msgid "Too many options specified" -msgstr "Zu viele Optionen spezifiziert" +msgstr "Zu viele Optionen angegeben" #: builtin/gc.c:103 #, c-format msgid "insanely long object directory %.*s" -msgstr "wahnsinnig langes Objekt-Verzeichnis %.*s" +msgstr "zu langes Objekt-Verzeichnis %.*s" #: builtin/gc.c:223 #, c-format msgid "Auto packing the repository for optimum performance.\n" -msgstr "Automatische Paketierung des Repositories für optimale Leitung.\n" +msgstr "" +"Die Datenbank des Projektarchivs wird für eine optimale Performance " +"komprimiert.\n" #: builtin/gc.c:226 #, c-format @@ -2052,17 +2057,16 @@ 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 "" -"Automatische Paketierung des Repositories für optimale Leitung. Du darfst " -"auch\n" -"\"git gc\" manuell ausführen. Siehe \"git help gc\" für weitere " -"Informationen.\n" +"Die Datenbank des Projektarchivs wird für eine optimale Performance\n" +"komprimiert. Du kannst auch \"git gc\" manuell ausführen. Siehe \"git help gc" +"\" für weitere Informationen.\n" #: builtin/gc.c:256 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -"Es gibt zu viele unerreichbare, verlorene Objekte; führe 'git prune' aus um " -"diese zu entfernen." +"Es gibt zu viele unerreichbare lose Objekte; führe 'git prune' aus, um diese " +"zu entfernen." #: builtin/grep.c:216 #, c-format @@ -2077,12 +2081,12 @@ msgstr "Fehler beim Verzeichniswechsel: %s" #: builtin/grep.c:478 builtin/grep.c:512 #, c-format msgid "unable to read tree (%s)" -msgstr "konnte Baum (%s) nicht lesen" +msgstr "konnte Zweig (%s) nicht lesen" #: builtin/grep.c:526 #, c-format msgid "unable to grep from object of type %s" -msgstr "kann \"grep\" nicht mit Objekt des Typs \"%s\" durchführen" +msgstr "kann \"grep\" nicht mit Objekten des Typs \"%s\" durchführen" #: builtin/grep.c:584 #, c-format @@ -2101,7 +2105,7 @@ msgstr "keine Muster gegeben" #: builtin/grep.c:902 #, c-format msgid "bad object %s" -msgstr "schlechtes Objekt %s" +msgstr "ungültiges Objekt %s" #: builtin/grep.c:943 msgid "--open-files-in-pager only works on the worktree" @@ -2118,11 +2122,11 @@ msgstr "--no-index oder --untracked kann nicht mit Revisionen benutzt werden" #: builtin/grep.c:974 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -"--[no-]exlude-standard kann nicht mit verfolgten Inhalten benutzt werden" +"--[no-]exlude-standard kann nicht mit beobachteten Inhalten benutzt werden" #: builtin/grep.c:982 msgid "both --cached and trees are given." -msgstr "sowohl --cached als auch Bäume gegeben" +msgstr "sowohl --cached als auch Zweige gegeben" #: builtin/init-db.c:35 #, c-format @@ -2132,12 +2136,12 @@ msgstr "Konnte %s nicht schreibbar für Gruppen machen" #: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" -msgstr "verrückt langer Vorlagen-Name %s" +msgstr "zu langer Vorlagen-Name %s" #: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" -msgstr "'%s' kann nicht gelesen werden" +msgstr "Kann '%s' nicht lesen" #: builtin/init-db.c:73 #, c-format @@ -2157,12 +2161,12 @@ msgstr "kann Verknüfpung '%s' nicht lesen" #: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" -msgstr "verrückt lange symbolische Verknüpfung %s" +msgstr "zu lange symbolische Verknüpfung %s" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "kann '%s' '%s' nicht symbolisch verknüpfen" +msgstr "kann '%s' nicht mit '%s' symbolisch verknüpfen" #: builtin/init-db.c:106 #, c-format @@ -2177,12 +2181,12 @@ msgstr "ignoriere Vorlage %s" #: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" -msgstr "verrückt langer Vorlagen-Pfad %s" +msgstr "zu langer Vorlagen-Pfad %s" #: builtin/init-db.c:141 #, c-format msgid "templates not found %s" -msgstr "Vorlagen nicht gefunden %s" +msgstr "keine Vorlagen in '%s' gefunden" #: builtin/init-db.c:154 #, c-format @@ -2192,7 +2196,7 @@ msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'" #: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" -msgstr "verrücktes git Verzeichnis %s" +msgstr "ungültiges git Verzeichnis %s" #: builtin/init-db.c:322 builtin/init-db.c:325 #, c-format @@ -2202,12 +2206,12 @@ msgstr "%s existiert bereits" #: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" -msgstr "kann Dateityp %d nicht behandeln" +msgstr "kann nicht mit Dateityp %d umgehen" #: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" -msgstr "konnte %s nicht nach %s verschieben" +msgstr "Konnte %s nicht nach %s verschieben" #: builtin/init-db.c:362 #, c-format @@ -2234,11 +2238,11 @@ msgstr "Initialisierte leeres" #: builtin/init-db.c:421 msgid " shared" -msgstr " geteilt" +msgstr " geteiltes" #: builtin/init-db.c:440 msgid "cannot tell cwd" -msgstr "kann nicht \"cwd\" sagen" +msgstr "kann aktuelles Verzeichnis nicht bestimmen" #: builtin/init-db.c:521 builtin/init-db.c:528 #, c-format @@ -2248,7 +2252,7 @@ msgstr "kann Verzeichnis %s nicht erstellen" #: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" -msgstr "kann nicht zu Verzeichnis %s wechseln" +msgstr "kann nicht in Verzeichnis %s wechseln" #: builtin/init-db.c:554 #, c-format @@ -2298,15 +2302,15 @@ msgstr "Kann Patch-Datei %s nicht öffnen" #: builtin/log.c:700 msgid "Need exactly one range." -msgstr "Brauche genau einen Bereich." +msgstr "Brauche genau einen Versionsbereich." #: builtin/log.c:708 msgid "Not a range." -msgstr "Kein Bereich." +msgstr "Kein Versionsbereich." #: builtin/log.c:745 msgid "Could not extract email from committer identity." -msgstr "Konnte E-Mail von der Intentität des Einreichers nicht extrahieren." +msgstr "Konnte E-Mail-Adresse des Einreichers nicht extrahieren." #: builtin/log.c:791 msgid "Cover letter needs email format" @@ -2315,7 +2319,7 @@ msgstr "Anschreiben benötigt E-Mail-Format" #: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" -msgstr "verrücktes in-reply-to: %s" +msgstr "ungültiges in-reply-to: %s" #: builtin/log.c:958 msgid "Two output directories?" @@ -2328,11 +2332,11 @@ msgstr "unechte Einreicher-Informationen %s" #: builtin/log.c:1224 msgid "-n and -k are mutually exclusive." -msgstr "-n und -k sind zueinander exklusiv" +msgstr "-n und -k schliessen sich gegenseitig aus" #: builtin/log.c:1226 msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix und -k sind zueinander exklusiv" +msgstr "--subject-prefix und -k schliessen sich gegenseitig aus" #: builtin/log.c:1231 builtin/shortlog.c:284 #, c-format @@ -2369,8 +2373,8 @@ msgstr "Fehler beim Erstellen der Ausgabedateien." msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -"Konnte gefolgten, entfernten Zweig nicht finden, bitte spezifiziere " -" manuell.\n" +"Konnte gefolgten, externen Zweig nicht finden, bitte gebe manuell " +"an.\n" #: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550 #, c-format @@ -2420,7 +2424,7 @@ msgstr " (nichts zu quetschen)" #: builtin/merge.c:329 #, c-format msgid "Squash commit -- not updating HEAD\n" -msgstr "Quetsche Version -- aktualisiere Zweigspitze (HEAD) nicht\n" +msgstr "Quetsche Version -- Zweigspitze (HEAD) wird nicht aktualisiert\n" #: builtin/merge.c:361 msgid "Writing SQUASH_MSG" @@ -2434,7 +2438,8 @@ msgstr "Schließe SQUASH_MSG ab" #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -"Keine Zusammenführungsbeschreibung -- aktualisiere Zweigspitze (HEAD) nicht\n" +"Keine Zusammenführungsbeschreibung -- Zweigspitze (HEAD) wird nicht " +"aktualisiert\n" #: builtin/merge.c:437 #, c-format @@ -2444,7 +2449,7 @@ msgstr "'%s' zeigt auf keine Version" #: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "Schlechter branch.%s.mergeoptions String: %s" +msgstr "Ungültiger branch.%s.mergeoptions String: %s" #: builtin/merge.c:629 msgid "git write-tree failed to write a tree" @@ -2460,7 +2465,7 @@ msgstr "Konnte Bereitstellung nicht schreiben." #: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." -msgstr "Behandle nichts anderes als die Zusammenführung von zwei Köpfen." +msgstr "Es wird nur die Zusammenführung von zwei Zweigen behandelt." #: builtin/merge.c:724 #, c-format @@ -2481,7 +2486,7 @@ msgstr "konnte nicht von '%s' lesen" #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Zusammenführung nicht eingetragen; benutze 'git commit' um die " +"Zusammenführung wurde nicht eingetragen; benutze 'git commit' um die " "Zusammenführung abzuschließen.\n" #: builtin/merge.c:892 @@ -2494,7 +2499,7 @@ msgid "" msgstr "" "Bitte gebe eine Versionsbeschreibung ein um zu erklären, warum diese " "Zusammenführung erforderlich ist,\n" -"insbesondere wenn es einen aktualisierten entfernten Zweig mit einem Thema-" +"insbesondere wenn es einen aktualisierten, externen Zweig mit einem Thema-" "Zweig zusammenführt.\n" "\n" "Zeilen beginnend mit '#' werden ignoriert, und eine leere Beschreibung " @@ -2523,21 +2528,22 @@ msgstr "'%s' ist keine Version" #: builtin/merge.c:1050 msgid "No current branch." -msgstr "Kein aktueller Zweig." +msgstr "Du befindest dich auf keinem Zweig." #: builtin/merge.c:1052 msgid "No remote for the current branch." -msgstr "Kein anderes Archiv für den aktuellen Zweig." +msgstr "Kein externes Archiv für den aktuellen Zweig." #: builtin/merge.c:1054 msgid "No default upstream defined for the current branch." msgstr "" -"Kein entferntes Standard-Projektarchiv für den aktuellen Zweig definiert." +"Es ist kein externes Standard-Projektarchiv für den aktuellen Zweig " +"definiert." #: builtin/merge.c:1059 #, c-format msgid "No remote tracking branch for %s from %s" -msgstr "Kein entfernter Übernahmezweig für %s von %s" +msgstr "Kein externer Übernahmezweig für %s von %s" #: builtin/merge.c:1146 builtin/merge.c:1303 #, c-format @@ -2566,15 +2572,13 @@ msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -"Du hast deinen \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD " -"existiert).\n" +"Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte trage deine Änderungen ein, bevor du zusammenführen kannst." #: builtin/merge.c:1240 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -"Du hast deinen \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD " -"existiert)." +"Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." #: builtin/merge.c:1249 msgid "You cannot combine --squash with --no-ff." @@ -2586,20 +2590,19 @@ msgstr "Du kannst --no-ff nicht mit --ff--only kombinieren." #: builtin/merge.c:1261 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "Keine Version spezifiziert und merge.defaultToUpstream nicht gesetzt." +msgstr "Keine Version angegeben und merge.defaultToUpstream ist nicht gesetzt." #: builtin/merge.c:1293 msgid "Can merge only exactly one commit into empty head" -msgstr "Kann nur exakt eine Version in einem leeren Kopf zusammenführen." +msgstr "Kann nur exakt eine Version in einem leeren Zweig zusammenführen." #: builtin/merge.c:1296 msgid "Squash commit into empty head not supported yet" -msgstr "" -"Quetschen einer Version in einen leeren Kopf wird momentan nicht unterstützt." +msgstr "Bin auf einem Zweig, der noch geboren wird; kann nicht quetschen." #: builtin/merge.c:1298 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "nicht vorzuspulende Version macht in einem leeren Kopf keinen Sinn" +msgstr "nicht vorzuspulende Version macht in einem leeren Zweig keinen Sinn" #: builtin/merge.c:1413 #, c-format @@ -2623,7 +2626,7 @@ msgstr "Vorspulen nicht möglich, breche ab." #: builtin/merge.c:1513 builtin/merge.c:1592 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "Rücklauf des Baumes bis zum Ursprung...\n" +msgstr "Rücklauf des Zweiges bis zum Ursprung...\n" #: builtin/merge.c:1517 #, c-format @@ -2633,7 +2636,7 @@ msgstr "Probiere Zusammenführungsstrategie %s...\n" #: builtin/merge.c:1583 #, c-format msgid "No merge strategy handled the merge.\n" -msgstr "Keine Zusammenführungsstrategie behandelt die Zusammenführung.\n" +msgstr "Keine Zusammenführungsstrategie behandelt diese Zusammenführung.\n" #: builtin/merge.c:1585 #, c-format @@ -2649,17 +2652,17 @@ msgstr "Benutze \"%s\" um die Auflösung per Hand vorzubereiten.\n" #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -"Automatische Zusammenführung gut gegangen; stoppe, wie angefragt, vor der " -"Eintragung\n" +"Automatische Zusammenführung abgeschlossen; halte, wie gewünscht, vor der " +"Eintragung an\n" #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" -msgstr "Prüfe Umbenennen von '%s' nach '%s'\n" +msgstr "Prüfe Umbenennung von '%s' nach '%s'\n" #: builtin/mv.c:112 msgid "bad source" -msgstr "schlechte Quelle" +msgstr "ungültige Quelle" #: builtin/mv.c:115 msgid "can not move directory into itself" @@ -2684,7 +2687,7 @@ msgstr "nicht unter Versionskontrolle" #: builtin/mv.c:173 msgid "destination exists" -msgstr "Ziel existiert" +msgstr "Ziel existiert bereits" #: builtin/mv.c:181 #, c-format @@ -2712,7 +2715,7 @@ msgstr "Benenne %s nach %s um\n" #: builtin/mv.c:215 #, c-format msgid "renaming '%s' failed" -msgstr "Umbenennen von '%s' fehlgeschlagen" +msgstr "Umbenennung von '%s' fehlgeschlagen" #: builtin/notes.c:139 #, c-format @@ -2726,12 +2729,12 @@ msgstr "konnte Datei-Deskriptor für Ausgabe von 'show' nicht öffnen" #: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" -msgstr "Schließen der Pipe zu 'show' für Objekt '%s' fehlgeschlagen." +msgstr "Schließen der Verbindung zu 'show' ist für Objekt '%s' fehlgeschlagen." #: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "'show' konnte für Objekt '%s' nicht abgeschlossen werden" +msgstr "konnte 'show' für Objekt '%s' nicht abschließen" #: builtin/notes.c:175 builtin/tag.c:343 #, c-format @@ -2772,7 +2775,7 @@ msgstr "konnte '%s' nicht öffnen oder lesen" #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "'%s' konnte nicht als gültige Referenz aufgelöst werden." +msgstr "Konnte '%s' nicht als gültige Referenz auflösen." #: builtin/notes.c:275 #, c-format @@ -2786,7 +2789,7 @@ msgstr "Kann uninitialisierten/unreferenzierten Notiz-Baum nicht eintragen." #: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" -msgstr "Schlechter notes.rewriteMode Wert: '%s'" +msgstr "Ungültiger notes.rewriteMode Wert: '%s'" #: builtin/notes.c:350 #, c-format @@ -2799,7 +2802,7 @@ msgstr "" #: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" -msgstr "Schlechter %s Wert: '%s'" +msgstr "Ungültiger %s Wert: '%s'" #: builtin/notes.c:441 #, c-format @@ -2852,7 +2855,7 @@ msgstr "" #: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." -msgstr "Vermisse Notizen für Quell-Objekt %s. Kann nicht kopieren." +msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich." #: builtin/notes.c:717 #, c-format @@ -2860,7 +2863,7 @@ 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 veraltet für das 'edit' Unterkommando.\n" +"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" #: builtin/notes.c:971 @@ -2881,7 +2884,7 @@ msgstr "Nicht unterstützte Bereitstellungsversion %s" #: builtin/pack-objects.c:2314 #, c-format msgid "bad index version '%s'" -msgstr "Schlechte Bereitstellungsversion '%s'" +msgstr "Ungültige Bereitstellungsversion '%s'" #: builtin/pack-objects.c:2322 #, c-format @@ -2891,7 +2894,7 @@ msgstr "Option %s akzeptiert keine negative Form" #: builtin/pack-objects.c:2326 #, c-format msgid "unable to parse value '%s' for option %s" -msgstr "konnte Wert '%s' für Option %s nicht analysieren" +msgstr "konnte Wert '%s' für Option %s nicht parsen" #: builtin/push.c:45 msgid "tag shorthand without " @@ -2914,7 +2917,7 @@ msgstr "" "Um die Historie, führend zum aktuellen (freistehende Zweigspitze (HEAD))\n" "Status zu versenden, benutze\n" "\n" -" git push %s HEAD:\n" +" git push %s HEAD:\n" #: builtin/push.c:91 #, c-format @@ -2924,17 +2927,16 @@ msgid "" "\n" " git push --set-upstream %s %s\n" msgstr "" -"Der aktuelle Zweig %s hat keinen Zweig im entfernten Projektarchiv.\n" -"Um den aktuellen Zweig zu versenden und die Entfernung als entferntes\n" -"Projektarchiv zu setzen, benutze\n" +"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" "\n" " git push --set-upstream %s %s\n" #: builtin/push.c:99 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "" -"Der aktuelle Zweig %s hat mehrere entfernte Zweige, Versand verweigert." +msgstr "Der aktuelle Zweig %s hat mehrere externe Zweige, Versand verweigert." #: builtin/push.c:102 #, c-format @@ -2943,16 +2945,16 @@ msgid "" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"Du versendest nach '%s', welches kein entferntes Projektarchiv deines\n" +"Du versendest nach '%s', welches kein externes Projektarchiv deines\n" "aktuellen Zweiges '%s' ist, ohne mir mitzuteilen, was ich versenden\n" -"soll um welchen entfernten Zweig zu aktualisieren." +"soll, um welchen externen Zweig zu aktualisieren." #: builtin/push.c:131 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -"Du hast keine Referenzspezifikationen zum Versenden spezifiziert, und push." -"default ist \"nothing\"." +"Du hast keine Referenzspezifikationen zum Versenden angegeben, und " +"push.default ist \"nothing\"." #: builtin/push.c:138 msgid "" @@ -2997,17 +2999,30 @@ msgstr "" #: builtin/push.c:190 #, c-format msgid "Pushing to %s\n" -msgstr "Schiebe zu %s\n" +msgstr "Versende nach %s\n" #: builtin/push.c:194 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:226 +#: builtin/push.c:159 +#, c-format +msgid "" +"To prevent you from losing history, non-fast-forward updates were rejected\n" +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" +"'Note about fast-forwards' section of 'git push --help' for details.\n" +msgstr "" +"Um dich vor Verlust von Historie zu bewahren, wurden nicht vorzuspulende " +"Aktualisierungen zurückgewiesen.\n" +"Führe die externen Änderungen zusammen (z.B. 'git pull') bevor du erneut " +"versendest. Siehe auch die 'Note about fast-forwards' Sektion von \n" +"'git push --help' für weitere Details.\n" + +#: builtin/push.c:176 #, c-format msgid "bad repository '%s'" -msgstr "schlechtes Projektarchiv '%s'" +msgstr "ungültiges Projektarchiv '%s'" #: builtin/push.c:227 msgid "" @@ -3023,7 +3038,7 @@ msgid "" msgstr "" "Kein Ziel zum Versenden konfiguriert.\n" "Entweder spezifizierst du die URL von der Kommandozeile oder konfigurierst " -"ein entferntes Projektarchiv unter Benutzung von\n" +"ein externes Projektarchiv unter Benutzung von\n" "\n" " git remote add \n" "\n" @@ -3057,23 +3072,23 @@ msgstr "--delete ist inkompatibel mit --all, --mirror und --tags" #: builtin/push.c:344 msgid "--delete doesn't make sense without any refs" -msgstr "--delete macht ohne irgendeine Referenz ohne keinen Sinn" +msgstr "--delete macht ohne irgendeine Referenz keinen Sinn" #: builtin/reset.c:33 msgid "mixed" -msgstr "gemischt" +msgstr "mixed" #: builtin/reset.c:33 msgid "soft" -msgstr "weich" +msgstr "soft" #: builtin/reset.c:33 msgid "hard" -msgstr "hart" +msgstr "hard" #: builtin/reset.c:33 msgid "keep" -msgstr "halten" +msgstr "keep" #: builtin/reset.c:77 msgid "You do not have a valid HEAD." @@ -3109,7 +3124,8 @@ msgstr "Nicht bereitgestellte Änderungen nach Zurücksetzung:" #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -"Kann keine %s Zurücksetzung innerhalb einer Zusammenführung durchführen." +"Kann keine '%s' Zurücksetzung durchführen, während eine Zusammenführung im " +"Gange ist." #: builtin/reset.c:297 #, c-format @@ -3128,17 +3144,17 @@ msgstr "" #: builtin/reset.c:313 #, c-format msgid "Cannot do %s reset with paths." -msgstr "Kann keine %s Zurücksetzung mit Pfaden machen." +msgstr "Eine '%s' Zurücksetzung mit Pfaden ist nicht möglich." #: builtin/reset.c:325 #, c-format msgid "%s reset is not allowed in a bare repository" -msgstr "%s Zurücksetzung ist in einem leeren Projektarchiv nicht erlaubt" +msgstr "'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt" #: builtin/reset.c:341 #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Konnte Bereitstellungsdatei nicht zu Revision '%s' zurücksetzen." +msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen." #: builtin/revert.c:70 builtin/revert.c:92 #, c-format @@ -3149,11 +3165,11 @@ msgstr "%s: %s kann nicht mit %s benutzt werden" msgid "program error" msgstr "Programmfehler" -#: builtin/revert.c:213 +#: builtin/revert.c:212 msgid "revert failed" msgstr "\"revert\" fehlgeschlagen" -#: builtin/revert.c:228 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" @@ -3189,7 +3205,7 @@ msgstr "" #: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "entferne '%s' nicht rekursiv ohne -r" +msgstr "'%s' wird nicht ohne -r rekursiv entfernt" #: builtin/rm.c:230 #, c-format @@ -3237,7 +3253,7 @@ msgstr "" "\n" "#\n" "# Gebe eine Markierungsbeschreibung ein\n" -"# Zeilen beginnend mit '#' werden ignoriert.\n" +"# Zeilen, die mit '#' beginnen, werden ignoriert.\n" "#\n" #: builtin/tag.c:254 @@ -3252,8 +3268,8 @@ msgstr "" "\n" "#\n" "# Gebe eine Markierungsbeschreibung ein\n" -"# Zeilen beginnend mit '#' werden behalten; du darfst diese selbst entfernen " -"wenn du möchtest.\n" +"# Zeilen, die mit '#' beginnen, werden behalten; du darfst diese\n" +"# selbst entfernen wenn du möchtest.\n" "#\n" #: builtin/tag.c:294 @@ -3266,7 +3282,7 @@ msgstr "konnte Markierungsdatei nicht schreiben" #: builtin/tag.c:321 msgid "bad object type." -msgstr "schlechter Objekt-Typ" +msgstr "ungültiger Objekt-Typ" #: builtin/tag.c:334 msgid "tag header too big." @@ -3283,7 +3299,7 @@ msgstr "Die Markierungsbeschreibung wurde gelassen in %s\n" #: builtin/tag.c:421 msgid "switch 'points-at' requires an object" -msgstr "Wechseln von 'points-at' erfordert ein Objekt" +msgstr "Option 'points-at' erfordert ein Objekt" #: builtin/tag.c:423 #, c-format @@ -3351,8 +3367,7 @@ msgid "" "It does not apply to blobs recorded in its index." msgstr "" "Hast du den Patch per Hand editiert?\n" -"Er kann nicht auf aufgezeichnete Blobs in seiner Bereitstellung angewendet " -"werden." +"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." @@ -3388,7 +3403,7 @@ msgstr "Bitte werde dir klar. --skip oder --abort?" #: git-am.sh:513 msgid "Resolve operation not in progress, we are not resuming." -msgstr "keine Auflösung in Durchführung, wir setzen nicht fort." +msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." #: git-am.sh:579 #, sh-format @@ -3399,8 +3414,8 @@ msgstr "" #: git-am.sh:755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -"Kann nicht interaktiv sein, ohne das die Standard-Eingabe mit einem Terminal " -"verbunden ist." +"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " +"Terminal verbunden ist." #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English @@ -3437,11 +3452,11 @@ 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 Option zu sein" +msgstr "'$arg' scheint keine gültige Version zu sein" #: git-bisect.sh:117 msgid "Bad HEAD - I need a HEAD" -msgstr "Schlechte Zweigspitze (HEAD) - Ich brauche eine Zweigspitze (HEAD)" +msgstr "Ungültige Zweigspitze (HEAD) - Zweigspitze (HEAD) wird benötigt" #: git-bisect.sh:130 #, sh-format @@ -3453,30 +3468,30 @@ msgstr "" #: git-bisect.sh:140 msgid "won't bisect on seeked tree" -msgstr "werde nicht auf gesuchtem Baum halbieren" +msgstr "\"bisect\" auf gesuchtem Zweig nicht möglich" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" -msgstr "Schlechte Zweigspitze (HEAD) - merkwürdige symbolische Referenz" +msgstr "Ungültige Zweigspitze (HEAD) - merkwürdige symbolische Referenz" #: git-bisect.sh:189 #, sh-format msgid "Bad bisect_write argument: $state" -msgstr "Schlechtes \"bisect_write\" Argument: $state" +msgstr "Ungültiges \"bisect_write\" Argument: $state" #: git-bisect.sh:218 #, sh-format msgid "Bad rev input: $arg" -msgstr "Schlechte Referenz-Eingabe: $arg" +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." +msgstr "Bitte rufe 'bisect_state' mit mindestens einem Argument auf." #: git-bisect.sh:244 #, sh-format msgid "Bad rev input: $rev" -msgstr "Schlechte Referenz-Eingabe: $rev" +msgstr "Ungültige Referenz-Eingabe: $rev" #: git-bisect.sh:250 msgid "'git bisect bad' can take only one argument." @@ -3500,7 +3515,7 @@ msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset '." msgstr "" -"Konnte die originale Zweigspitze (HEAD) '$branch' nicht auschecken.\n" +"Konnte die ursprüngliche Zweigspitze (HEAD) '$branch' nicht auschecken.\n" "Versuche 'git bisect reset '." #: git-bisect.sh:390 @@ -3526,9 +3541,9 @@ msgid "" "Please, fix them up in the work tree, and then use 'git add/rm '\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" +"\"pull\" ist nicht möglich, weil du nicht zusammengeführte Dateien hast.\n" "Bitte korrigiere dies im Arbeitsbaum und benutze dann 'git add/rm '\n" -"wie vorgesehen, um die Auflösung zu markieren, oder benutze 'git commit -a'." +"um die Auflösung entsprechend zu markieren, oder benutze 'git commit -a'." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." @@ -3543,7 +3558,7 @@ msgstr "" #: git-pull.sh:253 msgid "Cannot merge multiple branches into empty head" -msgstr "Kann nicht mehrere Zweige in einen leeren Kopf zusammenführen" +msgstr "Kann nicht mehrere Zweige in einen ungeborenen Zweig zusammenführen" #: git-pull.sh:257 msgid "Cannot rebase onto multiple branches" @@ -3600,7 +3615,7 @@ msgstr "Kein \"stash\" gefunden." #: git-stash.sh:359 #, sh-format msgid "Too many revisions specified: $REV" -msgstr "Zu viele Revisionen spezifiziert: $REV" +msgstr "Zu viele Revisionen angegeben: $REV" #: git-stash.sh:365 #, sh-format @@ -3610,7 +3625,7 @@ msgstr "$reference ist keine gültige Referenz" #: git-stash.sh:393 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "'$args' ist keine \"stash\"-artiger Version" +msgstr "'$args' ist keine \"stash\"-artige Version" #: git-stash.sh:404 #, sh-format @@ -3623,7 +3638,8 @@ msgstr "unfähig die Bereitstellung zu aktualisieren" #: git-stash.sh:416 msgid "Cannot apply a stash in the middle of a merge" -msgstr "Kann keinen \"stash\" innerhalb einer Zusammenführung anwenden" +msgstr "" +"Kann \"stash\" nicht anwenden, solang eine Zusammenführung im Gange ist" #: git-stash.sh:424 msgid "Conflicts in index. Try without --index." @@ -3653,12 +3669,12 @@ msgstr "Kein Zweigname spezifiziert" #: git-stash.sh:570 msgid "(To restore them type \"git stash apply\")" -msgstr "(Um es wiederherzustellen schreibe \"git stash apply\")" +msgstr "(Zur Wiederherstellung gebe \"git stash apply\" ein)" #: git-submodule.sh:56 #, sh-format msgid "cannot strip one component off url '$remoteurl'" -msgstr "Kann eine Komponente von URL '$remoteurl' nicht abstreifen" +msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" #: git-submodule.sh:109 #, sh-format @@ -3674,7 +3690,7 @@ msgstr "Klonen von '$url' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen" #, 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-Verzeichnis '$a' ist Teil des Unterprojekt-Pfades '$b', oder umgekehrt" #: git-submodule.sh:249 #, sh-format @@ -3724,19 +3740,18 @@ msgstr "Keine URL für Unterprojekt-Pfad '$sm_path' in .gitmodules gefunden" #: git-submodule.sh:414 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" -msgstr "Fehler beim Registrieren der URL für Unterprojekt-Pfad '$sm_path'" +msgstr "Registrierung der URL für Unterprojekt-Pfad '$sm_path' fehlgeschlagen" #: git-submodule.sh:422 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" -msgstr "" -"Fehler beim Registrieren des Aktualisierungsmodus für Unterprojekt-Pfad " -"'$sm_path'" +msgstr "Registrierung des Aktualisierungsmodus für Unterprojekt-Pfad " +"'$sm_path' fehlgeschlagen" #: git-submodule.sh:424 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" -msgstr "Unterprojekt '$name' ($url) registriert für Pfad '$sm_path'" +msgstr "Unterprojekt '$name' ($url) ist für Pfad '$sm_path' registriert" #: git-submodule.sh:523 #, sh-format @@ -3744,13 +3759,13 @@ msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -"Unterprojekt-Pfad '$sm_path' nicht initialisiert\n" +"Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n" "Vielleicht möchtest du 'update --init' benutzen?" #: git-submodule.sh:536 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" -msgstr "Konnte aktuelle Revision in Unterprojekt-Pfad '$sm_path' nicht finden" +msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden" #: git-submodule.sh:555 #, sh-format @@ -3770,7 +3785,8 @@ msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'" #: git-submodule.sh:575 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" -msgstr "Konnte '$sha1' nicht in Unterprojekt-Pfad '$sm_path' zusammenführen" +msgstr "" +"Zusammenführung von '$sha1' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen" #: git-submodule.sh:576 #, sh-format @@ -3809,7 +3825,8 @@ msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst" #: git-submodule.sh:776 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " Warnung: $name beinhaltet nich die Versionen $sha1_src und $sha1_dst" +msgstr "" +" Warnung: $name beinhaltet nicht die Versionen $sha1_src und $sha1_dst" #: git-submodule.sh:801 msgid "blob" diff --git a/po/git.pot b/po/git.pot index 730cac7b8..33a605275 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 \n" -"POT-Creation-Date: 2012-04-28 20:17+0800\n" +"POT-Creation-Date: 2012-05-08 16:06+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,6 +35,80 @@ msgid "" "or use 'git commit -a'." msgstr "" +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "" + +#: bundle.c:89 builtin/commit.c:753 +#, c-format +msgid "could not open '%s'" +msgstr "" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "" + +#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289 +#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:192 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:290 +msgid "rev-list died" +msgstr "" + +#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: bundle.c:331 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "" + +#: bundle.c:376 +msgid "Refusing to create empty bundle." +msgstr "" + +#: bundle.c:394 +msgid "Could not spawn pack-objects" +msgstr "" + +#: bundle.c:412 +msgid "pack-objects died" +msgstr "" + +#: bundle.c:415 +#, c-format +msgid "cannot create '%s'" +msgstr "" + +#: bundle.c:437 +msgid "index-pack died" +msgstr "" + #: commit.c:48 #, c-format msgid "could not parse %s" @@ -63,6 +137,73 @@ msgstr "" msgid "failed to close rev-list's stdin: %s" msgstr "" +#: date.c:95 +msgid "in the future" +msgstr "" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "" +msgstr[1] "" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "" +msgstr[1] "" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "" +msgstr[1] "" + #: diff.c:105 #, c-format msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" @@ -105,7 +246,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] "" msgstr[1] "" -#: diff.c:3435 +#: diff.c:3478 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -139,13 +280,53 @@ msgstr "" msgid "'%s': short read %s" msgstr "" -#: help.c:287 +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "" + +#: help.c:270 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" +#: help.c:327 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "" + +#: help.c:349 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" +msgstr "" + +#: help.c:354 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "" + +#: help.c:361 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "" + +#: help.c:365 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +msgstr[1] "" + #: remote.c:1607 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" @@ -172,227 +353,239 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978 +#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 #: builtin/merge.c:1088 builtin/merge.c:1098 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 #: builtin/merge.c:1090 builtin/merge.c:1103 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:143 +#: sequencer.c:144 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" -#: sequencer.c:146 +#: sequencer.c:147 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:159 sequencer.c:685 sequencer.c:768 +#: sequencer.c:160 sequencer.c:741 sequencer.c:824 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:162 +#: sequencer.c:163 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:177 +#: sequencer.c:178 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:179 +#: sequencer.c:180 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:182 +#: sequencer.c:183 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:232 +#: sequencer.c:233 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:298 +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "" + +#: sequencer.c:323 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "" + +#: sequencer.c:328 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "" + +#: sequencer.c:358 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:301 +#: sequencer.c:361 msgid "You do not have a valid HEAD" msgstr "" -#: sequencer.c:316 +#: sequencer.c:376 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:324 +#: sequencer.c:384 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:328 +#: sequencer.c:388 #, 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:339 +#: sequencer.c:399 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:343 +#: sequencer.c:403 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:427 +#: sequencer.c:491 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:428 +#: sequencer.c:492 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719 -#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347 -#: builtin/shortlog.c:181 -msgid "revision walk setup failed" -msgstr "" - -#: sequencer.c:453 +#: sequencer.c:536 msgid "empty commit set passed" msgstr "" -#: sequencer.c:461 +#: sequencer.c:544 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:466 +#: sequencer.c:549 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:551 +#: sequencer.c:607 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:573 +#: sequencer.c:629 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:578 +#: sequencer.c:634 msgid "No commits parsed." msgstr "" -#: sequencer.c:591 +#: sequencer.c:647 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:595 +#: sequencer.c:651 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:602 +#: sequencer.c:658 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:630 +#: sequencer.c:686 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:633 +#: sequencer.c:689 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:645 +#: sequencer.c:701 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:666 +#: sequencer.c:722 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:667 +#: sequencer.c:723 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:671 +#: sequencer.c:727 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:687 sequencer.c:772 +#: sequencer.c:743 sequencer.c:828 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:706 sequencer.c:840 +#: sequencer.c:762 sequencer.c:896 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:708 +#: sequencer.c:764 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:710 +#: sequencer.c:766 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:732 +#: sequencer.c:788 builtin/apply.c:3682 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:735 +#: sequencer.c:791 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:736 +#: sequencer.c:792 msgid "unexpected end of file" msgstr "" -#: sequencer.c:742 +#: sequencer.c:798 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:765 +#: sequencer.c:821 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:927 +#: sequencer.c:983 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:928 +#: sequencer.c:984 msgid "Can't cherry-pick into empty head" msgstr "" @@ -415,232 +608,232 @@ msgstr "" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: wt-status.c:134 +#: wt-status.c:135 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:140 wt-status.c:157 +#: wt-status.c:141 wt-status.c:158 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr "" -#: wt-status.c:142 wt-status.c:159 +#: wt-status.c:143 wt-status.c:160 msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: wt-status.c:143 +#: wt-status.c:144 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:169 +#: wt-status.c:170 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:173 +#: wt-status.c:174 msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: wt-status.c:175 +#: wt-status.c:176 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:176 +#: wt-status.c:177 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:178 +#: wt-status.c:179 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:187 +#: wt-status.c:188 #, c-format msgid "%s files:" msgstr "" -#: wt-status.c:190 +#: wt-status.c:191 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -#: wt-status.c:207 +#: wt-status.c:208 msgid "bug" msgstr "" -#: wt-status.c:212 +#: wt-status.c:213 msgid "both deleted:" msgstr "" -#: wt-status.c:213 +#: wt-status.c:214 msgid "added by us:" msgstr "" -#: wt-status.c:214 +#: wt-status.c:215 msgid "deleted by them:" msgstr "" -#: wt-status.c:215 +#: wt-status.c:216 msgid "added by them:" msgstr "" -#: wt-status.c:216 +#: wt-status.c:217 msgid "deleted by us:" msgstr "" -#: wt-status.c:217 +#: wt-status.c:218 msgid "both added:" msgstr "" -#: wt-status.c:218 +#: wt-status.c:219 msgid "both modified:" msgstr "" -#: wt-status.c:248 +#: wt-status.c:249 msgid "new commits, " msgstr "" -#: wt-status.c:250 +#: wt-status.c:251 msgid "modified content, " msgstr "" -#: wt-status.c:252 +#: wt-status.c:253 msgid "untracked content, " msgstr "" -#: wt-status.c:266 +#: wt-status.c:267 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:269 +#: wt-status.c:270 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:272 +#: wt-status.c:273 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:275 +#: wt-status.c:276 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:278 +#: wt-status.c:279 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:281 +#: wt-status.c:282 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:284 +#: wt-status.c:285 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:287 +#: wt-status.c:288 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:290 +#: wt-status.c:291 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:713 +#: wt-status.c:737 msgid "On branch " msgstr "" -#: wt-status.c:720 +#: wt-status.c:744 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:731 +#: wt-status.c:755 msgid "Initial commit" msgstr "" -#: wt-status.c:745 +#: wt-status.c:769 msgid "Untracked" msgstr "" -#: wt-status.c:747 +#: wt-status.c:771 msgid "Ignored" msgstr "" -#: wt-status.c:749 +#: wt-status.c:773 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:751 +#: wt-status.c:775 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:757 +#: wt-status.c:781 msgid "No changes" msgstr "" -#: wt-status.c:761 +#: wt-status.c:785 #, c-format msgid "no changes added to commit%s\n" msgstr "" -#: wt-status.c:763 +#: wt-status.c:787 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "" -#: wt-status.c:765 +#: wt-status.c:789 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" -#: wt-status.c:767 +#: wt-status.c:791 msgid " (use \"git add\" to track)" msgstr "" -#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#: wt-status.c:793 wt-status.c:796 wt-status.c:799 #, c-format msgid "nothing to commit%s\n" msgstr "" -#: wt-status.c:770 +#: wt-status.c:794 msgid " (create/copy files and use \"git add\" to track)" msgstr "" -#: wt-status.c:773 +#: wt-status.c:797 msgid " (use -u to show untracked files)" msgstr "" -#: wt-status.c:776 +#: wt-status.c:800 msgid " (working directory clean)" msgstr "" -#: wt-status.c:884 +#: wt-status.c:908 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:890 +#: wt-status.c:914 msgid "Initial commit on " msgstr "" -#: wt-status.c:905 +#: wt-status.c:929 msgid "behind " msgstr "" -#: wt-status.c:908 wt-status.c:911 +#: wt-status.c:932 wt-status.c:935 msgid "ahead " msgstr "" -#: wt-status.c:913 +#: wt-status.c:937 msgid ", behind " msgstr "" @@ -649,7 +842,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:298 +#: builtin/add.c:67 builtin/commit.c:282 msgid "updating files failed" msgstr "" @@ -739,2102 +932,3108 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:342 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "" -#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:476 builtin/apply.c:4093 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" -#: builtin/archive.c:17 +#: builtin/apply.c:106 #, c-format -msgid "could not create archive file '%s'" +msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/archive.c:20 -msgid "could not redirect output" +#: builtin/apply.c:121 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/archive.c:37 -msgid "git archive: Remote with no URL" +#: builtin/apply.c:815 +#, c-format +msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" +#: builtin/apply.c:824 +#, c-format +msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/archive.c:63 +#: builtin/apply.c:905 #, c-format -msgid "git archive: NACK %s" +msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/archive.c:65 +#: builtin/apply.c:934 #, c-format -msgid "remote error: %s" +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/archive.c:66 -msgid "git archive: protocol error" +#: builtin/apply.c:937 +#, c-format +msgid "git apply: bad git-diff - inconsistent %s filename on line %d" msgstr "" -#: builtin/archive.c:71 -msgid "git archive: expected a flush" +#: builtin/apply.c:944 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/branch.c:137 +#: builtin/apply.c:1387 #, c-format -msgid "" -"deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." +msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/branch.c:141 +#: builtin/apply.c:1444 #, c-format -msgid "" -"not deleting branch '%s' that is not yet merged to\n" -" '%s', even though it is merged to HEAD." +msgid "patch fragment without header at line %d: %.*s" msgstr "" -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" -#: builtin/branch.c:164 -msgid "remote " -msgstr "" +#: builtin/apply.c:1461 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +msgstr[1] "" -#: builtin/branch.c:172 -msgid "cannot use -a with -d" +#: builtin/apply.c:1621 +msgid "new file depends on old contents" msgstr "" -#: builtin/branch.c:178 -msgid "Couldn't look up commit object for HEAD" +#: builtin/apply.c:1623 +msgid "deleted file still has contents" msgstr "" -#: builtin/branch.c:183 +#: builtin/apply.c:1649 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." +msgid "corrupt patch at line %d" msgstr "" -#: builtin/branch.c:193 +#: builtin/apply.c:1685 #, c-format -msgid "%sbranch '%s' not found." +msgid "new file %s depends on old contents" msgstr "" -#: builtin/branch.c:201 +#: builtin/apply.c:1687 #, c-format -msgid "Couldn't look up commit object for '%s'" +msgid "deleted file %s still has contents" msgstr "" -#: builtin/branch.c:207 +#: builtin/apply.c:1690 #, 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'." +msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/branch.c:215 +#: builtin/apply.c:1836 #, c-format -msgid "Error deleting %sbranch '%s'" +msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/branch.c:221 +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1865 #, c-format -msgid "Deleted %sbranch %s (was %s).\n" -msgstr "" - -#: builtin/branch.c:226 -msgid "Update of config-file failed" +msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/branch.c:324 +#: builtin/apply.c:1951 #, c-format -msgid "branch '%s' does not point at a commit" +msgid "patch with only garbage at line %d" msgstr "" -#: builtin/branch.c:396 +#: builtin/apply.c:2041 #, c-format -msgid "behind %d] " +msgid "unable to read symlink %s" msgstr "" -#: builtin/branch.c:398 +#: builtin/apply.c:2045 #, c-format -msgid "ahead %d] " +msgid "unable to open or read %s" msgstr "" -#: builtin/branch.c:400 -#, c-format -msgid "ahead %d, behind %d] " +#: builtin/apply.c:2116 +msgid "oops" msgstr "" -#: builtin/branch.c:503 -msgid "(no branch)" +#: builtin/apply.c:2638 +#, c-format +msgid "invalid start of line: '%c'" msgstr "" -#: builtin/branch.c:568 -msgid "some refs could not be read" -msgstr "" +#: builtin/apply.c:2756 +#, 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/branch.c:581 -msgid "cannot rename the current branch while not on any." +#: builtin/apply.c:2768 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/branch.c:591 +#: builtin/apply.c:2774 #, c-format -msgid "Invalid branch name: '%s'" +msgid "" +"while searching for:\n" +"%.*s" msgstr "" -#: builtin/branch.c:606 -msgid "Branch rename failed" +#: builtin/apply.c:2793 +#, c-format +msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/branch.c:610 +#: builtin/apply.c:2896 #, c-format -msgid "Renamed a misnamed branch '%s' away" +msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/branch.c:614 +#: builtin/apply.c:2902 #, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/branch.c:621 -msgid "Branch is renamed, but update of config-file failed" +#: builtin/apply.c:2923 +#, c-format +msgid "patch failed: %s:%ld" msgstr "" -#: builtin/branch.c:636 +#: builtin/apply.c:3038 #, c-format -msgid "malformed object name %s" +msgid "patch %s has been renamed/deleted" msgstr "" -#: builtin/branch.c:660 +#: builtin/apply.c:3045 builtin/apply.c:3062 #, c-format -msgid "could not write branch description template: %s\n" +msgid "read of %s failed" msgstr "" -#: builtin/branch.c:750 -msgid "Failed to resolve HEAD as a valid ref." +#: builtin/apply.c:3077 +msgid "removal patch leaves file contents" msgstr "" -#: builtin/branch.c:755 builtin/clone.c:558 -msgid "HEAD not found below refs/heads!" +#: builtin/apply.c:3098 +#, c-format +msgid "%s: already exists in working directory" msgstr "" -#: builtin/branch.c:813 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" +#: builtin/apply.c:3136 +#, c-format +msgid "%s: has been deleted/renamed" msgstr "" -#: builtin/bundle.c:47 +#: builtin/apply.c:3141 builtin/apply.c:3172 #, c-format -msgid "%s is okay\n" +msgid "%s: %s" msgstr "" -#: builtin/bundle.c:56 -msgid "Need a repository to create a bundle." +#: builtin/apply.c:3152 +#, c-format +msgid "%s: does not exist in index" msgstr "" -#: builtin/bundle.c:60 -msgid "Need a repository to unbundle." +#: builtin/apply.c:3166 +#, c-format +msgid "%s: does not match index" msgstr "" -#: builtin/checkout.c:113 builtin/checkout.c:146 +#: builtin/apply.c:3183 #, c-format -msgid "path '%s' does not have our version" +msgid "%s: wrong type" msgstr "" -#: builtin/checkout.c:115 builtin/checkout.c:148 +#: builtin/apply.c:3185 #, c-format -msgid "path '%s' does not have their version" +msgid "%s has type %o, expected %o" msgstr "" -#: builtin/checkout.c:131 +#: builtin/apply.c:3240 #, c-format -msgid "path '%s' does not have all necessary versions" +msgid "%s: already exists in index" msgstr "" -#: builtin/checkout.c:175 +#: builtin/apply.c:3259 #, c-format -msgid "path '%s' does not have necessary versions" +msgid "new mode (%o) of %s does not match old mode (%o)%s%s" msgstr "" -#: builtin/checkout.c:192 +#: builtin/apply.c:3265 #, c-format -msgid "path '%s': cannot merge" +msgid "%s: patch does not apply" msgstr "" -#: builtin/checkout.c:209 +#: builtin/apply.c:3278 #, c-format -msgid "Unable to add merge result for '%s'" +msgid "Checking patch %s..." msgstr "" -#: builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3333 builtin/checkout.c:212 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/checkout.c:234 builtin/checkout.c:392 -msgid "corrupt index file" +#: builtin/apply.c:3476 +#, c-format +msgid "unable to remove %s from index" msgstr "" -#: builtin/checkout.c:264 builtin/checkout.c:271 +#: builtin/apply.c:3503 #, c-format -msgid "path '%s' is unmerged" +msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 -#: builtin/merge.c:812 -msgid "unable to write new index file" +#: builtin/apply.c:3507 +#, c-format +msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" +#: builtin/apply.c:3512 +#, c-format +msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/checkout.c:414 -msgid "you need to resolve your current index first" +#: builtin/apply.c:3515 +#, c-format +msgid "unable to add cache entry for %s" msgstr "" -#: builtin/checkout.c:533 +#: builtin/apply.c:3548 #, c-format -msgid "Can not do reflog for '%s'\n" +msgid "closing file '%s'" msgstr "" -#: builtin/checkout.c:566 -msgid "HEAD is now at" +#: builtin/apply.c:3597 +#, c-format +msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/checkout.c:573 +#: builtin/apply.c:3653 #, c-format -msgid "Reset branch '%s'\n" +msgid "Applied patch %s cleanly." msgstr "" -#: builtin/checkout.c:576 -#, c-format -msgid "Already on '%s'\n" +#: builtin/apply.c:3661 +msgid "internal error" msgstr "" -#: builtin/checkout.c:580 +#. Say this even without --verbose +#: builtin/apply.c:3664 #, c-format -msgid "Switched to and reset branch '%s'\n" -msgstr "" +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:582 +#: builtin/apply.c:3674 #, c-format -msgid "Switched to a new branch '%s'\n" +msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/checkout.c:584 +#: builtin/apply.c:3695 #, c-format -msgid "Switched to branch '%s'\n" +msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/checkout.c:640 +#: builtin/apply.c:3698 #, c-format -msgid " ... and %d more.\n" +msgid "Rejected hunk #%d." msgstr "" -#. The singular version -#: builtin/checkout.c:646 -#, c-format -msgid "" -"Warning: you are leaving %d commit behind, not connected to\n" -"any of your branches:\n" -"\n" -"%s\n" -msgid_plural "" -"Warning: you are leaving %d commits behind, not connected to\n" -"any of your branches:\n" -"\n" -"%s\n" -msgstr[0] "" -msgstr[1] "" - -#: builtin/checkout.c:664 -#, c-format -msgid "" -"If you want to keep them by creating a new branch, this may be a good time\n" -"to do so with:\n" -"\n" -" git branch new_branch_name %s\n" -"\n" +#: builtin/apply.c:3829 +msgid "unrecognized input" msgstr "" -#: builtin/checkout.c:693 -msgid "internal error in revision walk" +#: builtin/apply.c:3840 +msgid "unable to read index file" msgstr "" -#: builtin/checkout.c:697 -msgid "Previous HEAD position was" +#: builtin/apply.c:4035 +msgid "--index outside a repository" msgstr "" -#: builtin/checkout.c:723 -msgid "You are on a branch yet to be born" +#: builtin/apply.c:4038 +msgid "--cached outside a repository" msgstr "" -#. case (1) -#: builtin/checkout.c:854 +#: builtin/apply.c:4054 #, c-format -msgid "invalid reference: %s" +msgid "can't open patch '%s'" msgstr "" -#. case (1): want a tree -#: builtin/checkout.c:893 +#: builtin/apply.c:4068 #, c-format -msgid "reference is not a tree: %s" -msgstr "" +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:973 -msgid "-B cannot be used with -b" -msgstr "" +#: builtin/apply.c:4074 builtin/apply.c:4084 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:982 -msgid "--patch is incompatible with all other options" +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" msgstr "" -#: builtin/checkout.c:985 -msgid "--detach cannot be used with -b/-B/--orphan" +#: builtin/archive.c:20 +msgid "could not redirect output" msgstr "" -#: builtin/checkout.c:987 -msgid "--detach cannot be used with -t" +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" msgstr "" -#: builtin/checkout.c:993 -msgid "--track needs a branch name" +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" msgstr "" -#: builtin/checkout.c:1000 -msgid "Missing branch name; try -b" +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" msgstr "" -#: builtin/checkout.c:1006 -msgid "--orphan and -b|-B are mutually exclusive" +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" msgstr "" -#: builtin/checkout.c:1008 -msgid "--orphan cannot be used with -t" +#: builtin/archive.c:66 +msgid "git archive: protocol error" msgstr "" -#: builtin/checkout.c:1018 -msgid "git checkout: -f and -m are incompatible" +#: builtin/archive.c:71 +msgid "git archive: expected a flush" msgstr "" -#: builtin/checkout.c:1052 -msgid "invalid path specification" +#: builtin/branch.c:144 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." msgstr "" -#: builtin/checkout.c:1060 +#: builtin/branch.c:148 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." msgstr "" -#: builtin/checkout.c:1062 -msgid "git checkout: updating paths is incompatible with switching branches." +#: builtin/branch.c:180 +msgid "cannot use -a with -d" msgstr "" -#: builtin/checkout.c:1067 -msgid "git checkout: --detach does not take a path argument" +#: builtin/branch.c:186 +msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/checkout.c:1070 -msgid "" -"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" -"checking out of the index." +#: builtin/branch.c:191 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/checkout.c:1089 -msgid "Cannot switch branch to a non-commit." +#: builtin/branch.c:202 +#, c-format +msgid "remote branch '%s' not found." msgstr "" -#: builtin/checkout.c:1092 -msgid "--ours/--theirs is incompatible with switching branches." +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." msgstr "" -#: builtin/clean.c:78 -msgid "-x and -X cannot be used together" +#: builtin/branch.c:210 +#, c-format +msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/clean.c:82 +#: builtin/branch.c:216 +#, c-format msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/clean.c:85 -msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" +#: builtin/branch.c:225 +#, c-format +msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/clean.c:155 builtin/clean.c:176 +#: builtin/branch.c:226 #, c-format -msgid "Would remove %s\n" +msgid "Error deleting branch '%s'" msgstr "" -#: builtin/clean.c:159 builtin/clean.c:179 +#: builtin/branch.c:233 #, c-format -msgid "Removing %s\n" +msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/clean.c:162 builtin/clean.c:182 +#: builtin/branch.c:234 #, c-format -msgid "failed to remove %s" +msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" +#: builtin/branch.c:239 +msgid "Update of config-file failed" msgstr "" -#: builtin/clean.c:168 +#: builtin/branch.c:337 #, c-format -msgid "Not removing %s\n" +msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/clone.c:243 +#: builtin/branch.c:409 #, c-format -msgid "reference repository '%s' is not a local directory." +msgid "behind %d] " msgstr "" -#: builtin/clone.c:302 +#: builtin/branch.c:411 #, c-format -msgid "failed to open '%s'" +msgid "ahead %d] " msgstr "" -#: builtin/clone.c:306 +#: builtin/branch.c:413 #, c-format -msgid "failed to create directory '%s'" +msgid "ahead %d, behind %d] " msgstr "" -#: builtin/clone.c:308 builtin/diff.c:75 -#, c-format -msgid "failed to stat '%s'" +#: builtin/branch.c:521 +msgid "(no branch)" msgstr "" -#: builtin/clone.c:310 -#, c-format -msgid "%s exists and is not a directory" +#: builtin/branch.c:586 +msgid "some refs could not be read" msgstr "" -#: builtin/clone.c:324 -#, c-format -msgid "failed to stat %s\n" +#: builtin/branch.c:599 +msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/clone.c:341 +#: builtin/branch.c:609 #, c-format -msgid "failed to unlink '%s'" +msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/clone.c:346 +#: builtin/branch.c:624 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:628 #, c-format -msgid "failed to create link '%s'" +msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/clone.c:350 +#: builtin/branch.c:632 #, c-format -msgid "failed to copy file to '%s'" +msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/clone.c:373 +#: builtin/branch.c:639 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:654 #, c-format -msgid "done.\n" +msgid "malformed object name %s" msgstr "" -#: builtin/clone.c:440 +#: builtin/branch.c:678 #, c-format -msgid "Could not find remote branch %s to clone." +msgid "could not write branch description template: %s" msgstr "" -#: builtin/clone.c:549 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +#: builtin/branch.c:769 +msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/clone.c:639 -msgid "Too many arguments." +#: builtin/branch.c:774 builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/clone.c:643 -msgid "You must specify a repository to clone." +#: builtin/branch.c:794 +msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/clone.c:654 -#, c-format -msgid "--bare and --origin %s options are incompatible." +#: builtin/branch.c:843 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/clone.c:668 +#: builtin/bundle.c:47 #, c-format -msgid "repository '%s' does not exist" +msgid "%s is okay\n" msgstr "" -#: builtin/clone.c:673 -msgid "--depth is ignored in local clones; use file:// instead." +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." msgstr "" -#: builtin/clone.c:683 -#, c-format -msgid "destination path '%s' already exists and is not an empty directory." +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." msgstr "" -#: builtin/clone.c:693 +#: builtin/checkout.c:113 builtin/checkout.c:146 #, c-format -msgid "working tree '%s' already exists." +msgid "path '%s' does not have our version" msgstr "" -#: builtin/clone.c:706 builtin/clone.c:720 +#: builtin/checkout.c:115 builtin/checkout.c:148 #, c-format -msgid "could not create leading directories of '%s'" +msgid "path '%s' does not have their version" msgstr "" -#: builtin/clone.c:709 +#: builtin/checkout.c:131 #, c-format -msgid "could not create work tree dir '%s'." +msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/clone.c:728 +#: builtin/checkout.c:175 #, c-format -msgid "Cloning into bare repository '%s'...\n" +msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/clone.c:730 +#: builtin/checkout.c:192 #, c-format -msgid "Cloning into '%s'...\n" +msgid "path '%s': cannot merge" msgstr "" -#: builtin/clone.c:786 +#: builtin/checkout.c:209 #, c-format -msgid "Don't know how to clone %s" +msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/clone.c:835 +#: builtin/checkout.c:234 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:264 builtin/checkout.c:271 #, c-format -msgid "Remote branch %s not found in upstream %s" +msgid "path '%s' is unmerged" msgstr "" -#: builtin/clone.c:842 -msgid "You appear to have cloned an empty repository." +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/merge.c:812 +msgid "unable to write new index file" msgstr "" -#: builtin/commit.c:42 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +msgid "diff_setup_done failed" msgstr "" -#: builtin/commit.c:54 -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" +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" msgstr "" -#: builtin/commit.c:59 -msgid "" -"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" -"If you wish to commit it anyway, use:\n" -"\n" -" git commit --allow-empty\n" -"\n" -"Otherwise, please use 'git reset'\n" +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/commit.c:205 builtin/reset.c:33 -msgid "merge" +#: builtin/checkout.c:566 +msgid "HEAD is now at" msgstr "" -#: builtin/commit.c:208 -msgid "cherry-pick" +#: builtin/checkout.c:573 +#, c-format +msgid "Reset branch '%s'\n" msgstr "" -#: builtin/commit.c:325 -msgid "failed to unpack HEAD tree object" +#: builtin/checkout.c:576 +#, c-format +msgid "Already on '%s'\n" msgstr "" -#: builtin/commit.c:367 -msgid "unable to create temporary index" +#: builtin/checkout.c:580 +#, c-format +msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/commit.c:373 -msgid "interactive add failed" +#: builtin/checkout.c:582 +#, c-format +msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 -msgid "unable to write new_index file" +#: builtin/checkout.c:584 +#, c-format +msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/commit.c:457 +#: builtin/checkout.c:640 #, c-format -msgid "cannot do a partial commit during a %s." +msgid " ... and %d more.\n" msgstr "" -#: builtin/commit.c:466 -msgid "cannot read the index" +#. The singular version +#: builtin/checkout.c:646 +#, c-format +msgid "" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "" +msgstr[1] "" + +#: builtin/checkout.c:664 +#, c-format +msgid "" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch new_branch_name %s\n" +"\n" msgstr "" -#: builtin/commit.c:486 -msgid "unable to write temporary index file" +#: builtin/checkout.c:693 +msgid "internal error in revision walk" msgstr "" -#: builtin/commit.c:561 builtin/commit.c:567 -#, c-format -msgid "invalid commit: %s" +#: builtin/checkout.c:697 +msgid "Previous HEAD position was" msgstr "" -#: builtin/commit.c:590 -msgid "malformed --author parameter" +#: builtin/checkout.c:723 +msgid "You are on a branch yet to be born" msgstr "" -#: builtin/commit.c:651 +#. case (1) +#: builtin/checkout.c:854 #, c-format -msgid "Malformed ident string: '%s'" +msgid "invalid reference: %s" msgstr "" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033 +#. case (1): want a tree +#: builtin/checkout.c:893 #, c-format -msgid "could not lookup commit %s" +msgid "reference is not a tree: %s" msgstr "" -#: builtin/commit.c:701 builtin/shortlog.c:296 -#, c-format -msgid "(reading log message from standard input)\n" +#: builtin/checkout.c:973 +msgid "-B cannot be used with -b" msgstr "" -#: builtin/commit.c:703 -msgid "could not read log from standard input" +#: builtin/checkout.c:982 +msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/commit.c:707 -#, c-format -msgid "could not read log file '%s'" +#: builtin/checkout.c:985 +msgid "--detach cannot be used with -b/-B/--orphan" msgstr "" -#: builtin/commit.c:713 -msgid "commit has empty message" +#: builtin/checkout.c:987 +msgid "--detach cannot be used with -t" msgstr "" -#: builtin/commit.c:729 -msgid "could not read MERGE_MSG" +#: builtin/checkout.c:993 +msgid "--track needs a branch name" msgstr "" -#: builtin/commit.c:733 -msgid "could not read SQUASH_MSG" +#: builtin/checkout.c:1000 +msgid "Missing branch name; try -b" msgstr "" -#: builtin/commit.c:737 -#, c-format -msgid "could not read '%s'" +#: builtin/checkout.c:1006 +msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/commit.c:765 -#, c-format -msgid "could not open '%s'" +#: builtin/checkout.c:1008 +msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/commit.c:789 -msgid "could not write commit template" +#: builtin/checkout.c:1018 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#: builtin/checkout.c:1052 +msgid "invalid path specification" msgstr "" -#: builtin/commit.c:799 +#: builtin/checkout.c:1060 #, c-format msgid "" -"\n" -"It looks like you may be committing a %s.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/commit.c:812 -msgid "Please enter the commit message for your changes." +#: builtin/checkout.c:1062 +msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/commit.c:815 -msgid "" -" Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +#: builtin/checkout.c:1067 +msgid "git checkout: --detach does not take a path argument" msgstr "" -#: builtin/commit.c:820 +#: builtin/checkout.c:1070 msgid "" -" Lines starting\n" -"with '#' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." msgstr "" -#: builtin/commit.c:832 -#, c-format -msgid "%sAuthor: %s" +#: builtin/checkout.c:1089 +msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/commit.c:839 -#, c-format -msgid "%sCommitter: %s" +#: builtin/checkout.c:1092 +msgid "--ours/--theirs is incompatible with switching branches." msgstr "" -#: builtin/commit.c:859 -msgid "Cannot read index" +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" msgstr "" -#: builtin/commit.c:896 -msgid "Error building trees" +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" -#: builtin/commit.c:911 builtin/tag.c:357 -#, c-format -msgid "Please supply the message using either -m or -F option.\n" +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" msgstr "" -#: builtin/commit.c:1008 +#: builtin/clean.c:155 builtin/clean.c:176 #, c-format -msgid "No existing author found with '%s'" +msgid "Would remove %s\n" msgstr "" -#: builtin/commit.c:1023 builtin/commit.c:1217 +#: builtin/clean.c:159 builtin/clean.c:179 #, c-format -msgid "Invalid untracked files mode '%s'" -msgstr "" - -#: builtin/commit.c:1063 -msgid "Using both --reset-author and --author does not make sense" +msgid "Removing %s\n" msgstr "" -#: builtin/commit.c:1074 -msgid "You have nothing to amend." +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" msgstr "" -#: builtin/commit.c:1076 +#: builtin/clean.c:166 #, c-format -msgid "You are in the middle of a %s -- cannot amend." +msgid "Would not remove %s\n" msgstr "" -#: builtin/commit.c:1078 -msgid "Options --squash and --fixup cannot be used together" +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" msgstr "" -#: builtin/commit.c:1088 -msgid "Only one of -c/-C/-F/--fixup can be used." +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." msgstr "" -#: builtin/commit.c:1090 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" msgstr "" -#: builtin/commit.c:1098 -msgid "--reset-author can be used only with -C, -c or --amend." +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" msgstr "" -#: builtin/commit.c:1115 -msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +#: builtin/clone.c:308 builtin/diff.c:75 +#, c-format +msgid "failed to stat '%s'" msgstr "" -#: builtin/commit.c:1117 -msgid "No paths with --include/--only does not make sense." +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" msgstr "" -#: builtin/commit.c:1119 -msgid "Clever... amending the last one with dirty index." +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" msgstr "" -#: builtin/commit.c:1121 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +#: builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" msgstr "" -#: builtin/commit.c:1131 builtin/tag.c:556 +#: builtin/clone.c:346 #, c-format -msgid "Invalid cleanup mode %s" +msgid "failed to create link '%s'" msgstr "" -#: builtin/commit.c:1136 -msgid "Paths with -a does not make sense." +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" msgstr "" -#: builtin/commit.c:1315 -msgid "couldn't look up newly created commit" +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" msgstr "" -#: builtin/commit.c:1317 -msgid "could not parse newly created commit" +#: builtin/clone.c:440 +#, c-format +msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/commit.c:1358 -msgid "detached HEAD" +#: builtin/clone.c:549 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/commit.c:1360 -msgid " (root-commit)" +#: builtin/clone.c:639 +msgid "Too many arguments." msgstr "" -#: builtin/commit.c:1450 -msgid "could not parse HEAD commit" +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." msgstr "" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/clone.c:654 #, c-format -msgid "could not open '%s' for reading" +msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/commit.c:1494 +#: builtin/clone.c:668 #, c-format -msgid "Corrupt MERGE_HEAD file (%s)" +msgid "repository '%s' does not exist" msgstr "" -#: builtin/commit.c:1501 -msgid "could not read MERGE_MODE" +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/commit.c:1520 +#: builtin/clone.c:683 #, c-format -msgid "could not read commit message: %s" +msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/commit.c:1534 +#: builtin/clone.c:693 #, c-format -msgid "Aborting commit; you did not edit the message.\n" +msgid "working tree '%s' already exists." msgstr "" -#: builtin/commit.c:1539 +#: builtin/clone.c:706 builtin/clone.c:720 #, c-format -msgid "Aborting commit due to empty commit message.\n" -msgstr "" - -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 -msgid "failed to write commit object" -msgstr "" - -#: builtin/commit.c:1575 -msgid "cannot lock HEAD ref" -msgstr "" - -#: builtin/commit.c:1579 -msgid "cannot update HEAD ref" -msgstr "" - -#: builtin/commit.c:1590 -msgid "" -"Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." +msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/describe.c:234 +#: builtin/clone.c:709 #, c-format -msgid "annotated tag %s not available" +msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/describe.c:238 +#: builtin/clone.c:728 #, c-format -msgid "annotated tag %s has no embedded name" +msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/describe.c:240 +#: builtin/clone.c:730 #, c-format -msgid "tag '%s' is really '%s' here" +msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/describe.c:267 +#: builtin/clone.c:786 #, c-format -msgid "Not a valid object name %s" +msgid "Don't know how to clone %s" msgstr "" -#: builtin/describe.c:270 +#: builtin/clone.c:835 #, c-format -msgid "%s is not a valid '%s' object" +msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/describe.c:287 -#, c-format -msgid "no tag exactly matches '%s'" +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." msgstr "" -#: builtin/describe.c:289 -#, c-format -msgid "searching to describe %s\n" +#: builtin/column.c:51 +msgid "--command must be the first argument" msgstr "" -#: builtin/describe.c:329 -#, c-format -msgid "finished search at %s\n" +#: builtin/commit.c:43 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" msgstr "" -#: builtin/describe.c:353 -#, c-format +#: builtin/commit.c:55 msgid "" -"No annotated tags can describe '%s'.\n" -"However, there were unannotated tags: try --tags." +"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/describe.c:357 -#, c-format +#: builtin/commit.c:60 msgid "" -"No tags can describe '%s'.\n" -"Try --always, or create some tags." +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" +"Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/describe.c:378 -#, c-format -msgid "traversed %lu commits\n" +#: builtin/commit.c:309 +msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/describe.c:381 -#, c-format -msgid "" -"more than %i tags found; listed %i most recent\n" -"gave up search at %s\n" +#: builtin/commit.c:351 +msgid "unable to create temporary index" msgstr "" -#: builtin/describe.c:436 -msgid "--long is incompatible with --abbrev=0" +#: builtin/commit.c:357 +msgid "interactive add failed" msgstr "" -#: builtin/describe.c:462 -msgid "No names found, cannot describe anything." +#: builtin/commit.c:390 builtin/commit.c:411 builtin/commit.c:461 +msgid "unable to write new_index file" msgstr "" -#: builtin/describe.c:482 -msgid "--dirty is incompatible with committishes" +#: builtin/commit.c:442 +msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/diff.c:77 -#, c-format -msgid "'%s': not a regular file or symlink" +#: builtin/commit.c:444 +msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/diff.c:220 -#, c-format -msgid "invalid option: %s" +#: builtin/commit.c:454 +msgid "cannot read the index" msgstr "" -#: builtin/diff.c:297 -msgid "Not a git repository" +#: builtin/commit.c:474 +msgid "unable to write temporary index file" msgstr "" -#: builtin/diff.c:347 +#: builtin/commit.c:549 builtin/commit.c:555 #, c-format -msgid "invalid object '%s' given." +msgid "invalid commit: %s" msgstr "" -#: builtin/diff.c:352 -#, c-format -msgid "more than %d trees given: '%s'" +#: builtin/commit.c:578 +msgid "malformed --author parameter" msgstr "" -#: builtin/diff.c:362 +#: builtin/commit.c:639 #, c-format -msgid "more than two blobs given: '%s'" +msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/diff.c:370 +#: builtin/commit.c:677 builtin/commit.c:710 builtin/commit.c:1024 #, c-format -msgid "unhandled object '%s' given." -msgstr "" - -#: builtin/fetch.c:200 -msgid "Couldn't find remote ref HEAD" +msgid "could not lookup commit %s" msgstr "" -#: builtin/fetch.c:253 +#: builtin/commit.c:689 builtin/shortlog.c:296 #, c-format -msgid "object %s not found" +msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/fetch.c:259 -msgid "[up to date]" +#: builtin/commit.c:691 +msgid "could not read log from standard input" msgstr "" -#: builtin/fetch.c:273 +#: builtin/commit.c:695 #, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgid "could not read log file '%s'" msgstr "" -#: builtin/fetch.c:274 builtin/fetch.c:360 -msgid "[rejected]" +#: builtin/commit.c:701 +msgid "commit has empty message" msgstr "" -#: builtin/fetch.c:285 -msgid "[tag update]" +#: builtin/commit.c:717 +msgid "could not read MERGE_MSG" msgstr "" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 -msgid " (unable to update local ref)" +#: builtin/commit.c:721 +msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/fetch.c:305 -msgid "[new tag]" +#: builtin/commit.c:725 +#, c-format +msgid "could not read '%s'" msgstr "" -#: builtin/fetch.c:308 -msgid "[new branch]" +#: builtin/commit.c:777 +msgid "could not write commit template" msgstr "" -#: builtin/fetch.c:311 -msgid "[new ref]" +#: builtin/commit.c:788 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" msgstr "" -#: builtin/fetch.c:356 -msgid "unable to update local ref" +#: builtin/commit.c:793 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" msgstr "" -#: builtin/fetch.c:356 -msgid "forced update" +#: builtin/commit.c:805 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/fetch.c:362 -msgid "(non-fast-forward)" +#: builtin/commit.c:810 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" msgstr "" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/commit.c:823 #, c-format -msgid "cannot open %s: %s\n" +msgid "%sAuthor: %s" msgstr "" -#: builtin/fetch.c:402 +#: builtin/commit.c:830 #, c-format -msgid "%s did not send all necessary objects\n" +msgid "%sCommitter: %s" msgstr "" -#: builtin/fetch.c:488 -#, c-format -msgid "From %.*s\n" +#: builtin/commit.c:850 +msgid "Cannot read index" msgstr "" -#: builtin/fetch.c:499 +#: builtin/commit.c:887 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:902 builtin/tag.c:361 #, c-format -msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" +msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/fetch.c:549 +#: builtin/commit.c:999 #, c-format -msgid " (%s will become dangling)\n" +msgid "No existing author found with '%s'" msgstr "" -#: builtin/fetch.c:550 +#: builtin/commit.c:1014 builtin/commit.c:1214 #, c-format -msgid " (%s has become dangling)\n" +msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/fetch.c:557 -msgid "[deleted]" +#: builtin/commit.c:1054 +msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/fetch.c:558 -msgid "(none)" +#: builtin/commit.c:1065 +msgid "You have nothing to amend." msgstr "" -#: builtin/fetch.c:675 -#, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" +#: builtin/commit.c:1068 +msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/fetch.c:709 -#, c-format -msgid "Don't know how to fetch from %s" +#: builtin/commit.c:1070 +msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/fetch.c:786 -#, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" +#: builtin/commit.c:1073 +msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/fetch.c:789 -#, c-format -msgid "Option \"%s\" is ignored for %s\n" +#: builtin/commit.c:1083 +msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/fetch.c:888 -#, c-format -msgid "Fetching %s\n" +#: builtin/commit.c:1085 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/fetch.c:890 -#, c-format -msgid "Could not fetch %s" +#: builtin/commit.c:1093 +msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/fetch.c:907 -msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." +#: builtin/commit.c:1110 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/fetch.c:927 -msgid "You need to specify a tag name." +#: builtin/commit.c:1112 +msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/fetch.c:979 -msgid "fetch --all does not take a repository argument" +#: builtin/commit.c:1114 +msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/fetch.c:981 -msgid "fetch --all does not make sense with refspecs" +#: builtin/commit.c:1116 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/fetch.c:992 +#: builtin/commit.c:1126 builtin/tag.c:577 #, c-format -msgid "No such remote or remote group: %s" +msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/fetch.c:1000 -msgid "Fetching a group and specifying refspecs does not make sense" +#: builtin/commit.c:1131 +msgid "Paths with -a does not make sense." msgstr "" -#: builtin/gc.c:63 -#, c-format -msgid "Invalid %s: '%s'" +#: builtin/commit.c:1315 +msgid "couldn't look up newly created commit" msgstr "" -#: builtin/gc.c:78 -msgid "Too many options specified" +#: builtin/commit.c:1317 +msgid "could not parse newly created commit" msgstr "" -#: builtin/gc.c:103 -#, c-format -msgid "insanely long object directory %.*s" -msgstr "" - -#: builtin/gc.c:223 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" +#: builtin/commit.c:1358 +msgid "detached HEAD" msgstr "" -#: builtin/gc.c:226 -#, 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" +#: builtin/commit.c:1360 +msgid " (root-commit)" msgstr "" -#: builtin/gc.c:256 -msgid "" -"There are too many unreachable loose objects; run 'git prune' to remove them." +#: builtin/commit.c:1450 +msgid "could not parse HEAD commit" msgstr "" -#: builtin/grep.c:216 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format -msgid "grep: failed to create thread: %s" +msgid "could not open '%s' for reading" msgstr "" -#: builtin/grep.c:402 +#: builtin/commit.c:1494 #, c-format -msgid "Failed to chdir: %s" +msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/grep.c:478 builtin/grep.c:512 -#, c-format -msgid "unable to read tree (%s)" +#: builtin/commit.c:1501 +msgid "could not read MERGE_MODE" msgstr "" -#: builtin/grep.c:526 +#: builtin/commit.c:1520 #, c-format -msgid "unable to grep from object of type %s" +msgid "could not read commit message: %s" msgstr "" -#: builtin/grep.c:584 +#: builtin/commit.c:1534 #, c-format -msgid "switch `%c' expects a numerical value" +msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/grep.c:601 +#: builtin/commit.c:1539 #, c-format -msgid "cannot open '%s'" +msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/grep.c:888 -msgid "no pattern given." +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +msgid "failed to write commit object" msgstr "" -#: builtin/grep.c:902 -#, c-format -msgid "bad object %s" +#: builtin/commit.c:1575 +msgid "cannot lock HEAD ref" msgstr "" -#: builtin/grep.c:943 -msgid "--open-files-in-pager only works on the worktree" +#: builtin/commit.c:1579 +msgid "cannot update HEAD ref" msgstr "" -#: builtin/grep.c:966 -msgid "--cached or --untracked cannot be used with --no-index." +#: builtin/commit.c:1590 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full or quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -#: builtin/grep.c:971 -msgid "--no-index or --untracked cannot be used with revs." +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" msgstr "" -#: builtin/grep.c:974 -msgid "--[no-]exclude-standard cannot be used for tracked contents." +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/grep.c:982 -msgid "both --cached and trees are given." +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/init-db.c:35 +#: builtin/describe.c:267 #, c-format -msgid "Could not make %s writable by group" +msgid "Not a valid object name %s" msgstr "" -#: builtin/init-db.c:62 +#: builtin/describe.c:270 #, c-format -msgid "insanely long template name %s" +msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/init-db.c:67 +#: builtin/describe.c:287 #, c-format -msgid "cannot stat '%s'" +msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/init-db.c:73 +#: builtin/describe.c:289 #, c-format -msgid "cannot stat template '%s'" +msgid "searching to describe %s\n" msgstr "" -#: builtin/init-db.c:80 +#: builtin/describe.c:329 #, c-format -msgid "cannot opendir '%s'" +msgid "finished search at %s\n" msgstr "" -#: builtin/init-db.c:97 +#: builtin/describe.c:353 #, c-format -msgid "cannot readlink '%s'" +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." msgstr "" -#: builtin/init-db.c:99 +#: builtin/describe.c:357 #, c-format -msgid "insanely long symlink %s" +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." msgstr "" -#: builtin/init-db.c:102 +#: builtin/describe.c:378 #, c-format -msgid "cannot symlink '%s' '%s'" +msgid "traversed %lu commits\n" msgstr "" -#: builtin/init-db.c:106 +#: builtin/describe.c:381 #, c-format -msgid "cannot copy '%s' to '%s'" +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" msgstr "" -#: builtin/init-db.c:110 -#, c-format -msgid "ignoring template %s" +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/init-db.c:133 -#, c-format -msgid "insanely long template path %s" +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." msgstr "" -#: builtin/init-db.c:141 +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:77 #, c-format -msgid "templates not found %s" +msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/init-db.c:154 +#: builtin/diff.c:220 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" +msgid "invalid option: %s" msgstr "" -#: builtin/init-db.c:192 +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:347 #, c-format -msgid "insane git directory %s" +msgid "invalid object '%s' given." msgstr "" -#: builtin/init-db.c:322 builtin/init-db.c:325 +#: builtin/diff.c:352 #, c-format -msgid "%s already exists" +msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/init-db.c:354 +#: builtin/diff.c:362 #, c-format -msgid "unable to handle file type %d" +msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/init-db.c:357 +#: builtin/diff.c:370 #, c-format -msgid "unable to move %s to %s" +msgid "unhandled object '%s' given." msgstr "" -#: builtin/init-db.c:362 +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:253 #, c-format -msgid "Could not create git link %s" +msgid "object %s not found" msgstr "" -#. -#. * TRANSLATORS: The first '%s' is either "Reinitialized -#. * existing" or "Initialized empty", the second " shared" or -#. * "", and the last '%s%s' is the verbatim directory name. -#. -#: builtin/init-db.c:419 +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "" + +#: builtin/fetch.c:273 #, c-format -msgid "%s%s Git repository in %s%s\n" +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/init-db.c:420 -msgid "Reinitialized existing" +#: builtin/fetch.c:274 builtin/fetch.c:360 +msgid "[rejected]" msgstr "" -#: builtin/init-db.c:420 -msgid "Initialized empty" +#: builtin/fetch.c:285 +msgid "[tag update]" msgstr "" -#: builtin/init-db.c:421 -msgid " shared" +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +msgid " (unable to update local ref)" msgstr "" -#: builtin/init-db.c:440 -msgid "cannot tell cwd" +#: builtin/fetch.c:305 +msgid "[new tag]" msgstr "" -#: builtin/init-db.c:521 builtin/init-db.c:528 -#, c-format -msgid "cannot mkdir %s" +#: builtin/fetch.c:308 +msgid "[new branch]" msgstr "" -#: builtin/init-db.c:532 -#, c-format -msgid "cannot chdir to %s" +#: builtin/fetch.c:311 +msgid "[new ref]" msgstr "" -#: builtin/init-db.c:554 -#, c-format -msgid "" -"%s (or --work-tree=) not allowed without specifying %s (or --git-" -"dir=)" +#: builtin/fetch.c:356 +msgid "unable to update local ref" msgstr "" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" +#: builtin/fetch.c:356 +msgid "forced update" msgstr "" -#: builtin/init-db.c:585 -#, c-format -msgid "Cannot access work tree '%s'" +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" msgstr "" -#: builtin/log.c:188 +#: builtin/fetch.c:393 builtin/fetch.c:685 #, c-format -msgid "Final output: %d %s\n" +msgid "cannot open %s: %s\n" msgstr "" -#: builtin/log.c:401 builtin/log.c:489 +#: builtin/fetch.c:402 #, c-format -msgid "Could not read object %s" +msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/log.c:513 +#: builtin/fetch.c:488 #, c-format -msgid "Unknown type: %d" +msgid "From %.*s\n" msgstr "" -#: builtin/log.c:602 -msgid "format.headers without value" +#: builtin/fetch.c:499 +#, 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/log.c:675 -msgid "name of output directory is too long" +#: builtin/fetch.c:549 +#, c-format +msgid " (%s will become dangling)" msgstr "" -#: builtin/log.c:686 +#: builtin/fetch.c:550 #, c-format -msgid "Cannot open patch file %s" +msgid " (%s has become dangling)" msgstr "" -#: builtin/log.c:700 -msgid "Need exactly one range." +#: builtin/fetch.c:557 +msgid "[deleted]" msgstr "" -#: builtin/log.c:708 -msgid "Not a range." +#: builtin/fetch.c:558 builtin/remote.c:1055 +msgid "(none)" msgstr "" -#: builtin/log.c:745 -msgid "Could not extract email from committer identity." +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/log.c:791 -msgid "Cover letter needs email format" +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/log.c:885 +#: builtin/fetch.c:786 #, c-format -msgid "insane in-reply-to: %s" +msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/log.c:958 -msgid "Two output directories?" +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/log.c:1179 +#: builtin/fetch.c:888 #, c-format -msgid "bogus committer info %s" +msgid "Fetching %s\n" msgstr "" -#: builtin/log.c:1224 -msgid "-n and -k are mutually exclusive." +#: builtin/fetch.c:890 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" msgstr "" -#: builtin/log.c:1226 -msgid "--subject-prefix and -k are mutually exclusive." +#: builtin/fetch.c:907 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." msgstr "" -#: builtin/log.c:1231 builtin/shortlog.c:284 -#, c-format -msgid "unrecognized argument: %s" +#: builtin/fetch.c:927 +msgid "You need to specify a tag name." msgstr "" -#: builtin/log.c:1234 -msgid "--name-only does not make sense" +#: builtin/fetch.c:979 +msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/log.c:1236 -msgid "--name-status does not make sense" +#: builtin/fetch.c:981 +msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/log.c:1238 -msgid "--check does not make sense" +#: builtin/fetch.c:992 +#, c-format +msgid "No such remote or remote group: %s" msgstr "" -#: builtin/log.c:1261 -msgid "standard output, or directory, which one?" +#: builtin/fetch.c:1000 +msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/log.c:1263 +#: builtin/gc.c:63 #, c-format -msgid "Could not create directory '%s'" +msgid "Invalid %s: '%s'" msgstr "" -#: builtin/log.c:1416 -msgid "Failed to create output files" +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" msgstr "" -#: builtin/log.c:1520 +#: builtin/gc.c:221 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:224 #, c-format msgid "" -"Could not find a tracked remote branch, please specify manually.\n" +"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/log.c:1536 builtin/log.c:1538 builtin/log.c:1550 +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:216 #, c-format -msgid "Unknown commit %s" +msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/merge.c:90 -msgid "switch `m' requires a value" +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" msgstr "" -#: builtin/merge.c:127 +#: builtin/grep.c:478 builtin/grep.c:512 #, c-format -msgid "Could not find merge strategy '%s'.\n" +msgid "unable to read tree (%s)" msgstr "" -#: builtin/merge.c:128 +#: builtin/grep.c:526 #, c-format -msgid "Available strategies are:" +msgid "unable to grep from object of type %s" msgstr "" -#: builtin/merge.c:133 +#: builtin/grep.c:584 #, c-format -msgid "Available custom strategies are:" +msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/merge.c:240 -msgid "could not run stash." +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" msgstr "" -#: builtin/merge.c:245 -msgid "stash failed" +#: builtin/grep.c:888 +msgid "no pattern given." msgstr "" -#: builtin/merge.c:250 +#: builtin/grep.c:902 #, c-format -msgid "not a valid object: %s" +msgid "bad object %s" msgstr "" -#: builtin/merge.c:269 builtin/merge.c:286 -msgid "read-tree failed" +#: builtin/grep.c:943 +msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/merge.c:316 -msgid " (nothing to squash)" +#: builtin/grep.c:966 +msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/merge.c:329 +#: builtin/grep.c:971 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "" + +#: builtin/grep.c:974 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:982 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/help.c:59 #, c-format -msgid "Squash commit -- not updating HEAD\n" +msgid "unrecognized help format '%s'" msgstr "" -#: builtin/merge.c:361 -msgid "Writing SQUASH_MSG" +#: builtin/help.c:87 +msgid "Failed to start emacsclient." msgstr "" -#: builtin/merge.c:363 -msgid "Finishing SQUASH_MSG" +#: builtin/help.c:100 +msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/merge.c:386 +#: builtin/help.c:108 #, c-format -msgid "No merge message -- not updating HEAD\n" +msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/merge.c:437 +#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 #, c-format -msgid "'%s' does not point to a commit" +msgid "failed to exec '%s': %s" msgstr "" -#: builtin/merge.c:536 +#: builtin/help.c:211 #, c-format -msgid "Bad branch.%s.mergeoptions string: %s" +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man..cmd' instead." msgstr "" -#: builtin/merge.c:629 -msgid "git write-tree failed to write a tree" +#: builtin/help.c:223 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man..path' instead." msgstr "" -#: builtin/merge.c:679 -msgid "failed to read the cache" +#: builtin/help.c:287 +msgid "The most commonly used git commands are:" msgstr "" -#: builtin/merge.c:697 -msgid "Unable to write index." +#: builtin/help.c:355 +#, c-format +msgid "'%s': unknown man viewer." msgstr "" -#: builtin/merge.c:710 -msgid "Not handling anything other than two heads merge." +#: builtin/help.c:372 +msgid "no man viewer handled the request" msgstr "" -#: builtin/merge.c:724 +#: builtin/help.c:380 +msgid "no info viewer handled the request" +msgstr "" + +#: builtin/help.c:391 #, c-format -msgid "Unknown option for merge-recursive: -X%s" +msgid "'%s': not a documentation directory." msgstr "" -#: builtin/merge.c:738 +#: builtin/help.c:432 builtin/help.c:439 #, c-format -msgid "unable to write %s" +msgid "usage: %s%s" msgstr "" -#: builtin/merge.c:877 +#: builtin/help.c:453 #, c-format -msgid "Could not read from '%s'" +msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/merge.c:886 +#: builtin/index-pack.c:84 #, c-format -msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgid "object type mismatch at %s" msgstr "" -#: builtin/merge.c:892 -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" -"the commit.\n" +#: builtin/index-pack.c:104 +msgid "object of unexpected type" msgstr "" -#: builtin/merge.c:916 -msgid "Empty commit message." +#: builtin/index-pack.c:141 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:151 +msgid "early EOF" msgstr "" -#: builtin/merge.c:928 +#: builtin/index-pack.c:152 +msgid "read error on input" +msgstr "" + +#: builtin/index-pack.c:164 +msgid "used more bytes than were available" +msgstr "" + +#: builtin/index-pack.c:171 +msgid "pack too large for current definition of off_t" +msgstr "" + +#: builtin/index-pack.c:187 #, c-format -msgid "Wonderful.\n" +msgid "unable to create '%s'" msgstr "" -#: builtin/merge.c:993 +#: builtin/index-pack.c:192 #, c-format -msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgid "cannot open packfile '%s'" msgstr "" -#: builtin/merge.c:1009 +#: builtin/index-pack.c:206 +msgid "pack signature mismatch" +msgstr "" + +#: builtin/index-pack.c:226 #, c-format -msgid "'%s' is not a commit" +msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/merge.c:1050 -msgid "No current branch." +#: builtin/index-pack.c:300 +#, c-format +msgid "inflate returned %d" msgstr "" -#: builtin/merge.c:1052 -msgid "No remote for the current branch." +#: builtin/index-pack.c:345 +msgid "offset value overflow for delta base object" msgstr "" -#: builtin/merge.c:1054 -msgid "No default upstream defined for the current branch." +#: builtin/index-pack.c:353 +msgid "delta base offset is out of bound" msgstr "" -#: builtin/merge.c:1059 +#: builtin/index-pack.c:361 #, c-format -msgid "No remote tracking branch for %s from %s" +msgid "unknown object type %d" msgstr "" -#: builtin/merge.c:1146 builtin/merge.c:1303 +#: builtin/index-pack.c:390 +msgid "cannot pread pack file" +msgstr "" + +#: builtin/index-pack.c:392 #, c-format -msgid "%s - not something we can merge" +msgid "premature end of pack file, %lu byte missing" +msgid_plural "premature end of pack file, %lu bytes missing" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:405 +msgid "serious inflate inconsistency" msgstr "" -#: builtin/merge.c:1214 -msgid "There is no merge to abort (MERGE_HEAD missing)." +#: builtin/index-pack.c:476 +#, c-format +msgid "cannot read existing object %s" msgstr "" -#: builtin/merge.c:1230 git-pull.sh:31 -msgid "" -"You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +#: builtin/index-pack.c:479 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/merge.c:1233 git-pull.sh:34 -msgid "You have not concluded your merge (MERGE_HEAD exists)." +#: builtin/index-pack.c:488 +#, c-format +msgid "invalid blob object %s" msgstr "" -#: builtin/merge.c:1237 -msgid "" -"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +#: builtin/index-pack.c:500 +#, c-format +msgid "invalid %s" msgstr "" -#: builtin/merge.c:1240 -msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +#: builtin/index-pack.c:502 +msgid "Error in object" msgstr "" -#: builtin/merge.c:1249 -msgid "You cannot combine --squash with --no-ff." +#: builtin/index-pack.c:504 +#, c-format +msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/merge.c:1254 -msgid "You cannot combine --no-ff with --ff-only." +#: builtin/index-pack.c:576 builtin/index-pack.c:602 +msgid "failed to apply delta" msgstr "" -#: builtin/merge.c:1261 -msgid "No commit specified and merge.defaultToUpstream not set." +#: builtin/index-pack.c:706 +msgid "Receiving objects" msgstr "" -#: builtin/merge.c:1293 -msgid "Can merge only exactly one commit into empty head" +#: builtin/index-pack.c:706 +msgid "Indexing objects" msgstr "" -#: builtin/merge.c:1296 -msgid "Squash commit into empty head not supported yet" +#: builtin/index-pack.c:728 +msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/merge.c:1298 -msgid "Non-fast-forward commit does not make sense into an empty head" +#: builtin/index-pack.c:733 +msgid "cannot fstat packfile" msgstr "" -#: builtin/merge.c:1413 -#, c-format -msgid "Updating %s..%s\n" +#: builtin/index-pack.c:736 +msgid "pack has junk at the end" msgstr "" -#: builtin/merge.c:1451 +#: builtin/index-pack.c:754 +msgid "Resolving deltas" +msgstr "" + +#: builtin/index-pack.c:787 #, c-format -msgid "Trying really trivial in-index merge...\n" +msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/merge.c:1458 +#: builtin/index-pack.c:866 #, c-format -msgid "Nope.\n" +msgid "local object %s is corrupt" msgstr "" -#: builtin/merge.c:1490 -msgid "Not possible to fast-forward, aborting." +#: builtin/index-pack.c:890 +msgid "error while closing pack file" msgstr "" -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/index-pack.c:903 #, c-format -msgid "Rewinding the tree to pristine...\n" +msgid "cannot write keep file '%s'" msgstr "" -#: builtin/merge.c:1517 +#: builtin/index-pack.c:911 #, c-format -msgid "Trying merge strategy %s...\n" +msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/merge.c:1583 -#, c-format -msgid "No merge strategy handled the merge.\n" +#: builtin/index-pack.c:924 +msgid "cannot store pack file" +msgstr "" + +#: builtin/index-pack.c:935 +msgid "cannot store index file" +msgstr "" + +#: builtin/index-pack.c:1024 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "" + +#: builtin/index-pack.c:1026 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "" + +#: builtin/index-pack.c:1073 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1080 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:1107 +msgid "Cannot come back to cwd" +msgstr "" + +#: builtin/index-pack.c:1140 builtin/index-pack.c:1143 +#: builtin/index-pack.c:1155 builtin/index-pack.c:1159 +#, c-format +msgid "bad %s" +msgstr "" + +#: builtin/index-pack.c:1173 +msgid "--fix-thin cannot be used without --stdin" +msgstr "" + +#: builtin/index-pack.c:1177 builtin/index-pack.c:1187 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "" + +#: builtin/index-pack.c:1196 +msgid "--verify with no packfile name given" +msgstr "" + +#: builtin/index-pack.c:1220 +msgid "confusion beyond insanity" +msgstr "" + +#: builtin/index-pack.c:1239 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "" +msgstr[1] "" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "" + +#: builtin/init-db.c:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "" + +#: builtin/init-db.c:362 +#, c-format +msgid "Could not create git link %s" +msgstr "" + +#. +#. * TRANSLATORS: The first '%s' is either "Reinitialized +#. * existing" or "Initialized empty", the second " shared" or +#. * "", and the last '%s%s' is the verbatim directory name. +#. +#: builtin/init-db.c:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr "" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:554 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:188 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:401 builtin/log.c:489 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:513 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:602 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:675 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:686 +#, c-format +msgid "Cannot open patch file %s" +msgstr "" + +#: builtin/log.c:700 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:708 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:745 +msgid "Could not extract email from committer identity." +msgstr "" + +#: builtin/log.c:791 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:885 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:958 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1179 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1224 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1226 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1234 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1236 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1238 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1261 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1263 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1416 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1520 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "" + +#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:128 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:250 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:269 builtin/merge.c:286 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:316 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:629 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:679 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:697 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:710 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:724 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:738 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:877 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:886 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:892 +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" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:916 +msgid "Empty commit message." +msgstr "" + +#: builtin/merge.c:928 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:993 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:1009 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:1050 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:1052 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:1054 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1059 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1146 builtin/merge.c:1303 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1214 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1230 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:1233 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1237 +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:1240 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1249 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1254 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:1261 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +#: builtin/merge.c:1293 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1296 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1298 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1413 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1451 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1458 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1490 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1513 builtin/merge.c:1592 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1517 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1583 +#, c-format +msgid "No merge strategy handled the merge.\n" msgstr "" #: builtin/merge.c:1585 #, c-format -msgid "Merge with strategy %s failed.\n" +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1594 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1606 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:115 +msgid "can not move directory into itself" +msgstr "" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" msgstr "" -#: builtin/merge.c:1594 +#: builtin/notes.c:158 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" +msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/merge.c:1606 +#: builtin/notes.c:175 builtin/tag.c:347 #, c-format -msgid "Automatic merge went well; stopped before committing as requested\n" +msgid "could not create file '%s'" msgstr "" -#: builtin/mv.c:108 +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:210 builtin/notes.c:973 #, c-format -msgid "Checking rename of '%s' to '%s'\n" +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:251 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "" + +#: builtin/notes.c:253 builtin/tag.c:545 +#, 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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:350 +#, 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 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:456 +#, 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 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:580 +#, 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 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:717 +#, 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 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:1103 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/pack-objects.c:2315 +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#: builtin/pack-objects.c:2319 +#, c-format +msgid "bad index version '%s'" +msgstr "" + +#: builtin/pack-objects.c:2342 +#, c-format +msgid "option %s does not accept negative form" +msgstr "" + +#: builtin/pack-objects.c:2346 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "" + +#: builtin/push.c:45 +msgid "tag shorthand without " +msgstr "" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:99 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" + +#: builtin/push.c:102 +#, c-format +msgid "" +"The upstream branch of your current branch does not match\n" +"the name of your current branch. To push to the upstream branch\n" +"on the remote, use\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"To push to the branch of the same name on the remote, use\n" +"\n" +" git push %s %s\n" +"%s" +msgstr "" + +#: builtin/push.c:121 +#, c-format +msgid "" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" +"\n" +" git push %s HEAD:\n" +msgstr "" + +#: builtin/push.c:128 +#, c-format +msgid "" +"The current branch %s has no upstream branch.\n" +"To push the current branch and set the remote as upstream, use\n" +"\n" +" git push --set-upstream %s %s\n" +msgstr "" + +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "" + +#: builtin/push.c:139 +#, c-format +msgid "" +"You are pushing to remote '%s', which is not the upstream of\n" +"your current branch '%s', without telling me what to push\n" +"to update which remote branch." +msgstr "" + +#: builtin/push.c:174 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:181 +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" +"before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:187 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. If you did not intend to push that branch, you may want to\n" +"specify branches to push or set the 'push.default' configuration\n" +"variable to 'current' or 'upstream' to push only the current branch." +msgstr "" + +#: builtin/push.c:193 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and merge the remote changes\n" +"(e.g. 'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:233 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:237 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:269 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:270 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add \n" +"\n" +"and then push using the remote name\n" +"\n" +" git push \n" +msgstr "" + +#: builtin/push.c:285 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:286 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:291 +msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/mv.c:112 -msgid "bad source" +#: builtin/push.c:292 +msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/mv.c:115 -msgid "can not move directory into itself" +#: builtin/push.c:297 +msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/mv.c:118 -msgid "cannot move directory over file" +#: builtin/push.c:385 +msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/mv.c:128 -#, c-format -msgid "Huh? %.*s is in index?" +#: builtin/push.c:387 +msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/mv.c:140 -msgid "source directory is empty" +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" msgstr "" -#: builtin/mv.c:171 -msgid "not under version control" +#: builtin/remote.c:130 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/mv.c:173 -msgid "destination exists" +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" msgstr "" -#: builtin/mv.c:181 -#, c-format -msgid "overwriting '%s'" +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/mv.c:184 -msgid "Cannot overwrite" +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/mv.c:187 -msgid "multiple sources for the same target" +#: builtin/remote.c:195 builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." msgstr "" -#: builtin/mv.c:202 +#: builtin/remote.c:199 builtin/remote.c:650 #, c-format -msgid "%s, source=%s, destination=%s" +msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/mv.c:212 +#: builtin/remote.c:243 #, c-format -msgid "Renaming %s to %s\n" +msgid "Could not setup master '%s'" msgstr "" -#: builtin/mv.c:215 +#: builtin/remote.c:299 #, c-format -msgid "renaming '%s' failed" +msgid "more than one %s" msgstr "" -#: builtin/notes.c:139 +#: builtin/remote.c:339 #, c-format -msgid "unable to start 'show' for object '%s'" +msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" +#: builtin/remote.c:440 builtin/remote.c:448 +msgid "(matching)" msgstr "" -#: builtin/notes.c:155 +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 #, c-format -msgid "failed to close pipe to 'show' for object '%s'" +msgid "Could not append '%s' to '%s'" msgstr "" -#: builtin/notes.c:158 +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 #, c-format -msgid "failed to finish 'show' for object '%s'" +msgid "No such remote: %s" msgstr "" -#: builtin/notes.c:175 builtin/tag.c:343 +#: builtin/remote.c:656 #, c-format -msgid "could not create file '%s'" +msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/notes.c:189 -msgid "Please supply the note contents using either -m or -F option" +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" msgstr "" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/remote.c:677 #, c-format -msgid "Removing note for object %s\n" +msgid "" +"Not updating non-default fetch respec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/notes.c:215 -msgid "unable to write note object" +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" msgstr "" -#: builtin/notes.c:217 +#: builtin/remote.c:694 #, c-format -msgid "The note contents has been left in %s" +msgid "Could not set '%s'" msgstr "" -#: builtin/notes.c:251 builtin/tag.c:521 +#: builtin/remote.c:716 #, c-format -msgid "cannot read '%s'" +msgid "deleting '%s' failed" msgstr "" -#: builtin/notes.c:253 builtin/tag.c:524 +#: builtin/remote.c:750 #, c-format -msgid "could not open or read '%s'" +msgid "creating '%s' failed" 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:537 +#: builtin/remote.c:764 #, c-format -msgid "Failed to resolve '%s' as a valid ref." +msgid "Could not remove branch %s" msgstr "" -#: builtin/notes.c:275 +#: builtin/remote.c:834 +msgid "" +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" +"to delete it, use:" +msgid_plural "" +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" +"to delete them, use:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/remote.c:943 #, c-format -msgid "Failed to read object '%s'." +msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/notes.c:299 -msgid "Cannot commit uninitialized/unreferenced notes tree" +#: builtin/remote.c:946 +msgid " tracked" msgstr "" -#: builtin/notes.c:340 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/notes.c:350 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +#: builtin/remote.c:950 +msgid " ???" msgstr "" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/remote.c:991 #, c-format -msgid "Bad %s value: '%s'" +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/notes.c:441 +#: builtin/remote.c:998 #, c-format -msgid "Malformed input line: '%s'." +msgid "rebases onto remote %s" msgstr "" -#: builtin/notes.c:456 +#: builtin/remote.c:1001 #, c-format -msgid "Failed to copy notes from '%s' to '%s'" +msgid " merges with remote %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 -msgid "too many parameters" +#: builtin/remote.c:1002 +msgid " and with remote" msgstr "" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/remote.c:1004 #, c-format -msgid "No note found for object %s." +msgid "merges with remote %s" msgstr "" -#: builtin/notes.c:580 -#, c-format -msgid "" -"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " -"existing notes" +#: builtin/remote.c:1005 +msgid " and with remote" msgstr "" -#: builtin/notes.c:585 builtin/notes.c:662 -#, c-format -msgid "Overwriting existing notes for object %s\n" +#: builtin/remote.c:1051 +msgid "create" msgstr "" -#: builtin/notes.c:635 -msgid "too few parameters" +#: builtin/remote.c:1054 +msgid "delete" msgstr "" -#: builtin/notes.c:656 -#, c-format -msgid "" -"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " -"existing notes" +#: builtin/remote.c:1058 +msgid "up to date" msgstr "" -#: builtin/notes.c:668 -#, c-format -msgid "Missing notes on source object %s. Cannot copy." +#: builtin/remote.c:1061 +msgid "fast-forwardable" msgstr "" -#: builtin/notes.c:717 -#, 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" +#: builtin/remote.c:1064 +msgid "local out of date" msgstr "" -#: builtin/notes.c:971 +#: builtin/remote.c:1071 #, c-format -msgid "Object %s has no note\n" +msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/notes.c:1103 +#: builtin/remote.c:1074 #, c-format -msgid "Unknown subcommand: %s" +msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/pack-objects.c:2310 +#: builtin/remote.c:1078 #, c-format -msgid "unsupported index version %s" +msgid " %-*s forces to %s" msgstr "" -#: builtin/pack-objects.c:2314 +#: builtin/remote.c:1081 #, c-format -msgid "bad index version '%s'" +msgid " %-*s pushes to %s" msgstr "" -#: builtin/pack-objects.c:2322 +#: builtin/remote.c:1118 #, c-format -msgid "option %s does not accept negative form" +msgid "* remote %s" msgstr "" -#: builtin/pack-objects.c:2326 +#: builtin/remote.c:1119 #, c-format -msgid "unable to parse value '%s' for option %s" +msgid " Fetch URL: %s" msgstr "" -#: builtin/push.c:45 -msgid "tag shorthand without " +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" msgstr "" -#: builtin/push.c:64 -msgid "--delete only accepts plain target ref names" +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" msgstr "" -#: builtin/push.c:84 +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 #, c-format -msgid "" -"You are not currently on a branch.\n" -"To push the history leading to the current (detached HEAD)\n" -"state now, use\n" -"\n" -" git push %s HEAD:\n" +msgid " HEAD branch: %s" msgstr "" -#: builtin/push.c:91 +#: builtin/remote.c:1139 #, c-format msgid "" -"The current branch %s has no upstream branch.\n" -"To push the current branch and set the remote as upstream, use\n" -"\n" -" git push --set-upstream %s %s\n" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/push.c:99 +#: builtin/remote.c:1151 #, c-format -msgid "The current branch %s has multiple upstream branches, refusing to push." +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] "" +msgstr[1] "" + +#: builtin/remote.c:1154 builtin/remote.c:1181 +msgid " (status not queried)" msgstr "" -#: builtin/push.c:102 +#: builtin/remote.c:1163 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] "" +msgstr[1] "" + +#: builtin/remote.c:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr "" + +#: builtin/remote.c:1178 #, c-format -msgid "" -"You are pushing to remote '%s', which is not the upstream of\n" -"your current branch '%s', without telling me what to push\n" -"to update which remote branch." +msgid " Local ref configured for 'git push'%s:" +msgid_plural " Local refs configured for 'git push'%s:" +msgstr[0] "" +msgstr[1] "" + +#: builtin/remote.c:1216 +msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/push.c:131 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/push.c:138 -msgid "" -"Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" -"before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" msgstr "" -#: builtin/push.c:144 -msgid "" -"Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" msgstr "" -#: builtin/push.c:150 -msgid "" -"Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and merge the remote changes\n" -"(e.g. 'git pull') before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" msgstr "" -#: builtin/push.c:190 +#: builtin/remote.c:1274 #, c-format -msgid "Pushing to %s\n" +msgid " %s will become dangling!" msgstr "" -#: builtin/push.c:194 +#: builtin/remote.c:1275 #, c-format -msgid "failed to push some refs to '%s'" +msgid " %s has become dangling!" msgstr "" -#: builtin/push.c:226 +#: builtin/remote.c:1281 #, c-format -msgid "bad repository '%s'" +msgid "Pruning %s" msgstr "" -#: builtin/push.c:227 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add \n" -"\n" -"and then push using the remote name\n" -"\n" -" git push \n" +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" msgstr "" -#: builtin/push.c:242 -msgid "--all and --tags are incompatible" +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" msgstr "" -#: builtin/push.c:243 -msgid "--all can't be combined with refspecs" +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" msgstr "" -#: builtin/push.c:248 -msgid "--mirror and --tags are incompatible" +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" msgstr "" -#: builtin/push.c:249 -msgid "--mirror can't be combined with refspecs" +#: builtin/remote.c:1414 +msgid "no remote specified" msgstr "" -#: builtin/push.c:254 -msgid "--all and --mirror are incompatible" +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/push.c:342 -msgid "--delete is incompatible with --all, --mirror and --tags" +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/push.c:344 -msgid "--delete doesn't make sense without any refs" +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" msgstr "" #: builtin/reset.c:33 @@ -2849,6 +4048,10 @@ msgstr "" msgid "hard" msgstr "" +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + #: builtin/reset.c:33 msgid "keep" msgstr "" @@ -2921,15 +4124,15 @@ msgstr "" msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:127 +#: builtin/revert.c:131 msgid "program error" msgstr "" -#: builtin/revert.c:213 +#: builtin/revert.c:221 msgid "revert failed" msgstr "" -#: builtin/revert.c:228 +#: builtin/revert.c:236 msgid "cherry-pick failed" msgstr "" @@ -2969,32 +4172,32 @@ msgstr "" msgid "Missing author: %s" msgstr "" -#: builtin/tag.c:58 +#: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" msgstr "" -#: builtin/tag.c:205 +#: builtin/tag.c:207 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:210 +#: builtin/tag.c:212 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:225 +#: builtin/tag.c:227 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:237 +#: builtin/tag.c:239 #, c-format msgid "could not verify the tag '%s'" msgstr "" -#: builtin/tag.c:247 +#: builtin/tag.c:249 msgid "" "\n" "#\n" @@ -3003,7 +4206,7 @@ msgid "" "#\n" msgstr "" -#: builtin/tag.c:254 +#: builtin/tag.c:256 msgid "" "\n" "#\n" @@ -3013,85 +4216,177 @@ msgid "" "#\n" msgstr "" -#: builtin/tag.c:294 +#: builtin/tag.c:298 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:296 +#: builtin/tag.c:300 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:321 +#: builtin/tag.c:325 msgid "bad object type." msgstr "" -#: builtin/tag.c:334 +#: builtin/tag.c:338 msgid "tag header too big." msgstr "" -#: builtin/tag.c:366 +#: builtin/tag.c:370 msgid "no tag message?" msgstr "" -#: builtin/tag.c:372 +#: builtin/tag.c:376 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:421 +#: builtin/tag.c:425 msgid "switch 'points-at' requires an object" msgstr "" -#: builtin/tag.c:423 +#: builtin/tag.c:427 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:502 +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "" + +#: builtin/tag.c:523 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:504 +#: builtin/tag.c:525 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:527 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:514 +#: builtin/tag.c:535 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:534 +#: builtin/tag.c:555 msgid "too many params" msgstr "" -#: builtin/tag.c:540 +#: builtin/tag.c:561 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:545 +#: builtin/tag.c:566 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:563 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:565 +#: builtin/tag.c:586 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:567 +#: builtin/tag.c:588 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" +#: git.c:16 +msgid "See 'git help ' for more information on a specific command." +msgstr "" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "" + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "" + +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "" + #: git-am.sh:50 msgid "You need to set your committer info first" msgstr ""